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

316 Commits

Author SHA1 Message Date
Pontus Fransson 0bae7b9c6b Misc - Fixed a few errors that can occur 2014-02-12 09:50:09 +01:00
lindaandersson 8c1f1e6608 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-12 09:32:22 +01:00
lindaandersson bdc5b5e736 GL - fixed graphics, collision with house, locked to 30 fps on client, jump added 2014-02-12 09:32:13 +01:00
Erik Persson d7c381cc85 GL- fixed subscription 2014-02-12 09:23:25 +01:00
Pontus Fransson d0955b2f4e GL - Button delete update. 2014-02-12 09:08:38 +01:00
Pontus Fransson 6fc110c2e8 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-11 15:07:10 +01:00
Pontus Fransson 1725f05c4b GUI - GUI testing. 2014-02-11 15:06:46 +01:00
lindaandersson 56205ff774 GL - mergeerror with button handling 2014-02-11 15:03:27 +01:00
lindaandersson 5ebac80ec1 GL - animated character and some textrendering 2014-02-11 15:00:52 +01:00
Pontus Fransson a99a9b3e2e Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-11 14:13:49 +01:00
Pontus Fransson 696d6997f6 GL - Button system done, only need to add 2d rendering to it. 2014-02-11 14:13:35 +01:00
Erik Persson 89189f93d8 asd 2014-02-11 14:03:14 +01:00
lindaandersson d771a5181d GL - rotation and gravity fixed 2014-02-11 13:41:38 +01:00
lindaandersson 528a591fab GL - almost rotating 2014-02-11 11:46:06 +01:00
lindaandersson 071624779e Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-11 10:11:57 +01:00
lindaandersson d16d223c2b GL - player moving 2014-02-11 10:11:38 +01:00
Pontus Fransson 10a227ff9c Merge remote-tracking branch 'origin/GameLogic-MessageHandler' into GameLogic 
Conflicts:
	Code/Game/DanBiasGame/DanBiasGame_Impl.cpp
 2014-02-11 09:25:10 +01:00
lindaandersson 489115840d GL - base for lvl loading 2014-02-11 09:17:16 +01:00
lindaandersson f473136ae1 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-10 16:29:04 +01:00
lindaandersson bfb763501d GL - i think this is working, not using the lvl loader. put models in /Content/Models and /textures 2014-02-10 16:28:25 +01:00
Sam Mario Svensson 26755f8b0b GL- level format more updates.... 2014-02-10 16:24:05 +01:00
lanariel e0f3031187 Pointlight no pointer Model render pointer 2014-02-10 16:08:03 +01:00
lindaandersson a12146215d Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-10 15:54:46 +01:00
lindaandersson b731c206f4 GL - physics merge 2 2014-02-10 15:54:38 +01:00
Robin Engman 26e151f9b4 Fixed state problem 2014-02-10 15:46:55 +01:00
Sam Mario Svensson c75493b6ce GL - Levelformat updated 3.0 with new format! 2014-02-10 14:59:12 +01:00
lindaandersson 49d29d87a5 GL - merge with bullet physics and updated server 2014-02-10 14:41:43 +01:00
lindaandersson eb39008529 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-10 14:00:24 +01:00
lindaandersson c87bab8808 GL - started using the lvl format. Objects on client have pos, rot and scale (not verified) 2014-02-10 14:00:14 +01:00
Robin Engman 05aa3cc9e9 Added on move functionality 2014-02-10 13:55:01 +01:00
Robin Engman e5e99924d9 Updates for objects 2014-02-10 13:25:28 +01:00
Robin Engman ba0d6ca73a Amazing merge with server 2014-02-10 12:42:31 +01:00
Robin Engman 427ec3b716 Major overhaul fix 2014-02-10 10:52:08 +01:00
Robin Engman 99146430a4 Major overhaul 2014-02-09 21:24:09 +01:00
Dennis Andersen 14bf3ede86 Merged with GameLogic and fixed merging errors, some minor justifications may be needed later on due to merging errors.. 2014-02-09 18:58:14 +01:00
Dennis Andersen 4abfdd70fe Merged with GameLogic and fixed merging errors, some minor justifications may be needed later on due to merging errors.. 2014-02-09 18:58:07 +01:00
Dennis Andersen 310ed3dfc5 GameServer - Multiplayer now working properly 2014-02-09 16:42:26 +01:00
Robin Engman 92447a6352 Very cool stuff 2014-02-07 16:01:43 +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
Robin Engman 1633129a2c Commit to Dennis 2014-02-07 13:09:44 +01:00
Robin Engman b225c53611 More cool stuff 2014-02-07 11:43:18 +01:00
Robin Engman f372d3e05b Some cool stuff 2014-02-06 21:15: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