faerbit/Saxum
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity
758 Commits 16 Branches 6 Tags 174 MiB
60f88a13df
Commit Graph

758 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steffen Fündgens
8f3875a1c0 Adjusted a composition, found out that all TriMeshs fall through the heightmap. 2015-02-03 13:10:14 +01:00
Steffen Fündgens
df884666b5 Scaling of the player ball is now possible. 2015-02-03 12:36:42 +01:00
Steffen Fündgens
c57d73317c Added scaling to the physic of Box and Button. Adjusted the objectData for block.obj perfectly. 2015-02-03 12:29:35 +01:00
Faerbit
d82a8d96bd Changed how depth values are written. Works even less than before. 2015-02-02 19:58:16 +01:00
Steffen Fündgens
bb57eb2263 Added status prints to the converter. 2015-02-02 13:37:58 +01:00
Steffen Fündgens
a018d5f547 Added and tested physics boxes for the switchOuter. Graphical object to match them is missing. 2015-02-02 13:20:20 +01:00
Steffen Fündgens
1d89537a33 Changed trigger indices to match physicObjects instead of objects, adjusted removeObject function. 2015-02-02 12:43:32 +01:00
Steffen Fündgens
dbd61cd27e Removed unnecessary rotation from a lightsource. 2015-02-02 12:40:25 +01:00
Faerbit
64b4f52fcc Merge branch 'debug-shadows' of github.com:Faerbit/swp into debug-shadows 2015-01-31 20:02:28 +01:00
Faerbit
f025b69206 Tried correcting an error. Unsure if it will work. 2015-01-31 20:02:23 +01:00
Jasper
0553b64abc Merge branch 'master' of github.com:Faerbit/swp 2015-01-30 17:33:41 +01:00
Jasper
a49f4509b1 added inital rotation to physics, had the springs fixed (was NOT my fault) 2015-01-30 17:29:48 +01:00
Fabian Klemp
9fde8009e8 Additional debug stuff. 2015-01-30 15:47:07 +01:00
sfroitzheim
3278bf5302 Added some new walls and changed some physics properties (still not working properly) 2015-01-30 15:28:09 +01:00
Fabian Klemp
6549406049 Only sample shadows from the first light source. 2015-01-30 15:11:00 +01:00
sfroitzheim
6b00c574b8 Added new ground tiles for a ruins area to the data 2015-01-30 14:15:07 +01:00
Jasper
7f87d56b0e fine tuned the camera nad added more comments to physics.cc 2015-01-30 13:32:16 +01:00
Jasper
477da05464 implimented a rough version of a physics driven camera 2015-01-29 14:10:28 +01:00
Jasper
b21b9e3636 fixed size ratios of objects 2015-01-29 13:39:37 +01:00
Jasper
ecff8b5cf7 added a scaling factor to triangle meshes to compensate for diffrent scaling (somehow from bullet, idk) and started adding comments to physics.cc 2015-01-29 13:15:45 +01:00
Faerbit
f275733eeb Now mirroring the cube face on their own again. 2015-01-28 17:26:02 +01:00
sfroitzheim
fcbc228438 Fixed some problems with the new bridge (wasn't able to roll onto it) and changed some heightmap heights 2015-01-28 15:49:38 +01:00
sfroitzheim
b957ba27bd Added a model for a gate and added it to the scene with some additional level improvements 2015-01-28 15:19:35 +01:00
Steffen Fündgens
ccc7cbaa9c Deleted a torch that had a duplicate ID and let the converter recreate it. Shadows look weirder now. This might be good for debugging the shadows. 2015-01-27 12:25:16 +01:00
Steffen Fündgens
0ce663a592 Fixed a bug i created in my previous commit. Made output in case of errors more informative. 2015-01-27 12:21:30 +01:00
Steffen Fündgens
01a9126b0a Improved user interaction and a little code rework. 2015-01-27 11:50:51 +01:00
Faerbit
9c8f05e906 Small parameter changes. 2015-01-27 11:14:00 +01:00
Faerbit
cf9e3e2b39 Fixed saving of depthbuffer. 2015-01-26 23:11:04 +01:00
Faerbit
7d21978903 Implemented saving depthbuffer face to png. Doesn't work right now. 2015-01-26 21:48:44 +01:00
Faerbit
00f9091bc3 Updating lights on creation and also using constant. 2015-01-26 00:18:09 +01:00
Faerbit
4cef0b31d3 Updating lights only every half a second now, for performance. 2015-01-26 00:06:31 +01:00
Faerbit
6fa2e4e1b8 Moved all GLFW related stuff to the main files. 2015-01-25 23:29:37 +01:00
Faerbit
9589f70c77 Updated Readme.md. 2015-01-25 23:09:23 +01:00
Faerbit
106ec8b6f6 Changed comment. 2015-01-25 23:07:49 +01:00
Steffen Fündgens
688a4e6114 Rotate parameter for physics.add should now be false if the object has a positionConstraint. 2015-01-23 16:51:09 +01:00
Steffen Fündgens
a996a09457 Corrected spaces. 2015-01-23 16:41:56 +01:00
Steffen Fündgens
3ceaa89b27 Merge branch 'master' of github.com:Faerbit/swp 2015-01-23 16:04:13 +01:00
Steffen Fündgens
2dee196307 Converter can now reuse IDs of deleted compositions. 2015-01-23 16:02:50 +01:00
Steffen Fündgens
f3580555cd Added more exits after errors. 2015-01-23 16:02:10 +01:00
sfroitzheim
c24a7162c6 Merge branch 'master' of https://github.com/Faerbit/swp 2015-01-23 14:56:19 +01:00
sfroitzheim
06002f78b6 Added some walls to the scene properly (weird physics bugs are apparent) 2015-01-23 14:56:02 +01:00
Steffen Fündgens
e9390d860b Fixed a drawing bug for the pointlight shadows. 2015-01-23 14:33:04 +01:00
Steffen Fündgens
e1654ded34 Removed unnecessary bind and clear calls. 2015-01-23 14:22:24 +01:00
sfroitzheim
73704434b1 Fixed merge conflicts. 2015-01-23 14:10:35 +01:00
sfroitzheim
bf0559e1ec Merge branch 'master' of https://github.com/Faerbit/swp 2015-01-23 14:08:38 +01:00
Steffen Fündgens
f0cf0583e1 Forgot one thing. 2015-01-23 14:08:30 +01:00
sfroitzheim
c95430c25e Merge branch 'master' of https://github.com/Faerbit/swp 2015-01-23 14:07:29 +01:00
sfroitzheim
0d185fd924 Merge branch 'master' of https://github.com/Faerbit/swp 
Conflicts:
	Levels/ObjectSetups/Compositions.xml
	Levels/ObjectSetups/Level1.png
	Levels/ObjectSetups/Level1.xcf
	Levels/ObjectSetups/Level1.xml
 2015-01-23 14:06:20 +01:00
Steffen Fündgens
c92bb70ae5 Merge branch 'master' of github.com:Faerbit/swp 2015-01-23 14:01:06 +01:00
Steffen Fündgens
c7931aed20 Fixed mirroring of shadows by inverting coordinates instead of blitting framebuffers(performance...). 2015-01-23 14:00:26 +01:00