Commit Graph

646 Commits

Author SHA1 Message Date
Faerbit
fde64e0253 Added skydome blender file. 2014-11-28 16:49:28 +01:00
Faerbit
002cf31384 Moved Blenderfiles out of Levels because of packaging. 2014-11-28 16:47:35 +01:00
Jasper
c4a8f69d0f Merge branch 'master' of github.com:Faerbit/swp 2014-11-28 16:46:44 +01:00
Jasper
41207b3eed Added basic Triangle Mesh, pending reading out of .obj and then testing. 2014-11-28 16:46:35 +01:00
sfroitzheim
15b0b515e8 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
957ca84762 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
e9acd8ad88 Fixed origin of block. 2014-11-28 15:28:03 +01:00
Jasper
a40f372cc0 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
f8357164ef 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
08bfbdd839 You can render objects with multiple shaders now. 2014-11-28 00:17:56 +01:00
Faerbit
12c2c793cc Adding run.sh script 2014-11-27 23:58:33 +01:00
Faerbit
3ab700474e Changing paramter order. 2014-11-27 22:02:25 +01:00
Faerbit
91e277d4f4 Specifying upload path. 2014-11-27 21:53:22 +01:00
Faerbit
aa0b5f18f3 Fixing script not in PATH. 2014-11-27 21:45:19 +01:00
Faerbit
0e887d029e Fixing stupid mistake. 2014-11-27 21:38:10 +01:00
Faerbit
d5d6367b2b Changing file hoster once again to dropbox. 2014-11-27 21:37:09 +01:00
Faerbit
7b43c74b1d Adding module to plowshare. 2014-11-27 13:32:51 +01:00
Faerbit
590d6a6388 Fixing yaml formatting. 2014-11-27 13:25:18 +01:00
Faerbit
eedcd31945 Changing how plowshare is installed. 2014-11-27 13:24:39 +01:00
Faerbit
9939d2cae6 Adding -y to apt-get. 2014-11-27 13:20:18 +01:00
Faerbit
83eaadb184 Changing upload target to mediafire and upload tool to plowshare because megacmd sucks. 2014-11-27 13:19:02 +01:00
Faerbit
84650b5f6e Reverting to upload instead of sync, because sync looks really broken. 2014-11-27 12:55:41 +01:00
Faerbit
e181a58c5e Syncing files instead of forcing them to mega. 2014-11-27 12:36:30 +01:00
Faerbit
ea5f2fc111 Always uploading Windows build. 2014-11-27 12:09:45 +01:00
Faerbit
4baf1881a6 Adding zip. 2014-11-27 05:40:53 +01:00
Faerbit
b56d844fcb Should fix weird bug with CMake. 2014-11-27 05:35:45 +01:00
Faerbit
5b5fd51f98 Adding missing paramter. 2014-11-27 05:31:54 +01:00
Faerbit
d62847504b Upgrading docker image to newest version. 2014-11-27 05:31:17 +01:00
Faerbit
fb8f35e18c Trying compilation on circle with docker. 2014-11-27 05:27:19 +01:00
Faerbit
5c5a731336 Adding dockerfile. 2014-11-27 05:18:40 +01:00
Faerbit
b506e0f176 Fixing another syntax error. 2014-11-27 00:41:21 +01:00
Faerbit
3394b8c5d3 Fixing syntax. 2014-11-27 00:40:46 +01:00
Faerbit
b3f9839bd3 Added spaces. 2014-11-27 00:32:44 +01:00
Faerbit
9b382b0d3d Check if windows build exists before trying to do anything with it. 2014-11-27 00:23:51 +01:00
Faerbit
7bbce093fb Do not suppress output of apt-get anymore. 2014-11-27 00:16:17 +01:00
Faerbit
f459647243 Only copy linux builds to artifacts. 2014-11-27 00:14:56 +01:00
Faerbit
4f9e1f25e2 Changing root path. 2014-11-26 23:57:33 +01:00
Faerbit
dd012aebea Try building linux first. 2014-11-26 23:49:40 +01:00
Faerbit
b8b13859a6 Another try at cross compilation on circle. 2014-11-26 23:46:21 +01:00
Faerbit
bd017b42a9 Another try at cross compilation on circle. 2014-11-26 23:44:09 +01:00
Faerbit
d23243b2c3 Trying without C++ 11. 2014-11-26 23:29:41 +01:00
Faerbit
c9037aefcd Adding binutils. 2014-11-26 23:09:04 +01:00
Faerbit
db73e72eb7 Changing dependencies. 2014-11-26 23:06:51 +01:00
Faerbit
a69b240040 Adding 64 bit compiler. 2014-11-26 23:05:01 +01:00
Faerbit
cccd5f407a Enabling error message. 2014-11-26 23:02:55 +01:00
Faerbit
929947d7e7 Another try at cross compilation on circle. 2014-11-26 23:02:01 +01:00
Faerbit
f36a127327 Forgot one windows thing. 2014-11-26 01:58:58 +01:00
Faerbit
311195308c Removing travis.yml because it is useless. 2014-11-26 01:54:00 +01:00
Faerbit
7cc52ac493 Deactivating Windows build for now. 2014-11-26 01:53:37 +01:00
Faerbit
27806454be Another try at cross compilation on circle. 2014-11-26 01:45:24 +01:00