Commit Graph

1062 Commits

Author SHA1 Message Date
Faerbit
4fb383976b Replacing skybox attribute with skydome. 2014-11-23 00:57:16 +01:00
Faerbit
22c9a7a936 Changed skybox to skydome. 2014-11-22 00:39:58 +01:00
Jasper
6e922ec4ec Merge branch 'master' of https://github.com/Faerbit/swp 2014-11-21 16:22:50 +01:00
Jasper
704df860f8 Put Box In Level 2014-11-21 16:22:36 +01:00
Steffen Fündgens
3cca41740a now ignoring files with ~ 2014-11-21 16:09:45 +01:00
Steffen Fündgens
bbbdd2854e Now ignoreing files with ~. 2014-11-21 16:08:03 +01:00
Steffen Fündgens
ad874a9204 Modifying CMakes files to get convert to compile. 2014-11-21 16:07:13 +01:00
Steffen Fündgens
b7834b08a5 created skeletal implementation of png to xml converter 2014-11-21 15:43:27 +01:00
Jasper
2c512acc13 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
f063b7ef8b added box in physics 2014-11-21 12:50:11 +01:00
Jasper
dfd6b3789a Normalized body movement (still has float strength to change magnitude) 2014-11-21 12:31:29 +01:00
Faerbit
4039bad9f9 Improved fog a little bit. 2014-11-21 02:46:02 +01:00
Faerbit
c7518a7f8e Added skybox and refined fog a bit. Fog still needs a lot of work. 2014-11-21 02:38:03 +01:00
Faerbit
84a3dbba4f Fixing typo to allow cross compilation. 2014-11-20 23:25:52 +01:00
Faerbit
56a1bfeb76 Removing travis.yml again because it doesn't work. 2014-11-20 21:19:07 +01:00
Faerbit
45bbc07490 Fixing sed command. 2014-11-20 21:16:51 +01:00
Faerbit
6df854bbf5 Now using standard Makefiles instead of Ninja. 2014-11-20 21:15:02 +01:00
Faerbit
f30c5a8850 Fixing installation of ninja again. 2014-11-20 21:08:29 +01:00
Faerbit
a33c9c9bd9 Fixing installation of ninja. 2014-11-20 21:05:15 +01:00
Faerbit
efea5db271 Adding .travis.yml for CI. 2014-11-20 21:02:58 +01:00
Faerbit
d84a4640d5 Removing useless files. 2014-11-20 20:42:40 +01:00
Faerbit
9367026ef0 Implemented simple fog. 2014-11-19 01:58:48 +01:00
Faerbit
1c848f35e6 Now using built-in exp function. 2014-11-19 01:58:25 +01:00
Faerbit
ba77cd68ac Added getCameraPosition to Level because it is used very often. 2014-11-19 01:57:38 +01:00
Faerbit
777bce286d Changing a few lighting paramters for testing. 2014-11-19 00:59:48 +01:00
Faerbit
e8ad41c75b Changing how the intensity is calculated. 2014-11-19 00:59:33 +01:00
Faerbit
7f0a493a01 Moving far plane a bit further. 2014-11-19 00:59:02 +01:00
Faerbit
89a3018221 Clamping diffuse color for more realistic lighting. 2014-11-19 00:46:51 +01:00
Faerbit
d2d5c18090 Removing angular(Velocity) from object class as it is not needed there. 2014-11-18 19:57:58 +01:00
Faerbit
0e3dc33b80 Resized large textures to one third of their size. 2014-11-18 19:39:44 +01:00
Steffen Fündgens
d6ee36c071 changed terrain normals to consider 8 vertices, looks the same 2014-11-18 13:09:55 +01:00
Faerbit
e0c8820bd0 Reexported objects and enabled smooth shading. 2014-11-17 22:03:28 +01:00
Jasper
f2b45b56bf 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
7b53bc3a5e Merge branch 'master' of https://github.com/Faerbit/swp 2014-11-17 18:54:44 +01:00
Jasper
00182a509c fixed terrain offset 2014-11-17 18:54:19 +01:00
Fabian Klemp
b116f1c506 Removing useless stuff. 2014-11-17 18:40:54 +01:00
sfroitzheim
463181d484 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
913ec3c05b 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
Jasper
6c32a0c35a getting the sizes juuuuuuuust right 2014-11-17 16:28:31 +01:00
Fabian Klemp
f1a2aeb7ab Merge branch 'master' of github.com:Faerbit/swp 2014-11-17 16:16:13 +01:00
Fabian Klemp
f87af894c1 Added alpha shading. 2014-11-17 16:15:56 +01:00