sfroitzheim
|
cb825a6588
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2014-12-05 14:51:23 +01:00 |
|
sfroitzheim
|
f83bb7ec7d
|
Fixed some display bugs with the column.
|
2014-12-05 14:49:23 +01:00 |
|
Steffen Fündgens
|
097e1acfbc
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-05 14:45:57 +01:00 |
|
Steffen Fündgens
|
4d1fbc6045
|
Implemented error checking for XML. Fixed loading of OBJ-Files.
|
2014-12-05 14:45:44 +01:00 |
|
sfroitzheim
|
de47c1bdd6
|
Changed Columntexture to something better.
|
2014-12-05 14:39:08 +01:00 |
|
Steffen Fündgens
|
086e13ac8e
|
integrating tinyxml into level, adding lights to compositions
|
2014-12-05 12:47:02 +01:00 |
|
Steffen Fündgens
|
f218a141fa
|
changed filePath to levelNum
|
2014-12-04 15:07:31 +01:00 |
|
Faerbit
|
09fc76d26b
|
Changing directional light vector to match origin of the sun on the skysphere texture.
|
2014-12-04 12:19:39 +01:00 |
|
Faerbit
|
27c2248117
|
Implemented basic shadows for sun light. Also fixed bug with far plane always staying the same.
|
2014-12-04 01:13:59 +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
|
5aaf8f5d9f
|
Changed how windows focus is handled.
|
2014-11-25 16:01:13 +01:00 |
|
Faerbit
|
565351f7d2
|
Changing vector of objects to vector of pointer of objects for clearer construnction.
|
2014-11-23 00:59:54 +01:00 |
|
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
|
704df860f8
|
Put Box In Level
|
2014-11-21 16:22:36 +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 |
|
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
|
9367026ef0
|
Implemented simple fog.
|
2014-11-19 01:58:48 +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
|
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 |
|
Faerbit
|
e0c8820bd0
|
Reexported objects and enabled smooth shading.
|
2014-11-17 22:03:28 +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
|
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
|
6c32a0c35a
|
getting the sizes juuuuuuuust right
|
2014-11-17 16:28:31 +01:00 |
|
Jasper
|
362b4f0230
|
ich bin dumb
|
2014-11-17 16:14:01 +01:00 |
|
Jasper
|
678c6cf85f
|
merged level.cc
|
2014-11-17 16:11:39 +01:00 |
|
Jasper
|
1e7c7989de
|
further improving physics and interaction
|
2014-11-17 16:07:40 +01:00 |
|
Fabian Klemp
|
682a25a7ee
|
Adding column and block ruins.
|
2014-11-17 15:29:38 +01:00 |
|
Fabian Klemp
|
ba5df84895
|
Added light in the middle of the marble.
|
2014-11-17 15:19:36 +01:00 |
|
Fabian Klemp
|
8d082e203b
|
Basic Marble Model with Textures added.
|
2014-11-17 14:38:35 +01:00 |
|
Fabian Klemp
|
1b876b4c35
|
Adding torch.
|
2014-11-17 14:23:23 +01:00 |
|
Jasper
|
2558311844
|
fixed conflict
|
2014-11-17 13:17:28 +01:00 |
|
Jasper
|
e579fe1d75
|
added wasd recognition, prepared roll forward to accept vec3 pos instead of mat3 rot
|
2014-11-17 13:12:51 +01:00 |
|
Jasper
|
cac4672c7c
|
Implimented a basic version of Physics into level with a ball colliding with a static plain.
|
2014-11-17 12:57:16 +01:00 |
|
Steffen Fündgens
|
c0a730f58a
|
Merge branch 'terrain-test'
Conflicts:
level.cc
terrain.cc
|
2014-11-17 12:56:10 +01:00 |
|
Steffen Fündgens
|
b27e7062f3
|
Changing a few position parameters.
|
2014-11-17 12:50:05 +01:00 |
|
Steffen Fündgens
|
51359d065f
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-11-17 11:25:49 +01:00 |
|
Faerbit
|
3485299717
|
Changing getCamera to pointers.
|
2014-11-15 14:54:44 +01:00 |
|
Faerbit
|
53ca8caf56
|
Adding simple test sphere.
|
2014-11-15 14:19:34 +01:00 |
|
Faerbit
|
5ca77ae3cc
|
Constructed a simple quad for debugging terrain generation.
|
2014-11-15 13:46:20 +01:00 |
|
Faerbit
|
3625cd31d7
|
Stop x rotation at the top and at the bottom to prevent flipping.
|
2014-11-14 22:55:29 +01:00 |
|