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

94 Commits

Author SHA1 Message Date
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
Pontus Fransson 4c4693e890 Lagt till alla funktion, inte en aning om det fungerar. 2014-02-14 12:09:30 +01:00
Dander7BD d705e73dc5 Added LobbyAdminState + other stuff 2014-02-13 13:30:14 +01:00
Dander7BD 60d1fdba97 Merge remote-tracking branch 'origin/GameLogic' into Camera-test-merge 
Conflicts:
	Code/Game/DanBiasGame/DanBiasGame.vcxproj
	Code/Game/DanBiasGame/DanBiasGame_Impl.cpp
	Code/Game/DanBiasGame/GameClientState/C_Object.h
	Code/Game/DanBiasGame/GameClientState/GameClientState.h
	Code/Game/DanBiasGame/GameClientState/GameState.cpp
	Code/Game/DanBiasGame/GameClientState/GameState.h
	Code/Game/DanBiasGame/GameClientState/LobbyState.h
	Code/Game/DanBiasGame/GameClientState/LoginState.h
	Code/Game/DanBiasGame/GameClientState/MainState.cpp
	Code/Game/GameProtocols/ObjectProtocols.h
	Code/Game/GameServer/Implementation/GameSession_General.cpp
 2014-02-12 13:23:50 +01:00
Dander7BD 88341eaff7 Fixed incorrect settings for vld in some projects 
Now links well with x64 as well
 2014-02-12 13:14:28 +01:00
lindaandersson e8536cc5d4 GL - removed before collision event, sending look and right dir to server 2014-02-12 13:11:35 +01:00
Dander7BD 134994447f Fixed compilation error 2014-02-12 12:11:23 +01:00
lindaandersson c1757eef21 GL - moving character 2014-02-12 11:35:34 +01:00
Dander7BD 3be98e6647 Merge remote-tracking branch 'origin/GameServer' into Camera 
Conflicts:
	Code/Game/DanBiasGame/GameClientState/GameClientState.h
	Code/Game/DanBiasGame/GameClientState/GameState.cpp
 2014-02-11 14:56:43 +01:00
lindaandersson d771a5181d GL - rotation and gravity fixed 2014-02-11 13:41:38 +01:00
dean11 de4ea0a830 GameServer - Merged with GameLogic, some stuff is broken 2014-02-11 13:03:37 +01:00
dean11 3274727923 GameServer - Added more gameplay protocols and structured the old mess 2014-02-11 10:21:47 +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
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
lindaandersson 91db71fe0e GL - 20 boxes and a house 2014-02-05 15:54:48 +01:00
Dennis Andersen 201a07f0dc GameServer - Merged with GameLogic 2014-02-05 15:16:31 +01:00
lindaandersson 426444ca34 GL - added more boxes and weaponfunctionality 2014-02-05 11:46:04 +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
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 54deef7f2b Project file fixes for GL 2014-02-04 13:06:10 +01:00
lindaandersson fcadd5b4c3 GL - testing physics 2014-02-04 10:29:02 +01:00
lindaandersson e21cfe4cd4 GL - merge with Erik 2014-02-03 16:21:48 +01:00
Erik Persson 7f29b62c6f GL - YOU CAN NOW SHOOT STUFF YAAAAY 2014-02-03 16:19:24 +01:00
lindaandersson a3886c4f1f GL - added models and started to fix camera movement 2014-02-03 15:52:00 +01:00
Dennis Andersen a673e64694 GameServer - Pre-merge with graphic 2014-01-31 22:52:52 +01:00
Dennis Andersen 5aede62af6 Gameserver - Merge with gamelogic 2014-01-31 22:36:43 +01:00
lindaandersson e327f64702 GL - can play with two characters 2014-01-31 16:33:16 +01:00
Dennis Andersen c9c562fda6 GameServer - Added some functionality in windowshell 2014-01-31 10:50:38 +01:00
Dennis Andersen 40f0fe61f0 GameServer - Fixed Protocols not recieveing properly and fixed the resource loader. 2014-01-31 08:41:08 +01:00
Dennis Andersen 09f39ec26d GameServer - Added acces directly to clients in network session 2014-01-30 14:15:25 +01:00
lindaandersson d41ddca45d Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameLogic 2014-01-30 11:13:42 +01:00
Dennis Andersen 05740665da GameServer - Fixed a small error regarding not reaching some data 2014-01-30 11:11:04 +01:00
lindaandersson a249e7ede9 GL - merge with new serverAPI 2014-01-30 10:57:44 +01:00
lindaandersson 09693c7f35 GL - merge 2014-01-30 09:40:58 +01:00
Dennis Andersen fa29cd7307 GameServer - Merged with GameLogic 2014-01-30 00:19:00 +01:00
Dennis Andersen 1e89bb4e30 Fixed protocol messaging. Known crash when recieveing protocol on server after a while... 2014-01-29 15:01:14 +01:00
Dennis Andersen 36f057d2cc Broekn branch not broekn more 2014-01-29 10:18:01 +01:00
Dennis Andersen 91e825dbfb Broekn stuff to tobias 2014-01-28 09:00:02 +01:00