Commit Graph

26 Commits (96b3dd429c2f2a6e7ece52497abaff15657cf990)

Author SHA1 Message Date
marcus13345 96b3dd429c okay 2015-06-03 01:42:15 -04:00
marcus13345 d144576b31 Merge remote-tracking branch 'origin/master'
Conflicts:
	src/MAndEngine/ImageCreator.java
	src/MAndEngine/Utils.java
2015-04-11 23:20:05 -04:00
marcus13345 2fabfc9933 idunno what i did wrong... 2015-04-11 23:13:20 -04:00
Marcus Gosselin 642951ae1a updating of dimensions 2015-04-11 23:00:31 -04:00
Marcus Gosselin 513ee106f1 Merge branch 'retina-display' 2015-04-05 21:10:44 -04:00
Marcus Gosselin 2e99668ebc Merge branch 'master' into retina-display 2015-04-05 21:07:20 -04:00
Marcus Gosselin 64cb9edf57 Merge remote-tracking branch 'origin/retina-display' 2015-04-04 23:57:06 -04:00
Marcus Gosselin dd5d270ef3 added utils class 2015-04-04 23:55:47 -04:00
Marcus Gosselin 6e314e856b switching to master 2015-04-02 14:42:09 -04:00
Marcus Gosselin 20dcc50ebd minor nothingness 2015-04-01 10:50:12 -04:00
mgosselinUTC 2009d42eab made it like...work 2015-03-16 15:05:01 -04:00
Marcus Gosselin 1d9dde6bcf buffer width and buffer height
totally accounted for in the engine now
2015-03-05 10:44:16 -05:00
Marcus Gosselin 22b75413d0 trying to make retina a thing 2015-03-05 08:08:31 -05:00
Marcus Gosselin e9f13c23b5 so like, now works with 1.6... 2015-03-03 15:02:11 -05:00
Marcus Gosselin ad0256e4ec literally spaces 2015-02-14 14:17:36 -05:00
Marcus Gosselin aad6224fbc mooooom it autoformatted again! 2015-01-17 15:22:21 -05:00
Marcus Gosselin fa71eb436b ctrl shift f is a b word for github 2014-11-18 09:42:42 -08:00
Marcus Gosselin 0da6133239 debug level 2014-11-16 06:35:43 -08:00
Marcus Gosselin 243b4475ee ITS DOES THE THING IDFK 2014-10-16 18:12:28 -04:00
Marcus Gosselin 02db9018fe added click events 2014-10-13 17:04:06 -04:00
Marcus Gosselin a1e408fb1e fixed frame resizing glitches 2014-10-10 23:37:32 -04:00
marcus13345 6664c0883d fixed buffers, added resizing 2014-10-10 14:13:48 -04:00
marcus13345 f44645cdad window now actually exits when it exits... 2014-10-09 23:20:49 -04:00
Marcus Gosselin 6d6c799904 new gitignore, not much else. 2014-10-08 22:40:33 -04:00
marcus13345 26b790ed78 ADDED ALL THE THINGS 2014-10-07 14:55:52 -04:00
marcus13345 d427f43953 🎊 Added .gitattributes & .gitignore files 2014-10-07 14:54:24 -04:00