faerbit/Saxum
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity

Commit Graph

  • 275f013c2f some quick updates for the camera before working on buttons Jasper 2015-01-19 17:12:58 +0100
  • 65a826f2af some quick updates for the camera before working on buttons Jasper 2015-01-19 17:12:58 +0100
  • 6056663dde some quick updates for the camera before working on buttons Jasper 2015-01-19 17:12:58 +0100
  • 93e5c33dfd prepared camera, level and physics for the new camera Jasper 2015-01-19 16:51:35 +0100
  • 25bd4ba64e prepared camera, level and physics for the new camera Jasper 2015-01-19 16:51:35 +0100
  • 1a736dd095 prepared camera, level and physics for the new camera Jasper 2015-01-19 16:51:35 +0100
  • c9694f0b5a Added some walls and made some fixes (there are too many walls, I will fix this till tomorrow) sfroitzheim 2015-01-19 16:47:17 +0100
  • 4ce7464ae7 Added some walls and made some fixes (there are too many walls, I will fix this till tomorrow) sfroitzheim 2015-01-19 16:47:17 +0100
  • 1e6942ae37 Added some walls and made some fixes (there are too many walls, I will fix this till tomorrow) sfroitzheim 2015-01-19 16:47:17 +0100
  • 4e0fe3bee2 prepareing modified camera in physics Jasper 2015-01-19 16:30:11 +0100
  • 8306f7ff19 prepareing modified camera in physics Jasper 2015-01-19 16:30:11 +0100
  • 393e29c083 prepareing modified camera in physics Jasper 2015-01-19 16:30:11 +0100
  • 342a3691c2 Merge branch 'master' of github.com:Faerbit/swp Steffen Fündgens 2015-01-19 15:55:18 +0100
  • 5070940a94 Merge branch 'master' of github.com:Faerbit/swp Steffen Fündgens 2015-01-19 15:55:18 +0100
  • a4b734ac5b Merge branch 'master' of github.com:Faerbit/swp Steffen Fündgens 2015-01-19 15:55:18 +0100
  • 9e825ccc1e Added rotation in Compompositions.xml. Steffen Fündgens 2015-01-19 15:55:03 +0100
  • 4c71dbfbea Added rotation in Compompositions.xml. Steffen Fündgens 2015-01-19 15:55:03 +0100
  • 3f33d6cf86 Added rotation in Compompositions.xml. Steffen Fündgens 2015-01-19 15:55:03 +0100
  • cb6fdf19a7 small changes to trimesh scaling Jasper 2015-01-19 15:33:44 +0100
  • bcdbb2534c small changes to trimesh scaling Jasper 2015-01-19 15:33:44 +0100
  • 25c6c6b6e1 small changes to trimesh scaling Jasper 2015-01-19 15:33:44 +0100
  • 9b52b9badc Merge branch 'master' of github.com:Faerbit/swp Jasper 2015-01-19 15:25:08 +0100
  • c3f7b650fb Merge branch 'master' of github.com:Faerbit/swp Jasper 2015-01-19 15:25:08 +0100
  • b8616609a5 Merge branch 'master' of github.com:Faerbit/swp Jasper 2015-01-19 15:25:08 +0100
  • 8c8655c096 added trimesh back to collision Jasper 2015-01-19 15:24:44 +0100
  • 2edbb196c2 added trimesh back to collision Jasper 2015-01-19 15:24:44 +0100
  • 1fdf8fabaf added trimesh back to collision Jasper 2015-01-19 15:24:44 +0100
  • e7839b3363 Merge branch 'master' of https://github.com/Faerbit/swp sfroitzheim 2015-01-19 15:18:34 +0100
  • aeb4b638c7 Merge branch 'master' of https://github.com/Faerbit/swp sfroitzheim 2015-01-19 15:18:34 +0100
  • 8c5d485101 Merge branch 'master' of https://github.com/Faerbit/swp sfroitzheim 2015-01-19 15:18:34 +0100
  • e04aca7841 Added improved starting bridge version sfroitzheim 2015-01-19 15:15:18 +0100
  • 65ba8c0249 Added improved starting bridge version sfroitzheim 2015-01-19 15:15:18 +0100
  • 1de9e862d0 Added improved starting bridge version sfroitzheim 2015-01-19 15:15:18 +0100
  • 12ee9a4ac5 fixed the issue with shpere portruding into blocks Jasper 2015-01-19 15:11:56 +0100
  • 5670d35865 fixed the issue with shpere portruding into blocks Jasper 2015-01-19 15:11:56 +0100
  • 0d101a3e4b fixed the issue with shpere portruding into blocks Jasper 2015-01-19 15:11:56 +0100
  • d25db437bb fixed small bug with balls Jasper 2015-01-19 14:57:20 +0100
  • 7cb3e3d620 fixed small bug with balls Jasper 2015-01-19 14:57:20 +0100
  • 7d9e65fe13 fixed small bug with balls Jasper 2015-01-19 14:57:20 +0100
  • 9cb0bbfe56 Merge branch 'master' of github.com:Faerbit/swp Jasper 2015-01-19 14:01:46 +0100
  • 19f1f0bb44 Merge branch 'master' of github.com:Faerbit/swp Jasper 2015-01-19 14:01:46 +0100
  • ac3136964f Merge branch 'master' of github.com:Faerbit/swp Jasper 2015-01-19 14:01:46 +0100
  • ca98df63ac added collision masks and button creator Jasper 2015-01-19 14:01:05 +0100
  • c2634543dc added collision masks and button creator Jasper 2015-01-19 14:01:05 +0100
  • 94d766e11f added collision masks and button creator Jasper 2015-01-19 14:01:05 +0100
  • 8d46d98de0 Added torch for testing. sfroitzheim 2015-01-19 13:59:50 +0100
  • 42b65fa9c0 Added torch for testing. sfroitzheim 2015-01-19 13:59:50 +0100
  • 57fbc655ab Added torch for testing. sfroitzheim 2015-01-19 13:59:50 +0100
  • 2c8c69a5dc Fixing shader; merge was wrong. Steffen Fündgens 2015-01-19 13:44:38 +0100
  • a8fee3ad84 Fixing shader; merge was wrong. Steffen Fündgens 2015-01-19 13:44:38 +0100
  • defbcc056b Fixing shader; merge was wrong. Steffen Fündgens 2015-01-19 13:44:38 +0100
  • 1206a7b801 Merge branch 'linearized' of github.com:Faerbit/swp Steffen Fündgens 2015-01-19 13:16:08 +0100
  • 5dcabf0290 Merge branch 'linearized' of github.com:Faerbit/swp Steffen Fündgens 2015-01-19 13:16:08 +0100
  • 7d372b632f Merge branch 'linearized' of github.com:Faerbit/swp Steffen Fündgens 2015-01-19 13:16:08 +0100
  • 7160330bfd Added more error checking to the converter. Steffen Fündgens 2015-01-19 11:15:41 +0100
  • ba14a492f1 Added more error checking to the converter. Steffen Fündgens 2015-01-19 11:15:41 +0100
  • 4fa28b2088 Added more error checking to the converter. Steffen Fündgens 2015-01-19 11:15:41 +0100
  • f83099bb2d Fixed the bug that caused the duplicate marble lately. Steffen Fündgens 2015-01-19 11:15:06 +0100
  • 70dc3f1450 Fixed the bug that caused the duplicate marble lately. Steffen Fündgens 2015-01-19 11:15:06 +0100
  • 60f24c762f Fixed the bug that caused the duplicate marble lately. Steffen Fündgens 2015-01-19 11:15:06 +0100
  • 6210d2e35b Removed Cascaded Shadow Mapping because it is not realistic to get it working in the remaining time. Faerbit 2015-01-19 00:52:57 +0100
  • 1cef3d4d0a Removed Cascaded Shadow Mapping because it is not realistic to get it working in the remaining time. Faerbit 2015-01-19 00:52:57 +0100
  • f6a88683b7 Removed Cascaded Shadow Mapping because it is not realistic to get it working in the remaining time. Faerbit 2015-01-19 00:52:57 +0100
  • 955eee5a60 Linearization of depth buffer. Didn't change graphics in any way. linearized Faerbit 2015-01-19 00:40:28 +0100
  • 7a830a472e Linearization of depth buffer. Didn't change graphics in any way. Faerbit 2015-01-19 00:40:28 +0100
  • ee87a259a3 Linearization of depth buffer. Didn't change graphics in any way. Faerbit 2015-01-19 00:40:28 +0100
  • d26722595e Added the option to define initial position constraints in the Level.xml file. Steffen 2015-01-17 14:07:12 +0100
  • 75440f919f Added the option to define initial position constraints in the Level.xml file. Steffen 2015-01-17 14:07:12 +0100
  • 36ea806c4f Added the option to define initial position constraints in the Level.xml file. Steffen 2015-01-17 14:07:12 +0100
  • 10017bb855 Updated scripts and added scripts for opening the door in Level1 Steffen 2015-01-17 13:37:09 +0100
  • e66fb546b7 Updated scripts and added scripts for opening the door in Level1 Steffen 2015-01-17 13:37:09 +0100
  • 0184a1684a Updated scripts and added scripts for opening the door in Level1 Steffen 2015-01-17 13:37:09 +0100
  • 04df8bd22f Created a moveObject function in the Level class. Steffen 2015-01-17 13:30:33 +0100
  • 3e78b4f4bb Created a moveObject function in the Level class. Steffen 2015-01-17 13:30:33 +0100
  • 698d917d4c Created a moveObject function in the Level class. Steffen 2015-01-17 13:30:33 +0100
  • f496532126 Removed the lua state from the physics. Steffen 2015-01-17 13:11:43 +0100
  • aca199cd1b Removed the lua state from the physics. Steffen 2015-01-17 13:11:43 +0100
  • b3f11542d2 Removed the lua state from the physics. Steffen 2015-01-17 13:11:43 +0100
  • b897dc5457 Added new composition Steffen 2015-01-17 12:38:27 +0100
  • 2327d80810 Added new composition Steffen 2015-01-17 12:38:27 +0100
  • abf382a70e Added new composition Steffen 2015-01-17 12:38:27 +0100
  • 147ae17789 Added ignoreHeightmap option to compositions in Compositions.xml. Steffen 2015-01-17 12:24:54 +0100
  • a128c947b1 Added ignoreHeightmap option to compositions in Compositions.xml. Steffen 2015-01-17 12:24:54 +0100
  • acd847921d Added ignoreHeightmap option to compositions in Compositions.xml. Steffen 2015-01-17 12:24:54 +0100
  • 02a9cd7559 Added to TARGET_LINK_LIBRARIES, now compiles on my home pc. Steffen 2015-01-17 12:12:27 +0100
  • 53fe90fd14 Added to TARGET_LINK_LIBRARIES, now compiles on my home pc. Steffen 2015-01-17 12:12:27 +0100
  • cc2ed4fcf9 Added to TARGET_LINK_LIBRARIES, now compiles on my home pc. Steffen 2015-01-17 12:12:27 +0100
  • cba7d170da Merge branch 'master' of github.com:Faerbit/swp Steffen Fündgens 2015-01-16 16:52:11 +0100
  • f03a01461d Merge branch 'master' of github.com:Faerbit/swp Steffen Fündgens 2015-01-16 16:52:11 +0100
  • 7935b6aa0c Merge branch 'master' of github.com:Faerbit/swp Steffen Fündgens 2015-01-16 16:52:11 +0100
  • 66f892bc15 started working on an actual trigger for Level1 Steffen Fündgens 2015-01-16 16:52:04 +0100
  • 90d64bbade started working on an actual trigger for Level1 Steffen Fündgens 2015-01-16 16:52:04 +0100
  • 476c40cb00 started working on an actual trigger for Level1 Steffen Fündgens 2015-01-16 16:52:04 +0100
  • ed6e257b69 moved the triggered/not triggered information to lua Steffen Fündgens 2015-01-16 16:51:36 +0100
  • 0d8dc4b10d moved the triggered/not triggered information to lua Steffen Fündgens 2015-01-16 16:51:36 +0100
  • 956da26624 moved the triggered/not triggered information to lua Steffen Fündgens 2015-01-16 16:51:36 +0100
  • ec29499416 Fixed a few bugs like duplicate marble(bridge will be fixed at monday) sfroitzheim 2015-01-16 16:47:55 +0100
  • 98091fa305 Fixed a few bugs like duplicate marble(bridge will be fixed at monday) sfroitzheim 2015-01-16 16:47:55 +0100
  • 44d7d4f107 Fixed a few bugs like duplicate marble(bridge will be fixed at monday) sfroitzheim 2015-01-16 16:47:55 +0100
  • f39fd522ce Merge branch 'master' of https://github.com/Faerbit/swp sfroitzheim 2015-01-16 16:38:24 +0100