Commit Graph

18 Commits

Author SHA1 Message Date
e3a33d946c Resolving conflicts and applying textures 2020-05-25 15:53:12 -04:00
2294aba9e3 texturing works 2020-05-25 14:59:42 -04:00
5fc63b6c73 trying to add textures and still failing 2020-05-25 12:55:20 -04:00
ebf26f18d8 without .idea in gitignore 2020-05-23 17:31:56 -04:00
4ea7ec4b21 adding textures (to texture branch, split due to errors) 2020-05-10 12:56:21 -04:00
3cdabfeb40 vector3f 2020-05-10 11:15:24 -04:00
d2b8e7015a Revert "adding textures (has errors)"
This reverts commit eb6101d2ec.

reverting textures
2020-05-10 10:56:40 -04:00
6f99ed0ebe Revert "Revert "adding textures (has errors)""
This reverts commit 8c94a73d70.

removing textureloader
2020-05-10 10:52:12 -04:00
8c94a73d70 Revert "adding textures (has errors)"
This reverts commit eb6101d2ec.
2020-05-10 10:51:37 -04:00
56c316fc49 Revert "comment"
This reverts commit b2dbf16329.

Moving back to before textures (without errors)
2020-05-10 10:51:07 -04:00
0c6ccbbb42 new branch for texture 2020-05-10 10:24:00 -04:00
b2dbf16329 comment 2020-05-10 09:13:47 -04:00
eb6101d2ec adding textures (has errors) 2020-05-09 11:20:19 -04:00
08928c65cb adding a TextureLoader without using SlickUtils 2020-05-08 22:23:06 -04:00
14e4ed804a only for mac 2020-05-07 14:24:40 -04:00
9e19b8980e moving and vm options 2020-05-07 14:24:03 -04:00
757c20d8a0 first 2020-05-07 14:05:11 -04:00
EvilMuffinHa
672cab2424
Initial commit 2020-05-07 13:59:12 -04:00