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

1140 Commits

Author SHA1 Message Date
lanariel 0f492e7bc6 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-18 09:33:44 +01:00
lanariel 197067687e Added Gui Transparancy, 
Get Options provides Resolution.xy
 2014-02-18 09:32:10 +01:00
Dander7BD 6f368b4565 compilation error dealt with 2014-02-18 08:53:52 +01:00
Dander7BD a2317b2e30 Merge remote-tracking branch 'origin/GameServer' into GameClient 2014-02-17 16:18:52 +01:00
Dander7BD 112f45463a Oops .. Forgot to save this one for the previous commit 2014-02-17 16:18:21 +01:00
dean11 830b448690 Temp 2014-02-17 16:17:07 +01:00
Dander7BD 12623d1b16 Bunch of implementations 2014-02-17 16:16:39 +01:00
dean11 a0c9677123 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-17 15:12:29 +01:00
dean11 2bc7c9f65f GameServer - added more features to object protocols 2014-02-17 15:11:12 +01:00
Dander7BD b93e20e942 Bunch of implementations 2014-02-17 14:33:23 +01:00
lanariel 52301021f6 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-17 13:06:54 +01:00
lanariel 51a8569585 Color is now Float4 with RGBA 2014-02-17 13:05:35 +01:00
Dander7BD 013546f076 minor edit 2014-02-17 12:02:18 +01:00
Dander7BD 29f66d2874 Fixed build errors in GameClient 2014-02-17 11:50:51 +01:00
Dander7BD aa2518a4f6 Patch 2014-02-17 11:27:43 +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
dean11 222a3b0bec Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameServer 2014-02-17 09:14:29 +01:00
dean11 fb48b0b34c Merge branch 'Camera' of https://github.com/dean11/Danbias into GameServer 2014-02-17 09:11:08 +01:00
Dander7BD 509fdb5572 Merge remote-tracking branch 'origin/GameLogic' into Camera-merge-buffer 
Conflicts:
	Code/Game/DanBiasGame/GameClientState/GameState.cpp
 2014-02-17 09:07:27 +01:00
lanariel 846836cc59 Glow update 2014-02-17 09:03:53 +01:00
dean11 d96825816d Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameServer 2014-02-17 09:01:41 +01:00
dean11 bb8d3549dc Cleanup 2014-02-17 09:01:01 +01:00
Dennis Andersen 5119af8127 Gameserver - Added more features to standalone srver 2014-02-17 08:53:15 +01:00
Robin Engman a90f33d20e Jumpy jump 2014-02-17 06:44:29 +01:00
Dennis Andersen 85ebe3a7ca GameServer - Merged with Input, Added some athur info in headers 2014-02-16 01:38:03 +01:00
Dennis Andersen cce037783d Merge branch 'Input' of https://github.com/dean11/Danbias into GameServer 2014-02-16 01:28:50 +01:00
Dennis Andersen 97f9bfcb96 GameServer - merged with Camera 2014-02-16 01:28:34 +01:00
Dennis Andersen 9d0148c5c2 GameServer - Merged with Standalone Server and modified some stuff, still compile errors, will try to merge with other 2014-02-16 01:12:27 +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 2dde8547b7 Server poking 2014-02-14 17:12:38 +01:00
lindaandersson d32e614b00 GL - Hax to get the world model initiated. reading spawnpoints 2014-02-14 16:03:46 +01:00
dean11 92d8b7edda Input - Input system created 2014-02-14 15:50:00 +01:00
Dander7BD 2de045524a Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer 2014-02-14 15:42:46 +01:00
Dander7BD 8bf13dab39 Merge remote-tracking branch 'origin/Graphics' into Camera-Merge-buffer 
Conflicts:
	Code/OysterGraphics/Shader/Passes/Post/PostPass.hlsl
 2014-02-14 15:39:01 +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
Sam Mario Svensson 26fb7a5664 GL- Compile fel med spawnpoint fixat 2014-02-14 15:36:19 +01:00
Dander7BD 73e9629832 Removed incorrect Quaternion to AngAxis conversion 
use Float3 AngularAxis( const Quaternion &rotation ) in ::Oyster::Math3D
instead
 2014-02-14 15:33:17 +01:00
lanariel 9096e548a1 Text Culling Fix 2014-02-14 15:31:38 +01:00
Dander7BD 911700676c human error fix 2014-02-14 15:24:19 +01:00
Dander7BD c85cecd05a som more stuff 
created another version of Quaternion to Angular Axis conversion.
 2014-02-14 15:19:10 +01:00
Sam Mario Svensson 3051621f30 GL- levelLoader can now load a correct spawnpoint 2014-02-14 15:19:07 +01:00
lanariel 655f48017c Anim Fix 2014-02-14 15:11:12 +01:00
lindaandersson bfb9864be9 GL - handle if the model dose not exist 2014-02-14 15:07:55 +01:00
Dander7BD c1d63a1477 new state: NetLoadState 2014-02-14 14:32:17 +01:00
Dander7BD fe6742f9e2 Tweaks and a new state: NetLoadState 2014-02-14 14:31:01 +01:00
lanariel adcac0ec12 Random Updates 2014-02-14 14:27:38 +01:00