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

181 Commits

Author SHA1 Message Date
Dander7BD 22f8a6c9ea Revert "Revert this" 
This reverts commit 76f0b712b1.
 2014-02-14 11:27:23 +01:00
Dander7BD 6f9483041b Temporary mouse pos add + other stuff 2014-02-14 11:26:50 +01:00
Dander7BD de6c5a1185 Merge remote-tracking branch 'origin/Camera' into Camera-Merge-buffer 2014-02-14 10:32:56 +01:00
Dander7BD 76f0b712b1 Revert this 
added printout of mouse state values in MainState
 2014-02-14 10:32:25 +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
Erik Persson 59697bfcea GL - fixed constructors to ease creation of objects, also fixed weapon crash on destruction 2014-02-14 09:59:26 +01:00
Dander7BD b9895f8c7f All states fix 
All new compilation errors dealt with
 2014-02-14 09:54:05 +01:00
Dander7BD d4139e265e MainState fix 
new compilation errors dealt with
 2014-02-14 09:46:17 +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
lindaandersson 2dee9dd084 GL - initiating ccc map from folder ../Content/Worlds. Sync with graphics content. 2014-02-13 16:33:26 +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
Dander7BD cccaf68672 premerge 2014-02-13 15:21:02 +01:00
Dander7BD d705e73dc5 Added LobbyAdminState + other stuff 2014-02-13 13:30:14 +01:00
Dander7BD d60fd65805 Overhaul LanMenuState 2014-02-13 10:14:44 +01:00
Dander7BD c2f67f6f77 Merge branch 'Camera-test-merge' into Camera 
Conflicts:
	Code/Misc/EventHandler/EventHandler.cpp
 2014-02-13 08:49:45 +01:00
Dander7BD 45f6d983ad Merge remote-tracking branch 'origin/GameLogic' into Camera-test-merge 
Conflicts:
	Code/Game/DanBiasGame/DanBiasGame_Impl.cpp
	Code/Game/DanBiasGame/GameClientState/GameState.cpp
	Code/Game/DanBiasGame/GameClientState/LoginState.cpp
 2014-02-13 08:48:34 +01:00
Dander7BD 8744c751a8 resized buttons 2014-02-13 08:43:47 +01:00
Dander7BD 5d4d66cf06 stuff 2014-02-12 17:20:42 +01:00
Dander7BD 63bc360645 stuff 2014-02-12 16:31:15 +01:00
Pontus Fransson 74d28d1f62 Misc - Changed to MouseInput struct in EventHandler update. 2014-02-12 15:44:27 +01:00
Pontus Fransson 7a218c61d8 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-12 15:12:28 +01:00
Pontus Fransson b9c4fe1849 GL - Eventhandler does not delete collections any more. 2014-02-12 15:12:01 +01:00
Dander7BD 587fe62b8e Removed obosolete functions 2014-02-12 15:06:08 +01:00
Sam Mario Svensson 573a0109e3 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 
Conflicts:
	Code/Game/GameLogic/GameLogicStates.h
	Code/Game/GameLogic/JumpPad.cpp
	Code/Game/GameLogic/JumpPad.h
 2014-02-12 15:03:40 +01:00
lanariel 492205b24a Merge branch 'Camera' of https://github.com/dean11/Danbias into Camera 2014-02-12 15:02:57 +01:00
lanariel 20c4833126 Fix start render 2014-02-12 15:02:29 +01:00
Dander7BD 9d9481b87a stuff 2014-02-12 14:52:31 +01:00
Sam Mario Svensson 64b2d688bd Försök till merge men det är cp 2014-02-12 14:48:58 +01:00
Dander7BD 5ff8661843 Bugs and Compilation errors dealt with 2014-02-12 14:33:56 +01:00
lindaandersson 97c3097fc7 GL - added jumppad model and rigidbody 2014-02-12 13:37:21 +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 14077c6d4e GL - moved camera for testing 2014-02-12 13:17:27 +01:00
lindaandersson e8536cc5d4 GL - removed before collision event, sending look and right dir to server 2014-02-12 13:11:35 +01:00
lindaandersson 10c0019c02 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-12 11:36:19 +01:00
lindaandersson fa16f71a26 GL - forgot to commit files 2014-02-12 11:36:08 +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
Dander7BD 6becd58833 DanBiasGame_Impl overhauled 
+ compilation errorfixes
 2014-02-12 11:19:25 +01:00
Dander7BD af85a6efdc Compiler fixes in State classes 2014-02-12 10:43:06 +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
Dander7BD fdb7a7e1b6 Added General Protocol to DataRecieved overloads 2014-02-12 09:54:33 +01:00
Pontus Fransson 0bae7b9c6b Misc - Fixed a few errors that can occur 2014-02-12 09:50:09 +01:00
Dander7BD 6bf7bc898e some more of those overhauls 2014-02-12 09:49:08 +01:00
lindaandersson 8c1f1e6608 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-12 09:32:22 +01:00
lindaandersson bdc5b5e736 GL - fixed graphics, collision with house, locked to 30 fps on client, jump added 2014-02-12 09:32:13 +01:00
Dander7BD 8dc22c854c Overhaul of LobbyState 2014-02-12 09:15:41 +01:00
Pontus Fransson d0955b2f4e GL - Button delete update. 2014-02-12 09:08:38 +01:00
Dander7BD 4d78e30fb8 Overhaul of GameState 2014-02-12 09:02:44 +01:00