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

149 Commits

Author SHA1 Message Date
lanariel 3e72421cb5 half baked tiles 2014-02-27 09:04:12 +01:00
Dander7BD 6e0338ee6b Minor mathematical fix 
AngularAxis had a bug.
SnapAngularAxis is determined broken. Do not use. :(
 2014-02-24 14:35:38 +01:00
lanariel 8f0a0464a5 Merge branch 'Misc' of https://github.com/dean11/Danbias into GameClient 2014-02-21 11:51:00 +01:00
dean11 3bdb65f92a Misc - Added methods for extracting resource reference count and resource size 2014-02-20 17:10:37 +01:00
dean11 8cf0087a95 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-20 11:32:57 +01:00
Dander7BD d945eea992 Fixed left turn mirroring and filter turn signals 2014-02-20 11:17:23 +01:00
Dander7BD a78a4f70f1 Dan doing stuff 2014-02-20 11:12:53 +01:00
Dander7BD 3b70e0baec Merge remote-tracking branch 'origin/GameClientGraphics' into GameClient 2014-02-19 16:09:07 +01:00
lanariel 4697b85e3b Small fixes 2014-02-19 15:57:52 +01:00
Dander7BD c2226fa9d1 Clamp fixed 
WTF!? I'm 100% positive that I already did this fix. WTF!?
 2014-02-19 15:47:55 +01:00
Dander7BD 706395680f Added bunch of Quaternion functions 
Needed one of them to create  a bug trap
 2014-02-19 14:51:37 +01:00
Dander7BD 0f1d07cee0 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-19 13:15:29 +01:00
Dander7BD 8816efafc8 GameState pre-work for subStates 2014-02-19 13:15:19 +01:00
Erik Persson c2ef8350cf GL - players created with unique ids 2014-02-19 10:15:52 +01:00
dean11 22f9daf0d8 Connection between server and client is stable 2014-02-18 16:38:08 +01:00
Dander7BD 2e75d168a1 New Cameras 
V2 is quaternion based
 2014-02-18 12:04:22 +01:00
Dander7BD c8c0bb9bc4 Clamp fixed 2014-02-18 11:06:11 +01:00
dean11 7395a0a495 Major cleanup 2014-02-17 10:38:11 +01:00
dean11 bb204a80f7 Merged with all modules 2014-02-17 09:17:28 +01:00
Dennis Andersen 97f9bfcb96 GameServer - merged with Camera 2014-02-16 01:28:34 +01:00
Dennis Andersen 21c640c6e1 GameServer - Merged with Standalone Server and modified some stuff, still compile errors, will try to merge with other 2014-02-16 01:12:03 +01:00
Dennis Andersen deb173bc46 GameServer - Merged with gamephysics 2014-02-15 22:49:13 +01:00
Dennis Andersen b834f1fb9b GameServer - Merged with GameServer 2014-02-15 22:33:40 +01:00
Dennis Andersen 359c208f57 GameServer - Some minor changes 2014-02-15 09:29:54 +01:00
Dander7BD ba7f9aaa38 Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer 
Conflicts:
	Code/Game/DanBiasGame/GameClientState/C_Object.h
	Code/Game/DanBiasGame/GameClientState/C_obj/C_Player.cpp
	Code/Game/DanBiasGame/GameClientState/C_obj/C_Player.h
	Code/Game/DanBiasGame/GameClientState/GameState.cpp
 2014-02-14 15:38:01 +01:00
lindaandersson bfb9864be9 GL - handle if the model dose not exist 2014-02-14 15:07:55 +01:00
Dander7BD 14661a86f8 Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer 
Conflicts:
	Code/Game/DanBiasGame/DanBiasGame_Impl.cpp
	Code/Game/DanBiasGame/GameClientState/GameState.cpp
 2014-02-14 10:02:25 +01:00
Pontus Fransson 06ae4d29dd GL - Fixed some warnings. 2014-02-14 09:44:31 +01:00
Dander7BD 49fc55be60 Textfield and Bunch of fixes 2014-02-14 09:40:53 +01:00
Dander7BD 3b225ea054 Merge 2014-02-13 15:32:54 +01:00
Pontus Fransson d01acbcbe0 Misc - Added text and textcolor to buttons, seperate render function. 2014-02-13 15:21:19 +01:00
Pontus Fransson 74d28d1f62 Misc - Changed to MouseInput struct in EventHandler update. 2014-02-12 15:44:27 +01:00
Pontus Fransson b9c4fe1849 GL - Eventhandler does not delete collections any more. 2014-02-12 15:12:01 +01:00
lindaandersson 10c0019c02 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-12 11:36:19 +01:00
Pontus Fransson f2a444507c GL - FIxed Button state flickering, added flag resizeToScreenAspectRatio. 2014-02-12 11:35:57 +01:00
lindaandersson c1757eef21 GL - moving character 2014-02-12 11:35:34 +01:00
Pontus Fransson 8e07475434 GL - Buttons is now using one texture per button type. Fixed button state when spamming the button. 2014-02-12 10:02:52 +01:00
Pontus Fransson 0bae7b9c6b Misc - Fixed a few errors that can occur 2014-02-12 09:50:09 +01:00
Pontus Fransson d0955b2f4e GL - Button delete update. 2014-02-12 09:08:38 +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
dean11 7c0a597ed3 GameServer - Merge with Gamelogic 2014-02-11 13:26:51 +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
Pontus Fransson 9a82b70020 Misc - Button system working. (Logic) 2014-02-11 09:16:01 +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
lanariel 7167d042ac Merge remote-tracking branch 'origin/GameLogic' into Graphics 
Conflicts:
	Code/OysterGraphics/Shader/HLSL/Deffered Shaders/PostPass.hlsl
	Code/OysterGraphics/Shader/Passes/Light/LightPass.hlsl
 2014-02-10 14:41:04 +01:00
lanariel a3ba67e3c2 Fixed release compile and basic anim 2014-02-10 13:59:45 +01:00
Dennis Andersen 310ed3dfc5 GameServer - Multiplayer now working properly 2014-02-09 16:42:26 +01:00
Dennis Andersen 201a07f0dc GameServer - Merged with GameLogic 2014-02-05 15:16:31 +01:00
Dennis Andersen b7f550859d GameServer - Merge with GameLogic 2014-02-04 22:13:07 +01:00