Commit Graph

38 Commits

Author SHA1 Message Date
54f129c925 Merge branch 'release'
trying to merge
2020-05-30 16:25:25 -04:00
3722b479ee removing resources for deployment 2020-05-30 16:19:43 -04:00
0bf5d7414c what is going on 2020-05-30 16:18:20 -04:00
e6a3dcc50e wtf why is material and texture gone 2020-05-30 16:16:00 -04:00
1219096138 edit 2020-05-30 16:12:29 -04:00
df45c5e086 changing dependencies 2020-05-30 15:35:22 -04:00
92d82e26ce oops, removing the testing class for deployment 2020-05-30 15:32:26 -04:00
53c8740e13 beta release: textures, 3D models, Cameras 2020-05-30 15:27:07 -04:00
11f3160846 fixing update cameras 2020-05-30 11:19:02 -04:00
68720e1d1f 3D models 2020-05-29 19:34:51 -04:00
3192682853 meshes and colors 2020-05-29 15:32:24 -04:00
8d8a90f29a lets goooo fp camera fixed 2020-05-28 18:30:36 -04:00
be4a13c1d0 adding destroy to the plane 2020-05-28 15:25:50 -04:00
4b51802309 camera movement with cube - some weird bug thing 2020-05-28 15:01:47 -04:00
9a6b5ec048 camera movement finished 2020-05-27 15:10:29 -04:00
5ae985ced9 small camera 2020-05-27 11:49:28 -04:00
47887a4abb beta just for testing 2020-05-26 14:08:27 -04:00
1285842b55 projection matrix 2020-05-26 12:04:13 -04:00
7288a7ee99 uniforms! 2020-05-25 18:18:51 -04:00
fca84badb8 commenting 2020-05-25 17:30:50 -04:00
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