Steffen Fündgens
|
7f8150d5ed
|
Integrated Simons Level1.png changes from the .xcf.
|
2015-02-27 17:21:52 +01:00 |
|
Steffen Fündgens
|
635f6ae546
|
Merge with the worst possible conflicts: png and xml. Think i didnt yet integrate Simons latest png changes.
|
2015-02-27 17:11:44 +01:00 |
|
Steffen Fündgens
|
eab9270b94
|
Turned the heightmap loading around so the level now is like the png. The wall backsides dont seem to have textures...
|
2015-02-27 16:53:46 +01:00 |
|
Steffen Fündgens
|
87b9634703
|
Moved the heightmap, so it nearly fits with the graphical one.
|
2015-02-27 16:20:29 +01:00 |
|
Steffen Fündgens
|
650ad89067
|
Adjusted variable name i forgot earlier.
|
2015-02-27 16:01:59 +01:00 |
|
Jasper
|
a64b1dac00
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-02-27 16:01:17 +01:00 |
|
Jasper
|
d49baa2a8c
|
added convextrianglemeshshape
|
2015-02-27 15:58:21 +01:00 |
|
sfroitzheim
|
23a3730c37
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2015-02-27 15:48:39 +01:00 |
|
sfroitzheim
|
134faaa67e
|
prepared switch room for adding braziers
|
2015-02-27 15:47:36 +01:00 |
|
Faerbit
|
272dce8900
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-02-27 15:43:52 +01:00 |
|
Faerbit
|
eff6cabd09
|
Added solver which helps with selecting a fit function for the flames.
|
2015-02-27 15:43:33 +01:00 |
|
sfroitzheim
|
84a9899516
|
Completed work on the switch room (for now)
|
2015-02-27 15:42:16 +01:00 |
|
Steffen Fündgens
|
6c78c93c2b
|
Increased size of directional light shadow map.
|
2015-02-27 14:37:57 +01:00 |
|
Steffen Fündgens
|
abeab11875
|
Solved jittering by moving physics update in the level update.
|
2015-02-27 12:56:02 +01:00 |
|
Steffen Fündgens
|
2d65071887
|
Not updating old camera twice anymore.
|
2015-02-27 12:55:06 +01:00 |
|
sfroitzheim
|
9f19d74c2a
|
Added an example of bridges meeting properly to the scene (in the big switch room where are no switches yet)
|
2015-02-26 17:11:02 +01:00 |
|
sfroitzheim
|
501aa3def9
|
Added the hidden hint model
|
2015-02-26 15:50:36 +01:00 |
|
sfroitzheim
|
53b6db98e6
|
Added a brazier model
|
2015-02-26 15:49:34 +01:00 |
|
Faerbit
|
a77e06f8c8
|
Added simple geometry shader which draws a red triangle which changes it's height over time.
|
2015-02-24 23:30:59 +01:00 |
|
Faerbit
|
174fafe5bc
|
Removing flame offset from Level.xml because it should be in the Compositions.xml.
|
2015-02-24 15:28:53 +01:00 |
|
Faerbit
|
2b93aff35d
|
Clarifing which offset is meant.
|
2015-02-24 14:04:56 +01:00 |
|
Faerbit
|
510001b943
|
Adding flame.
|
2015-02-24 12:56:55 +01:00 |
|
Faerbit
|
97a315661f
|
Removing flame class and integrate it into light class because it was unpractical.
|
2015-02-24 12:56:40 +01:00 |
|
Faerbit
|
b3b215e628
|
Fixing windows build. Lua now cross compiles.
|
2015-02-24 11:07:52 +01:00 |
|
Faerbit
|
edd4f53f66
|
While cleaning also clean lua.
|
2015-02-24 11:02:24 +01:00 |
|
Faerbit
|
fd21dd0f9f
|
Removing maybe unitiliazed errors.
|
2015-02-24 10:50:11 +01:00 |
|
Steffen Fündgens
|
320b765951
|
Adjusted the converter to be robust against IDs being overwritten with zeros in the png. Sucessfully ran it.
|
2015-02-20 15:06:43 +01:00 |
|
Steffen Fündgens
|
087d36aa15
|
Unified object and texture filenames.
|
2015-02-20 13:56:40 +01:00 |
|
Steffen Fündgens
|
236067435d
|
Updated Level0 to be runable.
|
2015-02-20 13:40:59 +01:00 |
|
Steffen Fündgens
|
8a76ad4133
|
Updated currently unused scripts.
|
2015-02-20 13:26:09 +01:00 |
|
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 |
|