Steffen Fündgens
|
b483cb2eb9
|
Now passing the Lua State to the physics, so that Lua can directly access physics functions.
|
2015-01-13 17:50:15 +01:00 |
|
Steffen Fündgens
|
4df1b8e3cb
|
Lua script works now, worked around the bug by saving the name as a std::string.
|
2015-01-13 17:21:15 +01:00 |
|
Steffen Fündgens
|
46f163d748
|
Moved triggering to lua, got a strange bug with the const char* holding the name of the lua script.
|
2015-01-13 13:52:22 +01:00 |
|
Steffen Fündgens
|
e35899523f
|
Integrated Lua into our project. Triggers are now able to call a Lua Script. Havent figured out how to let the Script do anything usefull yet.
|
2015-01-09 16:51:28 +01:00 |
|
Steffen Fündgens
|
aee4d4a8ff
|
Moved all dampning parameters (except for the camera) to Compositions.xml.
|
2015-01-06 13:31:53 +01:00 |
|
Steffen Fündgens
|
cc4842a628
|
Moved friction and player strength to Level.xml.
|
2015-01-06 13:14:30 +01:00 |
|
Steffen Fündgens
|
a5de8e733e
|
Added the option to give a trigger a target composition. The position the trigger activates at is the old manually set position + the position of the target composition.
|
2014-12-19 16:15:29 +01:00 |
|
Steffen Fündgens
|
55ba919f7e
|
Ignoring blender backup files.
|
2014-12-19 15:22:34 +01:00 |
|
Steffen Fündgens
|
bbdc6be85d
|
Also increased strength of the player ball.
|
2014-12-19 15:21:38 +01:00 |
|
Steffen Fündgens
|
831b0ebbb6
|
Tweaked ball physics.
|
2014-12-19 15:20:49 +01:00 |
|
Steffen Fündgens
|
2d4e590308
|
Fixed bug with created too many faces.
|
2014-12-19 15:20:05 +01:00 |
|
Steffen Fündgens
|
9deaf22bca
|
Triangulated block.
|
2014-12-19 15:14:33 +01:00 |
|
Steffen Fündgens
|
1998e2abc9
|
Triangulated faces of the torch and added it to the Level again.
|
2014-12-19 15:09:00 +01:00 |
|
Steffen Fündgens
|
965e865d92
|
Removing useless mtl file.
|
2014-12-19 15:07:43 +01:00 |
|
Steffen Fündgens
|
4f677b427c
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-19 13:36:05 +01:00 |
|
Steffen Fündgens
|
9f3b11c274
|
Changed the default objectNum for triggers from 1 to 0. Moved blocks up so they dont spawn in the heightmap.
|
2014-12-19 13:35:17 +01:00 |
|
Steffen Fündgens
|
749f8cb2dc
|
added comments to Compositions.xml and adjusted marble size.
|
2014-12-19 13:33:59 +01:00 |
|
Faerbit
|
46a32b8617
|
Calulating fogEnd by farPlane.
|
2014-12-19 13:27:05 +01:00 |
|
Faerbit
|
5f87600bfb
|
Fixed crashing if no lights are present.
|
2014-12-19 13:09:25 +01:00 |
|
Steffen Fündgens
|
cb3ccb3668
|
Moved triggers into compositions.
|
2014-12-16 13:46:49 +01:00 |
|
Fabian Klemp
|
d91d5e2028
|
Moved trigger functions to trigger class.
|
2014-12-16 12:40:30 +01:00 |
|
Fabian Klemp
|
bab84f01c1
|
Fixed triggers. Now deletes a truly random object.
|
2014-12-16 12:19:48 +01:00 |
|
Fabian Klemp
|
9497e99b58
|
Initialized pseudo random generator.
|
2014-12-16 12:17:30 +01:00 |
|
Faerbit
|
8a40b1705f
|
Added slides.
|
2014-12-16 00:23:35 +01:00 |
|
Faerbit
|
70aab2a58f
|
Made trigger more presentation friendly.
|
2014-12-15 23:36:22 +01:00 |
|
Faerbit
|
13c9893a47
|
Disabled point light shadows, because they look very wrong.
|
2014-12-15 22:59:13 +01:00 |
|
Faerbit
|
4fe9cc2bf8
|
Made level more presentation friendly.
|
2014-12-15 22:58:48 +01:00 |
|
Faerbit
|
8da25e5beb
|
Removing debug output.
|
2014-12-15 22:03:04 +01:00 |
|
Faerbit
|
5ad46dd5e9
|
Revert "Not using pointlight shadows."
This reverts commit e00cb787c8.
|
2014-12-15 22:00:23 +01:00 |
|
Jasper
|
ebb7045753
|
Merge branch 'master' of github.com:Faerbit/swp
Conflicts:
level.cc
|
2014-12-15 19:13:25 +01:00 |
|
Jasper
|
c993bd8f77
|
Tried to adjust box.
|
2014-12-15 19:11:28 +01:00 |
|
Steffen Fündgens
|
689a5f3d1c
|
Adding *.db files to gitignore.
|
2014-12-15 19:00:40 +01:00 |
|
Steffen Fündgens
|
124ae53f59
|
Fixing texture file name of marble.
|
2014-12-15 19:00:07 +01:00 |
|
Steffen Fündgens
|
6d6f798d12
|
Changed to Lvl1.
|
2014-12-15 18:58:32 +01:00 |
|
Steffen Fündgens
|
2a1119da79
|
Implemented simple triggers.
|
2014-12-15 18:43:10 +01:00 |
|
Steffen Fündgens
|
e00cb787c8
|
Not using pointlight shadows.
|
2014-12-15 16:48:42 +01:00 |
|
Steffen Fündgens
|
23abffb3ee
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 16:34:54 +01:00 |
|
Steffen Fündgens
|
b43f37f0a0
|
Doubled heightmap scale.
|
2014-12-15 16:34:44 +01:00 |
|
Fabian Klemp
|
2e75aff5af
|
Adding torch blenderfile.
|
2014-12-15 16:27:04 +01:00 |
|
Jasper
|
9964b9be34
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 16:04:36 +01:00 |
|
Jasper
|
e49e4c2177
|
Composition scales addapted
Physics added trimeshshapes
|
2014-12-15 16:02:04 +01:00 |
|
Faerbit
|
15f91a19b9
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 15:59:12 +01:00 |
|
Faerbit
|
05cac9c520
|
Point light shadows for the first point light does something. Seems pretty broken.
|
2014-12-15 15:58:55 +01:00 |
|
sfroitzheim
|
0eacb96e81
|
Version 1.1 of the heightmap
|
2014-12-15 15:45:56 +01:00 |
|
sfroitzheim
|
6b3db436dc
|
Added Heightmap prototype(could be garbage)
|
2014-12-15 15:13:29 +01:00 |
|
Faerbit
|
df182abd06
|
Reducing OpenGL version number to 3.2 again.
|
2014-12-15 15:10:19 +01:00 |
|
Steffen Fündgens
|
db1de34bce
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 14:59:09 +01:00 |
|
Steffen Fündgens
|
66cf9ef8d6
|
Implemented half the loading of triggers.
|
2014-12-15 14:59:03 +01:00 |
|
Faerbit
|
91567fca78
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 14:57:50 +01:00 |
|
sfroitzheim
|
fdeb783055
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2014-12-15 14:25:33 +01:00 |
|