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

39 Commits

Author SHA1 Message Date
Dander7BD fe6742f9e2 Tweaks and a new state: NetLoadState 2014-02-14 14:31:01 +01:00
Dander7BD e6c5f1f6e5 Merge errors dealt with 2014-02-14 12:09:59 +01:00
Dander7BD 2bfcda3b50 MousePos available in all relevant states 2014-02-14 11:32:16 +01:00
Dander7BD b9895f8c7f All states fix 
All new compilation errors dealt with
 2014-02-14 09:54:05 +01:00
Dander7BD d705e73dc5 Added LobbyAdminState + other stuff 2014-02-13 13:30:14 +01:00
Dander7BD 63bc360645 stuff 2014-02-12 16:31:15 +01:00
Dander7BD 5ff8661843 Bugs and Compilation errors dealt with 2014-02-12 14:33:56 +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
lindaandersson c1757eef21 GL - moving character 2014-02-12 11:35:34 +01:00
Dander7BD af85a6efdc Compiler fixes in State classes 2014-02-12 10:43:06 +01:00
Dander7BD fdb7a7e1b6 Added General Protocol to DataRecieved overloads 2014-02-12 09:54:33 +01:00
Dander7BD 8dc22c854c Overhaul of LobbyState 2014-02-12 09:15:41 +01:00
lindaandersson 5ebac80ec1 GL - animated character and some textrendering 2014-02-11 15:00:52 +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
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
Dennis Andersen 450f4249f3 Documentation - Updated uml diagrams 2014-02-10 22:25:31 +01:00
lindaandersson 49d29d87a5 GL - merge with bullet physics and updated server 2014-02-10 14:41:43 +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 ba0d6ca73a Amazing merge with server 2014-02-10 12:42:31 +01:00
Robin Engman b225c53611 More cool stuff 2014-02-07 11:43:18 +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
lindaandersson e327f64702 GL - can play with two characters 2014-01-31 16:33:16 +01:00
lindaandersson a6ff6eba42 GL - merge with server 2014-01-31 09:14:55 +01:00
Dennis Andersen 40f0fe61f0 GameServer - Fixed Protocols not recieveing properly and fixed the resource loader. 2014-01-31 08:41:08 +01:00
lindaandersson 0aa39275e3 GL - only client with server update server. Update recieverfunction 2014-01-30 15:20:35 +01:00
lindaandersson 05e24d0514 GL - uppdate server 2014-01-30 14:17:50 +01:00
lindaandersson 1ccf98e3eb GL - added loginstate 2014-01-30 11:58:44 +01:00
Dennis Andersen 50c09547f3 GameServer - Added protocols and stuff 2014-01-21 14:32:42 +01:00
Dennis Andersen 0a41d20099 GameLogic - Merged with graphics 2014-01-20 16:36:25 +01:00
lindaandersson 8557559b9b GL - going to merge 2014-01-15 11:57:36 +01:00
Dennis Andersen d68fd63b25 Added server launcher 2013-12-19 13:35:56 +01:00
Linda Andersson fa1473455f GL - added C_obj files, client obj in game state to send input 2013-12-16 09:45:12 +01:00
Linda Andersson 7c1d19946d GL - Connection to network in clinet 2013-12-13 12:02:49 +01:00
Linda Andersson f0181ad9f4 GL - fixed defines in headers - more structure for states 2013-12-10 11:26:18 +01:00
Linda Andersson ea593743ad GL - added UI object 2013-12-09 12:01:36 +01:00
Linda Andersson 4134836405 GL - added client objects 
-  no memory leaks in client
 2013-12-09 11:05:47 +01:00
Linda Andersson 38a1602d3f GL - merge with graphics api. Lobby and game state. 2013-12-09 09:23:39 +01:00
Linda Andersson b331ce1a1f GL - started working with client application 2013-12-06 10:38:43 +01:00