Commit Graph

366 Commits

Author SHA1 Message Date
Faerbit
823da599f3 Starting another travis try. 2014-11-24 02:29:40 +01:00
Faerbit
71cb8300bd Enabling cross compiling if supported by the current system. 2014-11-24 02:10:25 +01:00
Faerbit
1cc47fa4ab Changed build script a bit. 2014-11-24 01:53:29 +01:00
Faerbit
97aeb6c965 Changing vector of objects to vector of pointer of objects for clearer construnction. 2014-11-23 00:59:54 +01:00
Faerbit
ed44f71b8c Replacing skybox attribute with skydome. 2014-11-23 00:57:16 +01:00
Faerbit
3a9a04d4d6 Changed skybox to skydome. 2014-11-22 00:39:58 +01:00
Jasper
59796882e4 Merge branch 'master' of https://github.com/Faerbit/swp 2014-11-21 16:22:50 +01:00
Jasper
3d936df227 Put Box In Level 2014-11-21 16:22:36 +01:00
Steffen Fündgens
3be8d78e1a now ignoring files with ~ 2014-11-21 16:09:45 +01:00
Steffen Fündgens
0105a74b5a Now ignoreing files with ~. 2014-11-21 16:08:03 +01:00
Steffen Fündgens
c65a745603 Modifying CMakes files to get convert to compile. 2014-11-21 16:07:13 +01:00
Steffen Fündgens
86c11e339e created skeletal implementation of png to xml converter 2014-11-21 15:43:27 +01:00
Jasper
fa60d52676 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
3c0deb232f added box in physics 2014-11-21 12:50:11 +01:00
Jasper
263f59f000 Normalized body movement (still has float strength to change magnitude) 2014-11-21 12:31:29 +01:00
Faerbit
1006f1cbc9 Improved fog a little bit. 2014-11-21 02:46:02 +01:00
Faerbit
c47ed4646d Added skybox and refined fog a bit. Fog still needs a lot of work. 2014-11-21 02:38:03 +01:00
Faerbit
b74e56fe7d Fixing typo to allow cross compilation. 2014-11-20 23:25:52 +01:00
Faerbit
3a677c31da Removing travis.yml again because it doesn't work. 2014-11-20 21:19:07 +01:00
Faerbit
788110aaf1 Fixing sed command. 2014-11-20 21:16:51 +01:00
Faerbit
6f59b1fb59 Now using standard Makefiles instead of Ninja. 2014-11-20 21:15:02 +01:00
Faerbit
7bda59920b Fixing installation of ninja again. 2014-11-20 21:08:29 +01:00
Faerbit
4af197d74b Fixing installation of ninja. 2014-11-20 21:05:15 +01:00
Faerbit
15a540e3c9 Adding .travis.yml for CI. 2014-11-20 21:02:58 +01:00
Faerbit
eadc819f80 Removing useless files. 2014-11-20 20:42:40 +01:00
Faerbit
b12b917a44 Implemented simple fog. 2014-11-19 01:58:48 +01:00
Faerbit
faf548d3ee Now using built-in exp function. 2014-11-19 01:58:25 +01:00
Faerbit
7d0cf9fca2 Added getCameraPosition to Level because it is used very often. 2014-11-19 01:57:38 +01:00
Faerbit
49dfdff413 Changing a few lighting paramters for testing. 2014-11-19 00:59:48 +01:00
Faerbit
a8b6463674 Changing how the intensity is calculated. 2014-11-19 00:59:33 +01:00
Faerbit
9576a40af6 Moving far plane a bit further. 2014-11-19 00:59:02 +01:00
Faerbit
8968750015 Clamping diffuse color for more realistic lighting. 2014-11-19 00:46:51 +01:00
Faerbit
715301552a Removing angular(Velocity) from object class as it is not needed there. 2014-11-18 19:57:58 +01:00
Faerbit
2638b43b44 Resized large textures to one third of their size. 2014-11-18 19:39:44 +01:00
Steffen Fündgens
5a92765518 changed terrain normals to consider 8 vertices, looks the same 2014-11-18 13:09:55 +01:00
Faerbit
6a8182ab8d Reexported objects and enabled smooth shading. 2014-11-17 22:03:28 +01:00
Jasper
c54d6cf874 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
95627d31ae Merge branch 'master' of https://github.com/Faerbit/swp 2014-11-17 18:54:44 +01:00
Jasper
10f51db60f fixed terrain offset 2014-11-17 18:54:19 +01:00
Fabian Klemp
8a9d026aa5 Removing useless stuff. 2014-11-17 18:40:54 +01:00
sfroitzheim
c403814cd6 Merge branch 'master' of https://github.com/Faerbit/swp 2014-11-17 18:31:48 +01:00
sfroitzheim
c58e4d01b1 Changing marble model. 2014-11-17 18:31:22 +01:00
Fabian Klemp
9611c9ef08 Changing sand texture to a seamless sand texture. 2014-11-17 18:18:57 +01:00
Fabian Klemp
5533d4e4ba Removing update of the light at the center of the marble. 2014-11-17 18:18:15 +01:00
Fabian Klemp
9fc515ec24 Removing light at the center of the marble. 2014-11-17 18:16:27 +01:00
Fabian Klemp
ca3928e232 Added directional lighting. 2014-11-17 17:51:15 +01:00
Fabian Klemp
39b1ee85b0 Added emtpy constructor. 2014-11-17 17:50:06 +01:00
Fabian Klemp
94b12ae614 Removed rotation paramter from Light constructor as it is not used. 2014-11-17 16:54:17 +01:00
Fabian Klemp
6f89c406f1 Merge branch 'master' of github.com:Faerbit/swp 2014-11-17 16:31:04 +01:00
Fabian Klemp
d11a2820d6 Changing a few spawning values. 2014-11-17 16:31:01 +01:00