Commit Graph

  • 53c5d688db Merge branch 'master' of github.com:Faerbit/swp Jasper 2015-02-27 16:01:17 +0100
  • d49baa2a8c added convextrianglemeshshape Jasper 2015-02-27 15:58:21 +0100
  • f6d57e22c5 added convextrianglemeshshape Jasper 2015-02-27 15:58:21 +0100
  • 23a3730c37 Merge branch 'master' of https://github.com/Faerbit/swp sfroitzheim 2015-02-27 15:48:39 +0100
  • 3329823218 Merge branch 'master' of https://github.com/Faerbit/swp sfroitzheim 2015-02-27 15:48:39 +0100
  • 134faaa67e prepared switch room for adding braziers sfroitzheim 2015-02-27 15:47:36 +0100
  • 90fa31cbc9 prepared switch room for adding braziers sfroitzheim 2015-02-27 15:47:36 +0100
  • 272dce8900 Merge branch 'master' of github.com:Faerbit/swp Faerbit 2015-02-27 15:43:52 +0100
  • a533f76e87 Merge branch 'master' of github.com:Faerbit/swp Faerbit 2015-02-27 15:43:52 +0100
  • eff6cabd09 Added solver which helps with selecting a fit function for the flames. Faerbit 2015-02-27 15:43:33 +0100
  • 2506a941d8 Added solver which helps with selecting a fit function for the flames. Faerbit 2015-02-27 15:43:33 +0100
  • 84a9899516 Completed work on the switch room (for now) sfroitzheim 2015-02-27 15:42:16 +0100
  • c04d8105bb Completed work on the switch room (for now) sfroitzheim 2015-02-27 15:42:16 +0100
  • 6c78c93c2b Increased size of directional light shadow map. Steffen Fündgens 2015-02-27 14:37:57 +0100
  • 4870357789 Increased size of directional light shadow map. Steffen Fündgens 2015-02-27 14:37:57 +0100
  • abeab11875 Solved jittering by moving physics update in the level update. Steffen Fündgens 2015-02-27 12:56:02 +0100
  • 8773ac8f52 Solved jittering by moving physics update in the level update. Steffen Fündgens 2015-02-27 12:56:02 +0100
  • 2d65071887 Not updating old camera twice anymore. Steffen Fündgens 2015-02-27 12:55:06 +0100
  • 8e34b56f48 Not updating old camera twice anymore. Steffen Fündgens 2015-02-27 12:55:06 +0100
  • 9f19d74c2a Added an example of bridges meeting properly to the scene (in the big switch room where are no switches yet) sfroitzheim 2015-02-26 17:11:02 +0100
  • 5cb28c8440 Added an example of bridges meeting properly to the scene (in the big switch room where are no switches yet) sfroitzheim 2015-02-26 17:11:02 +0100
  • 501aa3def9 Added the hidden hint model sfroitzheim 2015-02-26 15:50:36 +0100
  • 9fe37ee2d8 Added the hidden hint model sfroitzheim 2015-02-26 15:50:36 +0100
  • 53b6db98e6 Added a brazier model sfroitzheim 2015-02-26 15:49:34 +0100
  • 0ad57ec682 Added a brazier model sfroitzheim 2015-02-26 15:49:34 +0100
  • a77e06f8c8 Added simple geometry shader which draws a red triangle which changes it's height over time. Faerbit 2015-02-24 23:30:59 +0100
  • b0b2c71139 Added simple geometry shader which draws a red triangle which changes it's height over time. Faerbit 2015-02-24 23:30:59 +0100
  • 174fafe5bc Removing flame offset from Level.xml because it should be in the Compositions.xml. Faerbit 2015-02-24 15:28:53 +0100
  • a21aa613bd Removing flame offset from Level.xml because it should be in the Compositions.xml. Faerbit 2015-02-24 15:28:53 +0100
  • 2b93aff35d Clarifing which offset is meant. Faerbit 2015-02-24 14:04:56 +0100
  • 1f89ec9e32 Clarifing which offset is meant. Faerbit 2015-02-24 14:04:56 +0100
  • 510001b943 Adding flame. Faerbit 2015-02-24 12:56:55 +0100
  • e08eda317c Adding flame. Faerbit 2015-02-24 12:56:55 +0100
  • 97a315661f Removing flame class and integrate it into light class because it was unpractical. Faerbit 2015-02-24 12:56:40 +0100
  • a2d0133acd Removing flame class and integrate it into light class because it was unpractical. Faerbit 2015-02-24 12:56:40 +0100
  • b3b215e628 Fixing windows build. Lua now cross compiles. Faerbit 2015-02-24 11:07:52 +0100
  • 6115311173 Fixing windows build. Lua now cross compiles. Faerbit 2015-02-24 11:07:52 +0100
  • edd4f53f66 While cleaning also clean lua. Faerbit 2015-02-24 11:02:24 +0100
  • 20b6987d0a While cleaning also clean lua. Faerbit 2015-02-24 11:02:24 +0100
  • fd21dd0f9f Removing maybe unitiliazed errors. Faerbit 2015-02-24 10:50:11 +0100
  • fc15047d56 Removing maybe unitiliazed errors. Faerbit 2015-02-24 10:50:11 +0100
  • 320b765951 Adjusted the converter to be robust against IDs being overwritten with zeros in the png. Sucessfully ran it. Steffen Fündgens 2015-02-20 15:06:43 +0100
  • c569e5099d Adjusted the converter to be robust against IDs being overwritten with zeros in the png. Sucessfully ran it. Steffen Fündgens 2015-02-20 15:06:43 +0100
  • 087d36aa15 Unified object and texture filenames. Steffen Fündgens 2015-02-20 13:56:40 +0100
  • a8e4472367 Unified object and texture filenames. Steffen Fündgens 2015-02-20 13:56:40 +0100
  • 236067435d Updated Level0 to be runable. Steffen Fündgens 2015-02-20 13:40:59 +0100
  • 0db6590f85 Updated Level0 to be runable. Steffen Fündgens 2015-02-20 13:40:59 +0100
  • 8a76ad4133 Updated currently unused scripts. Steffen Fündgens 2015-02-20 13:26:09 +0100
  • 7ad9965c74 Updated currently unused scripts. Steffen Fündgens 2015-02-20 13:26:09 +0100
  • 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. Steffen Fündgens 2015-02-20 13:11:05 +0100
  • a20a55dc79 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. Steffen Fündgens 2015-02-20 13:11:05 +0100
  • c2621752fc Removing outdated comment. Faerbit 2015-02-19 00:30:35 +0100
  • e67720650f Removing outdated comment. Faerbit 2015-02-19 00:30:35 +0100
  • 153e0116c7 Now using the xml query functions everywhere in the loader class. Steffen 2015-02-18 21:20:29 +0100
  • 8c6ae87b83 Now using the xml query functions everywhere in the loader class. Steffen 2015-02-18 21:20:29 +0100
  • 99d8a45380 Added xml query functions to the loader class, using them in loadConfig(). Steffen 2015-02-18 20:10:30 +0100
  • 2d5fdc488f Added xml query functions to the loader class, using them in loadConfig(). Steffen 2015-02-18 20:10:30 +0100
  • af9f6d6933 Added loading of flames. Steffen Fündgens 2015-02-17 12:54:21 +0100
  • 5608790231 Added loading of flames. Steffen Fündgens 2015-02-17 12:54:21 +0100
  • f92c7bf6c3 Added vector of flames to the level. Steffen Fündgens 2015-02-17 12:41:15 +0100
  • aa1287cdaa Added vector of flames to the level. Steffen Fündgens 2015-02-17 12:41:15 +0100
  • c8788f3329 Added new flame class. Steffen Fündgens 2015-02-17 12:36:43 +0100
  • 25e016d70f Added new flame class. Steffen Fündgens 2015-02-17 12:36:43 +0100
  • 88d31bc68a Adjusted the mass of switchInner and the force that keeps it in place. The movableBlock can now push the switch down. Steffen Fündgens 2015-02-17 12:25:12 +0100
  • a209acc6c9 Adjusted the mass of switchInner and the force that keeps it in place. The movableBlock can now push the switch down. Steffen Fündgens 2015-02-17 12:25:12 +0100
  • 3764bb5c6a Adjusted the size of the movableBlock. Steffen Fündgens 2015-02-17 12:04:15 +0100
  • d5223ae540 Adjusted the size of the movableBlock. Steffen Fündgens 2015-02-17 12:04:15 +0100
  • 1742d83d4b Give the luaState a proper name. Faerbit 2015-02-15 19:37:13 +0100
  • 877bfae6d0 Give the luaState a proper name. Faerbit 2015-02-15 19:37:13 +0100
  • efa151aa73 Do not implicitly set extensions of script files. Faerbit 2015-02-15 19:34:15 +0100
  • 397d2729e8 Do not implicitly set extensions of script files. Faerbit 2015-02-15 19:34:15 +0100
  • fb028a899f Moved setting of package.path in lua to init.lua Faerbit 2015-02-15 19:32:19 +0100
  • 23fc196bea Moved setting of package.path in lua to init.lua Faerbit 2015-02-15 19:32:19 +0100
  • ae1d04b5ee Removed commented code. Faerbit 2015-02-15 19:20:21 +0100
  • f6b2cc938f Removed commented code. Faerbit 2015-02-15 19:20:21 +0100
  • 2c699590e2 Changed position constraints so they dont bounce the door up and down. Steffen 2015-02-15 16:12:11 +0100
  • 775f509464 Changed position constraints so they dont bounce the door up and down. Steffen 2015-02-15 16:12:11 +0100
  • 0e550e52c6 Got scripts to work as intended, had to use an ugly hack for it. Steffen 2015-02-15 16:11:31 +0100
  • 115e827ef1 Got scripts to work as intended, had to use an ugly hack for it. Steffen 2015-02-15 16:11:31 +0100
  • de2ba0acb9 Updated package.sh to fit new directory structure. Faerbit 2015-02-15 11:20:03 +0100
  • 243d76ab5b Updated package.sh to fit new directory structure. Faerbit 2015-02-15 11:20:03 +0100
  • 431a9e58b1 Unified how pathes are interpreted in config.xml. Faerbit 2015-02-14 09:55:43 +0100
  • e88ff9f1ac Unified how pathes are interpreted in config.xml. Faerbit 2015-02-14 09:55:43 +0100
  • 97329141bc Restructured directory tree. Faerbit 2015-02-14 09:49:29 +0100
  • 89a73f3776 Restructured directory tree. Faerbit 2015-02-14 09:49:29 +0100
  • f05e3d301c Moved setting of sleepingThreshold of PositionConstraints. Faerbit 2015-02-14 09:39:16 +0100
  • cc35f5c4fc Moved setting of sleepingThreshold of PositionConstraints. Faerbit 2015-02-14 09:39:16 +0100
  • 12099cb4a1 Fixed first door not opening. Faerbit 2015-02-14 00:40:52 +0100
  • ab155f7e48 Fixed first door not opening. Faerbit 2015-02-14 00:40:52 +0100
  • e9d6ca1c1e Merge branch 'master' of github.com:Faerbit/swp Steffen Fündgens 2015-02-13 19:25:11 +0100
  • e13659b787 Merge branch 'master' of github.com:Faerbit/swp Steffen Fündgens 2015-02-13 19:25:11 +0100
  • 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... Steffen Fündgens 2015-02-13 19:24:57 +0100
  • 0d64f064ed 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... Steffen Fündgens 2015-02-13 19:24:57 +0100
  • 1f86981271 Merge branch 'master' of https://github.com/Faerbit/swp sfroitzheim 2015-02-13 18:18:03 +0100
  • 4113b8010f Merge branch 'master' of https://github.com/Faerbit/swp sfroitzheim 2015-02-13 18:18:03 +0100
  • 1adb8f1d80 made some extreme level-layout improvements (putting walls properly together etc) sfroitzheim 2015-02-13 18:17:47 +0100
  • 77d6e16db8 made some extreme level-layout improvements (putting walls properly together etc) sfroitzheim 2015-02-13 18:17:47 +0100
  • dc5a281956 Merge branch 'master' of github.com:Faerbit/swp Steffen Fündgens 2015-02-13 18:10:55 +0100
  • 162a54757b Merge branch 'master' of github.com:Faerbit/swp Steffen Fündgens 2015-02-13 18:10:55 +0100
  • 2873d300a8 Added position constraints Steffen Fündgens 2015-02-13 18:10:49 +0100