Steffen Fündgens
|
563bde0616
|
Now using xml query functions in the converter. Also adjusted the converter to use config.xml. Running the converter would delete all triggers and position constraints though, because the IDs in the png were manually overwritten with zeros.
|
2015-02-20 13:11:05 +01:00 |
|
Faerbit
|
c2621752fc
|
Removing outdated comment.
|
2015-02-19 00:30:35 +01:00 |
|
Steffen
|
153e0116c7
|
Now using the xml query functions everywhere in the loader class.
|
2015-02-18 21:20:29 +01:00 |
|
Steffen
|
99d8a45380
|
Added xml query functions to the loader class, using them in loadConfig().
|
2015-02-18 20:10:30 +01:00 |
|
Steffen Fündgens
|
af9f6d6933
|
Added loading of flames.
|
2015-02-17 12:54:21 +01:00 |
|
Steffen Fündgens
|
f92c7bf6c3
|
Added vector of flames to the level.
|
2015-02-17 12:41:15 +01:00 |
|
Steffen Fündgens
|
c8788f3329
|
Added new flame class.
|
2015-02-17 12:36:43 +01:00 |
|
Steffen Fündgens
|
88d31bc68a
|
Adjusted the mass of switchInner and the force that keeps it in place. The movableBlock can now push the switch down.
|
2015-02-17 12:25:12 +01:00 |
|
Steffen Fündgens
|
3764bb5c6a
|
Adjusted the size of the movableBlock.
|
2015-02-17 12:04:15 +01:00 |
|
Faerbit
|
1742d83d4b
|
Give the luaState a proper name.
|
2015-02-15 19:37:13 +01:00 |
|
Faerbit
|
efa151aa73
|
Do not implicitly set extensions of script files.
|
2015-02-15 19:34:15 +01:00 |
|
Faerbit
|
fb028a899f
|
Moved setting of package.path in lua to init.lua
|
2015-02-15 19:32:19 +01:00 |
|
Faerbit
|
ae1d04b5ee
|
Removed commented code.
|
2015-02-15 19:20:21 +01:00 |
|
Steffen
|
2c699590e2
|
Changed position constraints so they dont bounce the door up and down.
|
2015-02-15 16:12:11 +01:00 |
|
Steffen
|
0e550e52c6
|
Got scripts to work as intended, had to use an ugly hack for it.
|
2015-02-15 16:11:31 +01:00 |
|
Faerbit
|
de2ba0acb9
|
Updated package.sh to fit new directory structure.
|
2015-02-15 11:20:03 +01:00 |
|
Faerbit
|
431a9e58b1
|
Unified how pathes are interpreted in config.xml.
|
2015-02-14 09:55:43 +01:00 |
|
Faerbit
|
97329141bc
|
Restructured directory tree.
|
2015-02-14 09:49:29 +01:00 |
|
Faerbit
|
f05e3d301c
|
Moved setting of sleepingThreshold of PositionConstraints.
|
2015-02-14 09:39:16 +01:00 |
|
Faerbit
|
12099cb4a1
|
Fixed first door not opening.
|
2015-02-14 00:40:52 +01:00 |
|
Steffen Fündgens
|
e9d6ca1c1e
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-02-13 19:25:11 +01:00 |
|
Steffen Fündgens
|
9bae3554a2
|
Added a trigger to open the first door, cant close it again cause apparently i have no idea what the difference between global and shared variables in lua is...
|
2015-02-13 19:24:57 +01:00 |
|
sfroitzheim
|
1f86981271
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2015-02-13 18:18:03 +01:00 |
|
sfroitzheim
|
1adb8f1d80
|
made some extreme level-layout improvements (putting walls properly together etc)
|
2015-02-13 18:17:47 +01:00 |
|
Steffen Fündgens
|
dc5a281956
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-02-13 18:10:55 +01:00 |
|
Steffen Fündgens
|
2873d300a8
|
Added position constraints
|
2015-02-13 18:10:49 +01:00 |
|
Jasper
|
760a7c9d86
|
changed hight of camera and added camera move methode in physics
|
2015-02-13 17:47:21 +01:00 |
|
Jasper
|
3d59fb43c8
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-02-13 17:36:11 +01:00 |
|
Fabian Klemp
|
df230ea677
|
Fixed updating of lights.
|
2015-02-13 17:35:56 +01:00 |
|
Jasper
|
f2bfd12aa5
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-02-13 17:23:21 +01:00 |
|
Jasper
|
d4fe5e1ae1
|
added move system and modified the camera for less bobidity
|
2015-02-13 17:22:01 +01:00 |
|
Steffen Fündgens
|
1492a312ed
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-02-13 17:14:38 +01:00 |
|
Steffen Fündgens
|
265c0b2ce5
|
Added resetPlayer function to the level.
|
2015-02-13 17:14:29 +01:00 |
|
Fabian Klemp
|
5e07aec885
|
Updated Readme.md.
|
2015-02-13 17:11:47 +01:00 |
|
Fabian Klemp
|
fd1f32be6a
|
maxShadowRenderCount now works correctly.
|
2015-02-13 17:09:25 +01:00 |
|
Fabian Klemp
|
377902a255
|
Now also ignoring *.swp files.
|
2015-02-13 17:02:36 +01:00 |
|
Jasper
|
3f1616adf1
|
corrected camera position for specular lighting
|
2015-02-13 16:35:35 +01:00 |
|
Jasper
|
818178e665
|
Camera now with less jitter!
|
2015-02-13 16:34:39 +01:00 |
|
Jasper
|
51e9b26379
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-02-13 16:22:06 +01:00 |
|
Fabian Klemp
|
281466ebd5
|
Added maxShadowRenderCount. Controls how many shadows get rendered.
|
2015-02-13 16:20:22 +01:00 |
|
Jasper
|
98718b517e
|
Fixed non rotating objects
|
2015-02-13 16:09:18 +01:00 |
|
Fabian Klemp
|
599c849bb0
|
Merge branch 'debug-shadows'
Conflicts:
graphics.cc
graphics.hh
object.cc
|
2015-02-13 16:02:12 +01:00 |
|
Fabian Klemp
|
55434daa24
|
Updated how shadows are applied. Looks nice now.
|
2015-02-13 15:51:49 +01:00 |
|
Jasper
|
9049458ad5
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-02-13 15:46:46 +01:00 |
|
Jasper
|
75792a5723
|
added debug Camear (keys L and K to switch)
|
2015-02-13 15:46:00 +01:00 |
|
Steffen Fündgens
|
3fc8e9c11a
|
Undid something i did not want to include in the last commit.
|
2015-02-13 15:38:43 +01:00 |
|
Steffen Fündgens
|
d55bb3465c
|
Reenabled zooming with the mouse wheel.
|
2015-02-13 15:20:32 +01:00 |
|
sfroitzheim
|
38d4ef8125
|
changed heightmap to incorporate the whole vague level layout
|
2015-02-13 14:35:48 +01:00 |
|
Steffen Fündgens
|
e91d045a37
|
Code rework. Basically cleaned up a mess of tabs and whitespaces.
|
2015-02-13 13:46:41 +01:00 |
|
Steffen Fündgens
|
1585195779
|
Reduced camera mass so the camera can practically not move objects anymore. Fixed the scaling of forces on the camera with the (no more inverted) mass.
|
2015-02-13 13:00:47 +01:00 |
|