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

1568 Commits

Author SHA1 Message Date
Dander7BD 46d1fa13e1 premerge 2014-02-11 14:14:06 +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
Dander7BD c3b2c1e912 premerge 2014-02-11 14:13:24 +01:00
Dander7BD 058eada44c Added missing include lines 2014-02-11 14:12:14 +01:00
Erik Persson 89189f93d8 asd 2014-02-11 14:03:14 +01:00
Robin Engman 5d245d7151 Added quaternion to angular axis in Math 2014-02-11 14:00:38 +01:00
Robin Engman 1aa66dc79f Quaternion to angular axis complete 2014-02-11 13:53:44 +01:00
lindaandersson d771a5181d GL - rotation and gravity fixed 2014-02-11 13:41:38 +01:00
lindaandersson 398be8361b Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic 2014-02-11 13:36:49 +01:00
Robin Engman 7075e6add6 Gravity well 2014-02-11 13:36:14 +01:00
lanariel f0df377bcd Basic 2d Render + Anim Updates 2014-02-11 13:29:19 +01:00
Dander7BD 03ab4affb7 Minor fixes 2014-02-11 13:27:33 +01:00
dean11 7c0a597ed3 GameServer - Merge with Gamelogic 2014-02-11 13:26:51 +01:00
lindaandersson 289439b768 Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic 2014-02-11 13:22:17 +01:00
Dander7BD 322f752deb Merge remote-tracking branch 'origin/GameServer' into Camera 
Conflicts:
	Code/Game/DanBiasGame/GameClientState/GameState.cpp
 2014-02-11 13:21:44 +01:00
Robin Engman 70c388779e Lib change for bullet 2014-02-11 13:21:22 +01:00
lindaandersson f9a4fce5aa Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic 2014-02-11 13:12:35 +01:00
Robin Engman 462413b527 Added support for gravity change 2014-02-11 13:09:46 +01:00
dean11 de4ea0a830 GameServer - Merged with GameLogic, some stuff is broken 2014-02-11 13:03:37 +01:00
lindaandersson b883e2de39 Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic 2014-02-11 11:46:17 +01:00
lindaandersson 528a591fab GL - almost rotating 2014-02-11 11:46:06 +01:00
Robin Engman b5631457d3 Fixed up functions again 2014-02-11 11:45:16 +01:00
lindaandersson 2d22d5d274 Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic 2014-02-11 10:50:12 +01:00
Robin Engman ee1dc530fa Fixed up functions 2014-02-11 10:49:37 +01:00
dean11 3274727923 GameServer - Added more gameplay protocols and structured the old mess 2014-02-11 10:21:47 +01:00
lindaandersson dc5783ad4f Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic 2014-02-11 10:21:11 +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
Dander7BD 5ddafc7fc2 Merge remote-tracking branch 'origin/GameLogic' into Camera 2014-02-11 09:34:17 +01:00
Dander7BD d5e85b4258 minor refractoring 2014-02-11 09:32:49 +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
Pontus Fransson 9a82b70020 Misc - Button system working. (Logic) 2014-02-11 09:16:01 +01:00
Robin Engman 985dcf9691 Set up and stop angular movement support added 2014-02-11 09:15:21 +01:00
Dennis Andersen 399e0d049c GameServer - Merged with Graphics 2014-02-10 23:10:31 +01:00
Dennis Andersen 450f4249f3 Documentation - Updated uml diagrams 2014-02-10 22:25:31 +01:00
Dander7BD f53926444f Merge remote-tracking branch 'origin/GameLogic' into Camera-merge-attempt 
Conflicts:
	Code/Game/DanBiasGame/GameClientState/GameState.cpp
	Code/Game/DanBiasGame/GameClientState/GameState.h
 2014-02-10 17:00:45 +01:00
Dander7BD 1e70640d6e Premerge 
not compilable
 2014-02-10 16:30:47 +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 cc55a3471f Fixed Const View Proj 2014-02-10 16:22:23 +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
Dander7BD b435818567 Added Camera_FPS 2014-02-10 15:19:55 +01:00
Dander7BD 77eceaf285 Camera_Basic edits 2014-02-10 15:19:42 +01:00
Dander7BD 1a86ed23cc Float3 SnapAngular compile error fix 2014-02-10 15:19:06 +01:00