Rice source code

[Paul]

All good points.  Early communication is important rather than ruing in silence, so that problems can be addresses before they get blown out of proportion.

Littleguy did a good job with the rewind, and the changes are on separate branches now.  Hopefully everyone's concerns have been satisfied.  If not, be sure to speak up.

[Pau]

I don't really understand the animosity I'm perceiving here, considering feedback is essential for improving how the project develops - the same applies to the devs themselves. How do I know what to improve upon in regards to myself if I don't actually get feedback or criticism like this?

https://github.com/paulscode/mupen64plus-ae/commit/a051bfb6ae709f5977871e64bf38e348943742eb#commitcomment-2646026
http://www.paulscode.com/forum/index.php?topic=919.msg8779#msg8779
http://www.paulscode.com/forum/index.php?topic=529.msg6460#msg6460
http://www.paulscode.com/forum/index.php?topic=632.msg6593#msg6593
...

[Paul]

For the record, those last two links are related to concerns that have since been resolved.  As with the current concerns with Rice, I would have preferred to have those changes done on a separate branch (and that should be the procedure moving forward), but in the end it all worked out.

I think ecsv/video-rice is the last piece left to resolve here (correct me if I'm wrong).  I'd like to see it merged into master, but not sure I have the "git-fu" to do it without distroying history (I'll probably leave this one for Sven to do, since he is the git/hg master  )  The altered version is in Lioncash's branch, so none of his previous work will be lost.  And we can merge back in any beneficial updates down the road after testing.

[littleguy]

Merging Sven's branch is straight-forward.  With a gui like Git Extensions it's just a click or two.  From the command line I believe it would be

Code: [Select]

git checkout master
git pull
git fetch --all
git merge origin/ecsv/video-rice

Take a look at it, try building it, and then push when you're satisfied.  You won't have any conflicts (I already tested it).

[Paul]

Ok, great.  I figured there would be conflicts, but I guess rice wasn't really changed since then (the conflicts would have been there before the rewind)

[Lioncash]

https://github.com/paulscode/mupen64plus-ae/commit/a051bfb6ae709f5977871e64bf38e348943742eb#commitcomment-2646026
...

I don't even know how I missed this. Thanks.

I have replied accordingly however.

[littleguy]

Thanks guys.  I will just go ahead and merge Sven's branch now so that we can push on.

While I'm at it I'll split and rebase Lioncash's commits into lioncash/gles2rice and lioncash/gles2n64.  (When I did the rewind I didn't notice that many of his commits were for gles2n64, not rice.)

[littleguy]

Ok, I'm done rewriting history.  Enjoy your new world view.

[littleguy]

I posted some guidelines on the wiki to avoid confusion next time.  Feel free to revise or add to them.  Discussion welcome, I don't consider myself an expert on these matters.
https://github.com/paulscode/mupen64plus-ae/wiki