Faerbit
|
7275cdf280
|
Adding libreadline for lua to ubuntu docker image.
|
2015-01-15 17:34:41 +01:00 |
|
Faerbit
|
0483fd995b
|
Now also compiling lua from source before everything else.
|
2015-01-15 17:26:37 +01:00 |
|
Faerbit
|
80b03508a5
|
Removing lua binaries because they shouldn't be tracked.
|
2015-01-15 17:17:14 +01:00 |
|
Faerbit
|
49b1c3c6c6
|
Adding lua Makefiles.
|
2015-01-15 17:15:53 +01:00 |
|
sfroitzheim
|
16bf2477b0
|
Improved level heightmap (still not finished though)
|
2015-01-15 15:09:42 +01:00 |
|
Steffen Fündgens
|
a137d2544a
|
Triggers now adapt if the object they want to do something with gets deleted or changes its index.
|
2015-01-13 18:18:13 +01:00 |
|
Steffen Fündgens
|
f4408b76e8
|
Added and used a new trigger without recompiling, scripting really works. :)
|
2015-01-13 17:52:31 +01:00 |
|
Steffen Fündgens
|
72d1009007
|
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
|
d936d1f269
|
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
|
fe58023458
|
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
|
60d76a58de
|
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
|
70e2ebb605
|
Moved all dampning parameters (except for the camera) to Compositions.xml.
|
2015-01-06 13:31:53 +01:00 |
|
Steffen Fündgens
|
76b6be0beb
|
Moved friction and player strength to Level.xml.
|
2015-01-06 13:14:30 +01:00 |
|
Steffen Fündgens
|
36c42123b8
|
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
|
5b6ad0c6d1
|
Ignoring blender backup files.
|
2014-12-19 15:22:34 +01:00 |
|
Steffen Fündgens
|
0649444687
|
Also increased strength of the player ball.
|
2014-12-19 15:21:38 +01:00 |
|
Steffen Fündgens
|
20b0c66a17
|
Tweaked ball physics.
|
2014-12-19 15:20:49 +01:00 |
|
Steffen Fündgens
|
7d3d7927fe
|
Fixed bug with created too many faces.
|
2014-12-19 15:20:05 +01:00 |
|
Steffen Fündgens
|
1c2fbc2e91
|
Triangulated block.
|
2014-12-19 15:14:33 +01:00 |
|
Steffen Fündgens
|
62b8b0afb9
|
Triangulated faces of the torch and added it to the Level again.
|
2014-12-19 15:09:00 +01:00 |
|
Steffen Fündgens
|
8d3e2c2fac
|
Removing useless mtl file.
|
2014-12-19 15:07:43 +01:00 |
|
Steffen Fündgens
|
f21b837b1c
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-19 13:36:05 +01:00 |
|
Steffen Fündgens
|
136e4d07f0
|
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
|
1cdca7b686
|
added comments to Compositions.xml and adjusted marble size.
|
2014-12-19 13:33:59 +01:00 |
|
Faerbit
|
b16a90bd15
|
Calulating fogEnd by farPlane.
|
2014-12-19 13:27:05 +01:00 |
|
Faerbit
|
5b2c4a6bbc
|
Fixed crashing if no lights are present.
|
2014-12-19 13:09:25 +01:00 |
|
Steffen Fündgens
|
ba847c80f0
|
Moved triggers into compositions.
|
2014-12-16 13:46:49 +01:00 |
|
Fabian Klemp
|
bf46f117b6
|
Moved trigger functions to trigger class.
|
2014-12-16 12:40:30 +01:00 |
|
Fabian Klemp
|
be4a61e65b
|
Fixed triggers. Now deletes a truly random object.
|
2014-12-16 12:19:48 +01:00 |
|
Fabian Klemp
|
d700564b37
|
Initialized pseudo random generator.
|
2014-12-16 12:17:30 +01:00 |
|
Faerbit
|
6db55f5622
|
Added slides.
|
2014-12-16 00:23:35 +01:00 |
|
Faerbit
|
104b8b4bbc
|
Made trigger more presentation friendly.
|
2014-12-15 23:36:22 +01:00 |
|
Faerbit
|
799f191485
|
Disabled point light shadows, because they look very wrong.
|
2014-12-15 22:59:13 +01:00 |
|
Faerbit
|
6b64ec7360
|
Made level more presentation friendly.
|
2014-12-15 22:58:48 +01:00 |
|
Faerbit
|
76053c5b2f
|
Removing debug output.
|
2014-12-15 22:03:04 +01:00 |
|
Faerbit
|
76dbdac70c
|
Revert "Not using pointlight shadows."
This reverts commit e00cb787c8.
|
2014-12-15 22:00:23 +01:00 |
|
Jasper
|
8072fd1cbb
|
Merge branch 'master' of github.com:Faerbit/swp
Conflicts:
level.cc
|
2014-12-15 19:13:25 +01:00 |
|
Jasper
|
9fd8ae5cd8
|
Tried to adjust box.
|
2014-12-15 19:11:28 +01:00 |
|
Steffen Fündgens
|
2a7404e7d1
|
Adding *.db files to gitignore.
|
2014-12-15 19:00:40 +01:00 |
|
Steffen Fündgens
|
32f8683367
|
Fixing texture file name of marble.
|
2014-12-15 19:00:07 +01:00 |
|
Steffen Fündgens
|
895d69fc66
|
Changed to Lvl1.
|
2014-12-15 18:58:32 +01:00 |
|
Steffen Fündgens
|
adde6fd162
|
Implemented simple triggers.
|
2014-12-15 18:43:10 +01:00 |
|
Steffen Fündgens
|
e099c231c7
|
Not using pointlight shadows.
|
2014-12-15 16:48:42 +01:00 |
|
Steffen Fündgens
|
04e5b3a5ac
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 16:34:54 +01:00 |
|
Steffen Fündgens
|
5454a7ddeb
|
Doubled heightmap scale.
|
2014-12-15 16:34:44 +01:00 |
|
Fabian Klemp
|
a20da59e4a
|
Adding torch blenderfile.
|
2014-12-15 16:27:04 +01:00 |
|
Jasper
|
7013f7cf71
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 16:04:36 +01:00 |
|
Jasper
|
00716b63bd
|
Composition scales addapted
Physics added trimeshshapes
|
2014-12-15 16:02:04 +01:00 |
|
Faerbit
|
a3cc265927
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 15:59:12 +01:00 |
|
Faerbit
|
7e31717124
|
Point light shadows for the first point light does something. Seems pretty broken.
|
2014-12-15 15:58:55 +01:00 |
|