Jasper
|
2edbb196c2
|
added trimesh back to collision
|
2015-01-19 15:24:44 +01:00 |
|
sfroitzheim
|
aeb4b638c7
|
Merge branch 'master' of https://github.com/Faerbit/swp
Conflicts:
Levels/ObjectSetups/Level1.xml
|
2015-01-19 15:18:34 +01:00 |
|
sfroitzheim
|
65ba8c0249
|
Added improved starting bridge version
|
2015-01-19 15:15:18 +01:00 |
|
Jasper
|
5670d35865
|
fixed the issue with shpere portruding into blocks
|
2015-01-19 15:11:56 +01:00 |
|
Jasper
|
7cb3e3d620
|
fixed small bug with balls
|
2015-01-19 14:57:20 +01:00 |
|
Jasper
|
19f1f0bb44
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-01-19 14:01:46 +01:00 |
|
Jasper
|
c2634543dc
|
added collision masks and button creator
|
2015-01-19 14:01:05 +01:00 |
|
sfroitzheim
|
42b65fa9c0
|
Added torch for testing.
|
2015-01-19 13:59:50 +01:00 |
|
Steffen Fündgens
|
a8fee3ad84
|
Fixing shader; merge was wrong.
|
2015-01-19 13:44:38 +01:00 |
|
Steffen Fündgens
|
5dcabf0290
|
Merge branch 'linearized' of github.com:Faerbit/swp
|
2015-01-19 13:16:08 +01:00 |
|
Steffen Fündgens
|
ba14a492f1
|
Added more error checking to the converter.
|
2015-01-19 11:15:41 +01:00 |
|
Steffen Fündgens
|
70dc3f1450
|
Fixed the bug that caused the duplicate marble lately.
|
2015-01-19 11:15:06 +01:00 |
|
Faerbit
|
1cef3d4d0a
|
Removed Cascaded Shadow Mapping because it is not realistic to get it working in the remaining time.
|
2015-01-19 00:52:57 +01:00 |
|
Faerbit
|
7a830a472e
|
Linearization of depth buffer. Didn't change graphics in any way.
|
2015-01-19 00:40:28 +01:00 |
|
Steffen
|
75440f919f
|
Added the option to define initial position constraints in the Level.xml file.
|
2015-01-17 14:07:12 +01:00 |
|
Steffen
|
e66fb546b7
|
Updated scripts and added scripts for opening the door in Level1
|
2015-01-17 13:37:09 +01:00 |
|
Steffen
|
3e78b4f4bb
|
Created a moveObject function in the Level class.
|
2015-01-17 13:30:33 +01:00 |
|
Steffen
|
aca199cd1b
|
Removed the lua state from the physics.
|
2015-01-17 13:11:43 +01:00 |
|
Steffen
|
2327d80810
|
Added new composition
|
2015-01-17 12:38:27 +01:00 |
|
Steffen
|
a128c947b1
|
Added ignoreHeightmap option to compositions in Compositions.xml.
|
2015-01-17 12:24:54 +01:00 |
|
Steffen
|
53fe90fd14
|
Added to TARGET_LINK_LIBRARIES, now compiles on my home pc.
|
2015-01-17 12:12:27 +01:00 |
|
Steffen Fündgens
|
f03a01461d
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-01-16 16:52:11 +01:00 |
|
Steffen Fündgens
|
90d64bbade
|
started working on an actual trigger for Level1
|
2015-01-16 16:52:04 +01:00 |
|
Steffen Fündgens
|
0d8dc4b10d
|
moved the triggered/not triggered information to lua
|
2015-01-16 16:51:36 +01:00 |
|
sfroitzheim
|
98091fa305
|
Fixed a few bugs like duplicate marble(bridge will be fixed at monday)
|
2015-01-16 16:47:55 +01:00 |
|
sfroitzheim
|
638323c1c2
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2015-01-16 16:38:24 +01:00 |
|
sfroitzheim
|
073000d097
|
Additional changes with the heightmap
|
2015-01-16 16:37:00 +01:00 |
|
Jasper
|
7934bf7991
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-01-16 16:19:53 +01:00 |
|
Jasper
|
913e862a88
|
Added position Constraint structure, an add/remove function for them, and added their handeling to the update function
|
2015-01-16 16:17:26 +01:00 |
|
Jasper
|
3cba239897
|
Fixed block so that it doesnt BLOW EVERYTHING UP!
|
2015-01-16 15:40:07 +01:00 |
|
Steffen Fündgens
|
a4adf627c3
|
changed heightmap scaling
|
2015-01-16 14:02:36 +01:00 |
|
Faerbit
|
b04e59c15a
|
Removing the rest of the binary files from lua.
|
2015-01-15 17:39:20 +01:00 |
|
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 |
|