search

ippa / chingu

OpenGL accelerated 2D game framework for Ruby
http://ippa.se/chingu
GNU Lesser General Public License v2.1
309 stars 66 forks source link

A variety of improvements #27

Closed bil-bas closed 12 years ago

bil-bas commented 13 years ago

Network Animations Sound control

ippa commented 12 years ago

Cleaning up old pull-requests, I think we fixed this?

bil-bas commented 12 years ago

Nope; I'm not sure what you mean by "fixed". The thing is that the description "network tests" referred to the original pull request, but since then I added a dozen more commits (I probably should have updated the title of the request). If you look at the network, none of these have been merged into ippa/chingu looks confused

ippa commented 12 years ago

hm, assumed it was old stuff cause of the date :). I'll reopen and try to merge.

bil-bas commented 12 years ago

It was old, but I pushed it just as you were losing interest and jumping ship to HTML5, so I gave up on it :D Hadn't noticed you starting to merge again recently!

ippa commented 12 years ago

"This pull request cannot be automatically merged." .. gotta do this badboy manually it seems.

bil-bas commented 12 years ago

I guess it is up to me, eh? :(

ippa commented 12 years ago

heh, not your responsibillity. maybe part of the patch will be very hard to merge and has to be skipped though, we'll see.

bil-bas commented 12 years ago

Merged and rewrote the merged bit so the code is a bit nicer (and added tests because it was getting complex :) )

ippa commented 12 years ago

nice!