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

554 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steffen Fündgens
ea58f2fbce Added config.xml, not using it yet. 2015-02-06 13:06:42 +01:00
Steffen Fündgens
320c1cb152 Moved loading of the terrain to the loader, now also reading parameters for it from xml. 2015-02-06 12:51:53 +01:00
Steffen Fündgens
5c2491557b Added terrain parameters to the xml. 2015-02-06 12:37:00 +01:00
Faerbit
7e8b0d4c58 Moved loading functionality to loader class. 2015-02-04 17:16:06 +01:00
Steffen Fündgens
bb1cf8dea7 Added a comment and changed dampning values that were randomly 1. 2015-02-03 13:21:52 +01:00
Steffen Fündgens
c4b01beaa8 Adjusted a composition, found out that all TriMeshs fall through the heightmap. 2015-02-03 13:10:14 +01:00
Steffen Fündgens
e7ff009482 Scaling of the player ball is now possible. 2015-02-03 12:36:42 +01:00
Steffen Fündgens
9ffe3cd886 Added scaling to the physic of Box and Button. Adjusted the objectData for block.obj perfectly. 2015-02-03 12:29:35 +01:00
Steffen Fündgens
5c1a342cdb Added status prints to the converter. 2015-02-02 13:37:58 +01:00
Steffen Fündgens
35a13886c3 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
08e5492b4f Changed trigger indices to match physicObjects instead of objects, adjusted removeObject function. 2015-02-02 12:43:32 +01:00
Steffen Fündgens
2eaf2f7a58 Removed unnecessary rotation from a lightsource. 2015-02-02 12:40:25 +01:00
Jasper
1989cb6b13 Merge branch 'master' of github.com:Faerbit/swp 2015-01-30 17:33:41 +01:00
Jasper
5e2d2d4e57 added inital rotation to physics, had the springs fixed (was NOT my fault) 2015-01-30 17:29:48 +01:00
sfroitzheim
642caa85f6 Added some new walls and changed some physics properties (still not working properly) 2015-01-30 15:28:09 +01:00
sfroitzheim
4883b753c0 Added new ground tiles for a ruins area to the data 2015-01-30 14:15:07 +01:00
Jasper
198dc0614f fine tuned the camera nad added more comments to physics.cc 2015-01-30 13:32:16 +01:00
Jasper
9c6cd7c59d implimented a rough version of a physics driven camera 2015-01-29 14:10:28 +01:00
Jasper
ae5d31e04c fixed size ratios of objects 2015-01-29 13:39:37 +01:00
Jasper
8620e16681 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
sfroitzheim
e0d9058aef 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
190df8b936 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
ec8767c14c 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
d6ed98b992 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
ba0677adde Improved user interaction and a little code rework. 2015-01-27 11:50:51 +01:00
Faerbit
65087ece48 Updating lights on creation and also using constant. 2015-01-26 00:18:09 +01:00
Faerbit
4d3db6f285 Updating lights only every half a second now, for performance. 2015-01-26 00:06:31 +01:00
Faerbit
81f94ba221 Moved all GLFW related stuff to the main files. 2015-01-25 23:29:37 +01:00
Faerbit
b6a2b0d7b3 Updated Readme.md. 2015-01-25 23:09:23 +01:00
Faerbit
4c5bbb3c73 Changed comment. 2015-01-25 23:07:49 +01:00
Steffen Fündgens
9088bb4561 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
d25e18ccc6 Corrected spaces. 2015-01-23 16:41:56 +01:00
Steffen Fündgens
ec7250e937 Merge branch 'master' of github.com:Faerbit/swp 2015-01-23 16:04:13 +01:00
Steffen Fündgens
a9ab76ea51 Converter can now reuse IDs of deleted compositions. 2015-01-23 16:02:50 +01:00
Steffen Fündgens
5a860f68c3 Added more exits after errors. 2015-01-23 16:02:10 +01:00
sfroitzheim
c29ced5210 Merge branch 'master' of https://github.com/Faerbit/swp 2015-01-23 14:56:19 +01:00
sfroitzheim
89741cfcb3 Added some walls to the scene properly (weird physics bugs are apparent) 2015-01-23 14:56:02 +01:00
Steffen Fündgens
f2353d670f Fixed a drawing bug for the pointlight shadows. 2015-01-23 14:33:04 +01:00
Steffen Fündgens
e9e7fe1f7c Removed unnecessary bind and clear calls. 2015-01-23 14:22:24 +01:00
sfroitzheim
db3fab3d35 Fixed merge conflicts. 2015-01-23 14:10:35 +01:00
sfroitzheim
56f179e5af Merge branch 'master' of https://github.com/Faerbit/swp 2015-01-23 14:08:38 +01:00
Steffen Fündgens
a4ae90082a Forgot one thing. 2015-01-23 14:08:30 +01:00
sfroitzheim
cfbf1b9208 Merge branch 'master' of https://github.com/Faerbit/swp 2015-01-23 14:07:29 +01:00
sfroitzheim
bdb92b2cf1 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
f7e097029a Merge branch 'master' of github.com:Faerbit/swp 2015-01-23 14:01:06 +01:00
Steffen Fündgens
00de8c0e82 Fixed mirroring of shadows by inverting coordinates instead of blitting framebuffers(performance...). 2015-01-23 14:00:26 +01:00
sfroitzheim
7c1f0e7960 Merge branch 'master' of https://github.com/Faerbit/swp 
Conflicts:
	Levels/ObjectSetups/Level1.xml
 2015-01-23 13:56:40 +01:00
Jasper
4c1860429a prepare for peoples 2015-01-23 13:31:19 +01:00
Jasper
47b386296a constraints work. Why? because i said so! 2015-01-23 12:59:28 +01:00
Jasper
1687a56f87 Merge branch 'master' of github.com:Faerbit/swp 2015-01-23 12:06:26 +01:00