Commit Graph

215 Commits

Author SHA1 Message Date
Faerbit
b654ea1372 Added support for ninja build system and fixed uploading to Mega. 2014-11-24 15:59:59 +01:00
Faerbit
df6c9c59b2 Added package script. 2014-11-24 15:12:18 +01:00
Faerbit
9a9313d434 Starting another travis try. 2014-11-24 02:29:40 +01:00
Faerbit
c4ed64fecc Enabling cross compiling if supported by the current system. 2014-11-24 02:10:25 +01:00
Faerbit
3b92b32a3a Changed build script a bit. 2014-11-24 01:53:29 +01:00
Faerbit
bedf58b27a Changing vector of objects to vector of pointer of objects for clearer construnction. 2014-11-23 00:59:54 +01:00
Faerbit
b5ecd8698d Replacing skybox attribute with skydome. 2014-11-23 00:57:16 +01:00
Faerbit
641f94b715 Changed skybox to skydome. 2014-11-22 00:39:58 +01:00
Jasper
d98b51f117 Merge branch 'master' of https://github.com/Faerbit/swp 2014-11-21 16:22:50 +01:00
Jasper
263b7ace4b Put Box In Level 2014-11-21 16:22:36 +01:00
Steffen Fündgens
a0fa9e54cd Now ignoreing files with ~. 2014-11-21 16:08:03 +01:00
Jasper
a7a75bfaad Modified adders in physics to no longer accept float x,y,z but entity/object instead. 2014-11-21 12:56:30 +01:00
Jasper
cf5d209f28 added box in physics 2014-11-21 12:50:11 +01:00
Jasper
ad4a8936bb Normalized body movement (still has float strength to change magnitude) 2014-11-21 12:31:29 +01:00
Faerbit
6ca47cbdfe Improved fog a little bit. 2014-11-21 02:46:02 +01:00
Faerbit
235cde0d74 Added skybox and refined fog a bit. Fog still needs a lot of work. 2014-11-21 02:38:03 +01:00
Faerbit
bf6cd8bda4 Fixing typo to allow cross compilation. 2014-11-20 23:25:52 +01:00
Faerbit
f6cb4cd4f1 Removing travis.yml again because it doesn't work. 2014-11-20 21:19:07 +01:00
Faerbit
a6d3f3bd9c Fixing sed command. 2014-11-20 21:16:51 +01:00
Faerbit
63297cf202 Now using standard Makefiles instead of Ninja. 2014-11-20 21:15:02 +01:00
Faerbit
d7599157f5 Fixing installation of ninja again. 2014-11-20 21:08:29 +01:00
Faerbit
d7b01cae5e Fixing installation of ninja. 2014-11-20 21:05:15 +01:00
Faerbit
b6989aa03f Adding .travis.yml for CI. 2014-11-20 21:02:58 +01:00
Faerbit
1a8f208841 Removing useless files. 2014-11-20 20:42:40 +01:00
Faerbit
94271dd9dd Implemented simple fog. 2014-11-19 01:58:48 +01:00
Faerbit
52dc055554 Now using built-in exp function. 2014-11-19 01:58:25 +01:00
Faerbit
e997566b30 Added getCameraPosition to Level because it is used very often. 2014-11-19 01:57:38 +01:00
Faerbit
327284155b Changing a few lighting paramters for testing. 2014-11-19 00:59:48 +01:00
Faerbit
d18cf76cea Changing how the intensity is calculated. 2014-11-19 00:59:33 +01:00
Faerbit
7683f4f521 Moving far plane a bit further. 2014-11-19 00:59:02 +01:00
Faerbit
3678c7ef80 Clamping diffuse color for more realistic lighting. 2014-11-19 00:46:51 +01:00
Faerbit
9d4bef5929 Removing angular(Velocity) from object class as it is not needed there. 2014-11-18 19:57:58 +01:00
Faerbit
3b769c220e Resized large textures to one third of their size. 2014-11-18 19:39:44 +01:00
Steffen Fündgens
79d4cff49e changed terrain normals to consider 8 vertices, looks the same 2014-11-18 13:09:55 +01:00
Faerbit
1e0157aa2a Reexported objects and enabled smooth shading. 2014-11-17 22:03:28 +01:00
Jasper
1265804c14 Merge branch 'master' of renault.informatik.rwth-aachen.de:/data/git-repository/students/swpp-ws-14-15/swpp-ws-14-15-c
Conflicts:
	terrain.cc
	terrain.hh
2014-11-17 18:59:00 +01:00
Jasper
c7ea4d30a3 Merge branch 'master' of https://github.com/Faerbit/swp 2014-11-17 18:54:44 +01:00
Jasper
1db5eb0e6c fixed terrain offset 2014-11-17 18:54:19 +01:00
Fabian Klemp
acd904d443 Removing useless stuff. 2014-11-17 18:40:54 +01:00
sfroitzheim
a8e255e94d Merge branch 'master' of https://github.com/Faerbit/swp 2014-11-17 18:31:48 +01:00
sfroitzheim
4b6d6f1a6d Changing marble model. 2014-11-17 18:31:22 +01:00
Fabian Klemp
173a188467 Changing sand texture to a seamless sand texture. 2014-11-17 18:18:57 +01:00
Fabian Klemp
5966de6701 Removing update of the light at the center of the marble. 2014-11-17 18:18:15 +01:00
Fabian Klemp
e34e1ad04d Removing light at the center of the marble. 2014-11-17 18:16:27 +01:00
Fabian Klemp
c87d62cae9 Added directional lighting. 2014-11-17 17:51:15 +01:00
Fabian Klemp
e3c8be4d0e Added emtpy constructor. 2014-11-17 17:50:06 +01:00
Fabian Klemp
41ae3908ab Removed rotation paramter from Light constructor as it is not used. 2014-11-17 16:54:17 +01:00
Fabian Klemp
048ab1ceaf Merge branch 'master' of github.com:Faerbit/swp 2014-11-17 16:31:04 +01:00
Fabian Klemp
64f030765f Changing a few spawning values. 2014-11-17 16:31:01 +01:00
Jasper
600b4edc60 Merge branch 'master' of https://github.com/Faerbit/swp 2014-11-17 16:29:10 +01:00