Steffen Fündgens
|
965c3f96f9
|
still merging...
|
2014-12-02 13:19:19 +01:00 |
|
Steffen Fündgens
|
4adc1198b8
|
Merged master and converter
|
2014-12-02 13:17:33 +01:00 |
|
Steffen Fündgens
|
b6c694b350
|
Compositions.xml makes sense now
|
2014-12-02 13:13:20 +01:00 |
|
Faerbit
|
f38ced6603
|
Moving shader management completely into graphics.
|
2014-12-01 17:49:59 +01:00 |
|
Faerbit
|
64aeae8143
|
Removing spammy comments.
|
2014-12-01 17:44:58 +01:00 |
|
Faerbit
|
8b21495faa
|
Adding namespacing.
|
2014-12-01 17:40:39 +01:00 |
|
Faerbit
|
be1abf584f
|
Removing useless includes.
|
2014-12-01 17:40:06 +01:00 |
|
Steffen Fündgens
|
315d5aec04
|
implemented all methods of the converter class, needs testing
|
2014-12-01 14:09:55 +01:00 |
|
Faerbit
|
ed889ebd76
|
Reexporting Block.obj, because normals were missing.
|
2014-12-01 13:55:47 +01:00 |
|
Faerbit
|
777d33699e
|
Removing backup blender files.
|
2014-12-01 13:54:10 +01:00 |
|
Faerbit
|
02641d7f1c
|
Adding OBJ-file load messages for easier debugging.
|
2014-12-01 13:53:01 +01:00 |
|
Faerbit
|
c96d081e3d
|
Do not build GLFW examples and tests.
|
2014-12-01 13:16:04 +01:00 |
|
Faerbit
|
e1d14c1884
|
Removing useless includes.
|
2014-12-01 12:58:04 +01:00 |
|
Faerbit
|
117e3715b4
|
Updating glfw to version 3.0.4.
|
2014-12-01 12:53:19 +01:00 |
|
Faerbit
|
27080179e4
|
Revert "Updating glfw." Code was not ready for release.
This reverts commit 81234ca22a.
|
2014-12-01 12:44:08 +01:00 |
|
Faerbit
|
043205455f
|
Moving application class to it's own file.
|
2014-12-01 12:41:19 +01:00 |
|
Faerbit
|
4daf4c8ccf
|
Let member function use it own class and not the global variable.
|
2014-12-01 12:33:00 +01:00 |
|
Faerbit
|
81234ca22a
|
Updating glfw.
|
2014-12-01 12:32:04 +01:00 |
|
Faerbit
|
8317188314
|
Removing big textures as they are not needed.
|
2014-11-29 02:06:46 +01:00 |
|
Faerbit
|
139945614b
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-11-29 01:37:38 +01:00 |
|
Faerbit
|
f3f870c2d1
|
Removing useless files.
|
2014-11-29 01:36:59 +01:00 |
|
Jasper
|
edb17a9e67
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-11-28 17:07:54 +01:00 |
|
Steffen Fündgens
|
9f1a931b0b
|
added example Compositions.xml, implemented most of newComposition() method
|
2014-11-28 17:05:49 +01:00 |
|
Jasper
|
91de258030
|
Reduced memory usage of trianglemesh
|
2014-11-28 17:01:56 +01:00 |
|
Faerbit
|
c5abdba83e
|
Added skydome blender file.
|
2014-11-28 16:49:28 +01:00 |
|
Faerbit
|
869e1ed415
|
Moved Blenderfiles out of Levels because of packaging.
|
2014-11-28 16:47:35 +01:00 |
|
Jasper
|
59bb4a91a7
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-11-28 16:46:44 +01:00 |
|
Jasper
|
ad61969176
|
Added basic Triangle Mesh, pending reading out of .obj and then testing.
|
2014-11-28 16:46:35 +01:00 |
|
sfroitzheim
|
414da9ba7e
|
Added switch models and textures in 2 seperate parts (switchInner is the movable object - size may needs to be changed in the future)
|
2014-11-28 16:38:55 +01:00 |
|
sfroitzheim
|
150a556c22
|
Added all blender files (except marble, as I don't have the newest and smoothed version)
|
2014-11-28 16:31:50 +01:00 |
|
sfroitzheim
|
00cdbe4c5e
|
Fixed origin of block.
|
2014-11-28 15:28:03 +01:00 |
|
Jasper
|
594f336204
|
Added a constraint for distances, as such a constraint did not exist in bullet.Why, IDK.
|
2014-11-28 13:52:03 +01:00 |
|
Jasper
|
9d39bec46f
|
Multiple objects now working, for exact implimentation check level.cc and comment in physics.hh. Additionally multiple comments have been added to physics.hh to support the use of these functions
|
2014-11-28 12:06:17 +01:00 |
|
Faerbit
|
d58147a935
|
You can render objects with multiple shaders now.
|
2014-11-28 00:17:56 +01:00 |
|
Faerbit
|
4881367004
|
Adding run.sh script
|
2014-11-27 23:58:33 +01:00 |
|
Faerbit
|
6a05ec47dd
|
Changing paramter order.
|
2014-11-27 22:02:25 +01:00 |
|
Faerbit
|
6bb0974c67
|
Specifying upload path.
|
2014-11-27 21:53:22 +01:00 |
|
Faerbit
|
6a82bf122c
|
Fixing script not in PATH.
|
2014-11-27 21:45:19 +01:00 |
|
Faerbit
|
c63382ba29
|
Fixing stupid mistake.
|
2014-11-27 21:38:10 +01:00 |
|
Faerbit
|
215b37f15e
|
Changing file hoster once again to dropbox.
|
2014-11-27 21:37:09 +01:00 |
|
Faerbit
|
fab8665424
|
Adding module to plowshare.
|
2014-11-27 13:32:51 +01:00 |
|
Faerbit
|
b9b2f5769e
|
Fixing yaml formatting.
|
2014-11-27 13:25:18 +01:00 |
|
Faerbit
|
50c08d79ec
|
Changing how plowshare is installed.
|
2014-11-27 13:24:39 +01:00 |
|
Faerbit
|
60ff3452ca
|
Adding -y to apt-get.
|
2014-11-27 13:20:18 +01:00 |
|
Faerbit
|
65eba6a97a
|
Changing upload target to mediafire and upload tool to plowshare because megacmd sucks.
|
2014-11-27 13:19:02 +01:00 |
|
Faerbit
|
b57b559748
|
Reverting to upload instead of sync, because sync looks really broken.
|
2014-11-27 12:55:41 +01:00 |
|
Faerbit
|
ca4ccaef10
|
Syncing files instead of forcing them to mega.
|
2014-11-27 12:36:30 +01:00 |
|
Faerbit
|
6f44ea1416
|
Always uploading Windows build.
|
2014-11-27 12:09:45 +01:00 |
|
Faerbit
|
cc6818cd65
|
Adding zip.
|
2014-11-27 05:40:53 +01:00 |
|
Faerbit
|
2a99eb16d5
|
Should fix weird bug with CMake.
|
2014-11-27 05:35:45 +01:00 |
|