NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,080 Commits 1 Branch 0 Tags 38 MiB
Commit Graph

1080 Commits

Author SHA1 Message Date
lanariel 1de325c5a6 Fixed cleaning up Deffered.cpp 2014-02-07 15:52:07 +01:00
Robin Engman ab9f81ac60 Collisions work better 
Still needs polishing
 2014-02-07 15:38:53 +01:00
Pontus Fransson 0c4f70e400 GL - Updated loadLevelHeader() .Added Cylinder bounding volume. 2014-02-07 15:20:34 +01:00
Pontus Fransson fef40f58f9 GL - Fixed memory leaks in LevelLoader. 2014-02-07 14:44:25 +01:00
Pontus Fransson 9bdf258c5d GL - Updated LevelLoader 2.0. Bounding volume 1.0 
The ObjectSpecialType enum is not correct. It has to be updated.
 2014-02-07 14:12:54 +01:00
lanariel 898fc883e9 Merge branch 'Graphics2D' into Graphics 2014-02-07 13:48:46 +01:00
lanariel d9133f459a 2d Almost working 2014-02-07 13:47:09 +01:00
Tobias Grundel 016bf37459 First commit save jebuz 2014-02-07 13:46:55 +01:00
lanariel 9a0f363146 framerate double 2014-02-07 13:15:38 +01:00
Robin Engman 1633129a2c Commit to Dennis 2014-02-07 13:09:44 +01:00
lanariel 5119b287d6 Small progress 2014-02-07 11:52:51 +01:00
Robin Engman b225c53611 More cool stuff 2014-02-07 11:43:18 +01:00
lanariel bab3ab0a78 Shader Restructure 2014-02-07 11:09:59 +01:00
lanariel a7480ebf70 Proper Animation 2014-02-07 08:34:01 +01:00
Robin Engman f372d3e05b Some cool stuff 2014-02-06 21:15:28 +01:00
lanariel bfa54b9ccd Fixed Anim 2014-02-05 17:13:23 +01:00
lanariel aafbfa01f3 Calculate Graphics Memory Usage 2014-02-05 16:54:57 +01:00
lanariel 51711b86e3 Fixed Animate Skeleton, TODO Fix Skinning 2014-02-05 16:00:28 +01:00
lindaandersson 81d43b59c0 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-05 15:54:56 +01:00
lindaandersson 91db71fe0e GL - 20 boxes and a house 2014-02-05 15:54:48 +01:00
Pontus Fransson a3cea997ba Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-05 15:47:00 +01:00
Pontus Fransson b39a670347 GL - Updated LevelLoader, works with Fredricks level editor. 2014-02-05 15:46:45 +01:00
Dennis Andersen 201a07f0dc GameServer - Merged with GameLogic 2014-02-05 15:16:31 +01:00
lindaandersson 70a2cf27e3 GL - almost ok, at least on the top of the world 2014-02-05 11:53:38 +01:00
lindaandersson 426444ca34 GL - added more boxes and weaponfunctionality 2014-02-05 11:46:04 +01:00
lindaandersson 30c89ed330 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-02-05 09:06:44 +01:00
lindaandersson 6818dda2b9 GL - testing 2014-02-05 09:06:33 +01:00
Dennis Andersen 60736c52fe Merge branch 'Physics' of https://github.com/dean11/Danbias into GameServer 2014-02-04 22:34:07 +01:00
Dennis Andersen db822fa832 GameServer - Merged with gamelogic 2014-02-04 22:33:39 +01:00
Dennis Andersen b7f550859d GameServer - Merge with GameLogic 2014-02-04 22:13:07 +01:00
Robin Engman 98644e3fa0 Minimised to potential skinning problem 2014-02-04 17:59:04 +01:00
Dander7BD fb4025eb1a bug fix 2014-02-04 16:56:31 +01:00
lindaandersson ac278555ea Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-02-04 16:39:21 +01:00
lindaandersson b43902d31e Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-04 16:39:11 +01:00
lindaandersson ec4d34b131 GL - added error checking 2014-02-04 16:39:01 +01:00
Dander7BD c8e8d3510d Added debug traps 2014-02-04 16:38:42 +01:00
Dander7BD 68dc5be9cb added lost rebound deltatime compensation 2014-02-04 16:33:52 +01:00
Dennis Andersen 168539da08 Gameserver - Fixed minor merging isues 2014-02-04 16:27:18 +01:00
Dennis Andersen b17b542ebc Gameserver - Fixed minor merging isues 2014-02-04 16:26:48 +01:00
Erik Persson 4ad86ae83b GL - Added jumppad(implemented but not tested) 2014-02-04 16:24:48 +01:00
lanariel 4de809a952 Added Resource support 2014-02-04 16:20:42 +01:00
lindaandersson 6e0dd63d64 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-02-04 16:11:01 +01:00
Dander7BD 1952ff9aba more fixes of potential bugs in Physics collision handling 2014-02-04 16:10:18 +01:00
lindaandersson d364456189 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-04 16:08:53 +01:00
lindaandersson d8c7220569 GL - added some testing things in player and more objects to the world 2014-02-04 16:08:28 +01:00
Dennis Andersen de8c76f051 GameServer - Fixed bugg where threads touched same data, n players should now be able to connect 2014-02-04 16:07:10 +01:00
Dennis Andersen 61178e2803 GameServer - Fixed bugg where threads touched same data, n players should now be able to connect 2014-02-04 16:06:59 +01:00
Dander7BD 9622d37d3f bug fixes in Physics collision handling 2014-02-04 15:43:17 +01:00
lanariel e13410dced Fixed debug data, points in right direction 
Matrix::m 0 index based, not math def
 2014-02-04 15:06:50 +01:00
lanariel 97a3792bff Anim Test Not working Joints 2014-02-04 14:59:51 +01:00