Commit Graph

994 Commits

Author SHA1 Message Date
Jasper
17c1d38d7e Merge branch 'master' of github.com:Faerbit/swp 2014-11-28 16:46:44 +01:00
Jasper
3fcd677dd5 Added basic Triangle Mesh, pending reading out of .obj and then testing. 2014-11-28 16:46:35 +01:00
sfroitzheim
808a7a0569 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
263e9e72af 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
348d624564 Fixed origin of block. 2014-11-28 15:28:03 +01:00
Jasper
13e08945df 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
742a1848ea 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
8af201fd2f You can render objects with multiple shaders now. 2014-11-28 00:17:56 +01:00
Faerbit
79fd16ad8d Adding run.sh script 2014-11-27 23:58:33 +01:00
Faerbit
4f4dec9725 Changing paramter order. 2014-11-27 22:02:25 +01:00
Faerbit
232d807aeb Specifying upload path. 2014-11-27 21:53:22 +01:00
Faerbit
56ead969e7 Fixing script not in PATH. 2014-11-27 21:45:19 +01:00
Faerbit
6f4c67503e Fixing stupid mistake. 2014-11-27 21:38:10 +01:00
Faerbit
c0bf4e2d79 Changing file hoster once again to dropbox. 2014-11-27 21:37:09 +01:00
Faerbit
5e457c9d4d Adding module to plowshare. 2014-11-27 13:32:51 +01:00
Faerbit
a608b8ada4 Fixing yaml formatting. 2014-11-27 13:25:18 +01:00
Faerbit
90213dea7e Changing how plowshare is installed. 2014-11-27 13:24:39 +01:00
Faerbit
ee3a07077e Adding -y to apt-get. 2014-11-27 13:20:18 +01:00
Faerbit
5570637cf7 Changing upload target to mediafire and upload tool to plowshare because megacmd sucks. 2014-11-27 13:19:02 +01:00
Faerbit
6e827b5c1c Reverting to upload instead of sync, because sync looks really broken. 2014-11-27 12:55:41 +01:00
Faerbit
99b1064d54 Syncing files instead of forcing them to mega. 2014-11-27 12:36:30 +01:00
Faerbit
f2b960637a Always uploading Windows build. 2014-11-27 12:09:45 +01:00
Faerbit
0b2a8a12f3 Adding zip. 2014-11-27 05:40:53 +01:00
Faerbit
60595084dc Should fix weird bug with CMake. 2014-11-27 05:35:45 +01:00
Faerbit
9c64346163 Adding missing paramter. 2014-11-27 05:31:54 +01:00
Faerbit
f64b81fc85 Upgrading docker image to newest version. 2014-11-27 05:31:17 +01:00
Faerbit
47f05108d2 Trying compilation on circle with docker. 2014-11-27 05:27:19 +01:00
Faerbit
79b76bfba1 Adding dockerfile. 2014-11-27 05:18:40 +01:00
Faerbit
97d1694b38 Fixing another syntax error. 2014-11-27 00:41:21 +01:00
Faerbit
e70416a336 Fixing syntax. 2014-11-27 00:40:46 +01:00
Faerbit
e990c7aff0 Added spaces. 2014-11-27 00:32:44 +01:00
Faerbit
d37d1d4c68 Check if windows build exists before trying to do anything with it. 2014-11-27 00:23:51 +01:00
Faerbit
697b3192df Do not suppress output of apt-get anymore. 2014-11-27 00:16:17 +01:00
Faerbit
2c5175f123 Only copy linux builds to artifacts. 2014-11-27 00:14:56 +01:00
Faerbit
d7c2173a8e Changing root path. 2014-11-26 23:57:33 +01:00
Faerbit
2366ba0ecb Try building linux first. 2014-11-26 23:49:40 +01:00
Faerbit
269f205967 Another try at cross compilation on circle. 2014-11-26 23:46:21 +01:00
Faerbit
c2045d1654 Another try at cross compilation on circle. 2014-11-26 23:44:09 +01:00
Faerbit
702455fbb0 Trying without C++ 11. 2014-11-26 23:29:41 +01:00
Faerbit
c9e8de0105 Adding binutils. 2014-11-26 23:09:04 +01:00
Faerbit
dd4d4b47ea Changing dependencies. 2014-11-26 23:06:51 +01:00
Faerbit
41bd37adb0 Adding 64 bit compiler. 2014-11-26 23:05:01 +01:00
Faerbit
85ed747c38 Enabling error message. 2014-11-26 23:02:55 +01:00
Faerbit
0d207b533a Another try at cross compilation on circle. 2014-11-26 23:02:01 +01:00
Faerbit
d5ebbdbf6a Forgot one windows thing. 2014-11-26 01:58:58 +01:00
Faerbit
3df40fd385 Removing travis.yml because it is useless. 2014-11-26 01:54:00 +01:00
Faerbit
49f498e0a2 Deactivating Windows build for now. 2014-11-26 01:53:37 +01:00
Faerbit
170443b5b8 Another try at cross compilation on circle. 2014-11-26 01:45:24 +01:00
Faerbit
6d7df9b363 Another try at cross compilation on circle. 2014-11-26 01:39:45 +01:00
Faerbit
e336f28f81 Another try at cross compilation on circle. 2014-11-26 00:56:16 +01:00