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

1548 Commits

Author SHA1 Message Date
Linda Andersson 4c54be1e62 Player movement and weapon working 2014-02-27 16:02:17 +01:00
Linda Andersson 3c3e21209b Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-27 15:30:33 +01:00
Linda Andersson 69f7944b23 Updating energy on UI 2014-02-27 15:30:21 +01:00
Erik Persson ecad24450f GL - Normal gun implemented(not tested yet) 2014-02-27 15:15:55 +01:00
Linda Andersson 7063c6bc47 Pull from master. Cant pick up boxes. 2014-02-27 15:14:34 +01:00
Dander7BD fed63e3593 restored lost edits 2014-02-27 15:13:08 +01:00
Dander7BD ea6a029f29 Merge remote-tracking branch 'origin/GameLogic' into GameServer 
Conflicts:
	Code/Physics/GamePhysics/Implementation/PhysicsAPI_Impl.cpp
 2014-02-27 15:00:47 +01:00
Linda Andersson d145853d34 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-27 14:58:30 +01:00
Linda Andersson b4409d2147 Sending energy update to client. 2014-02-27 14:56:18 +01:00
Erik Persson e006ede5ac Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-27 14:41:48 +01:00
Erik Persson 09d8825c66 sada 2014-02-27 14:41:31 +01:00
Erik Persson ef3dd62ca3 GL - new weapon gun 2014-02-27 14:38:03 +01:00
Dander7BD 36761a8314 OnDynamicCollision drop box .. missed a file in commit 2014-02-27 14:37:15 +01:00
Dander7BD 701c0e19e1 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-27 14:36:25 +01:00
Dander7BD 2592e4d3e3 Picked box should be dropped when impacted by any dynamic object 2014-02-27 14:36:15 +01:00
dean11 0f989eed4f Merged with GameClientGraphics 2014-02-27 14:23:57 +01:00
Linda Andersson 97ea35e91e Fixing player animation updates 2014-02-27 14:11:03 +01:00
dean11 4920bfe9f3 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameServer 2014-02-27 13:51:05 +01:00
Erik Persson 84a462de6c GL - Player pushed by weapon 2014-02-27 13:41:04 +01:00
lanariel edd6169c44 quick fix 2014-02-27 13:12:18 +01:00
Erik Persson 8111e9f51e GL - M,L controls activating/deactivating the window. lower threshhold for dmg 2014-02-27 13:09:57 +01:00
Dander7BD 369333fa1c Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-27 13:08:06 +01:00
Dander7BD 5970b23d3c lost code fix 2014-02-27 13:07:31 +01:00
Dander7BD 74a833baf8 changed arena to sumLights.bias 2014-02-27 12:58:51 +01:00
Dander7BD 10577c3a67 Merge remote-tracking branch 'origin/Physics' into PlayerRunEdits 2014-02-27 12:58:26 +01:00
Robin Engman c59565a56f Fixed bodies sleeping after applyimpulse 2014-02-27 12:58:13 +01:00
Dander7BD cf8a83e1e3 Merge fixes 2014-02-27 12:55:34 +01:00
Dander7BD ee54ce5d73 Merge remote-tracking branch 'origin/GameClient' into PlayerRunEdits 
Conflicts:
	Code/Game/GameClient/DanBiasGame_Impl.cpp
 2014-02-27 12:47:26 +01:00
Dander7BD 3470bc48cc Merge remote-tracking branch 'origin/GameLogic' into PlayerRunEdits 2014-02-27 12:45:17 +01:00
Linda Andersson 19aa8e5ed4 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-27 12:11:03 +01:00
Linda Andersson 91d1186c93 fixed some mem leaks. Models are only released when program exits so restarting a level results in leaks because they are loaded again. 2014-02-27 12:10:40 +01:00
Erik Persson 978d071c90 GL - blablafixes 2014-02-27 12:09:51 +01:00
Dander7BD 779b2ee00c More merge conflicts untanglement 2014-02-27 11:46:58 +01:00
lanariel 68525b4e82 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-27 11:42:39 +01:00
lanariel 21c92ac8a6 Merge branch 'Gtest' into GameClient 
Conflicts:
	Code/Game/GameClient/DanBiasGame_Impl.cpp
 2014-02-27 11:42:29 +01:00
dean11 2b8dbee5f6 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-27 11:41:36 +01:00
dean11 a80b1fa96f Added back to main menu NOTE MEMORY LEAKS 2014-02-27 11:41:17 +01:00
lanariel b1cf134bea added support to resize 2014-02-27 11:40:58 +01:00
Linda Andersson 87dc036cc5 Merge conflict 2014-02-27 11:38:16 +01:00
Linda Andersson 1bf7e21fcc Added player color to client. Spawnpoint class but logic needs to be implemented. Added kills and deatch counting and message sending for it. 2014-02-27 11:35:32 +01:00
Dander7BD 96cb865242 Merge remote-tracking branch 'origin/New-inputsystem' into PlayerRunEdits 
Conflicts:
	Code/Game/GameClient/GameClientState/GameState.cpp
	Code/Game/GameClient/GameClientState/GamingUI.cpp
	Code/Game/GameLogic/GameAPI.h
	Code/Game/GameLogic/Player.cpp
	Code/Game/GameLogic/Player.h
	Code/Game/GameServer/GameSession.h
	Code/Game/GameServer/Implementation/GameSession_Gameplay.cpp
	Code/Physics/GamePhysics/Implementation/SimpleRigidBody.cpp
	Code/Physics/GamePhysics/Implementation/SimpleRigidBody.h
 2014-02-27 11:18:16 +01:00
Dander7BD 2089b7f01f permanent disable of player friction 2014-02-27 11:17:13 +01:00
lanariel a8fe18d98b merge anim change with fix tiles 2014-02-27 11:05:12 +01:00
Erik Persson 44ec232310 GL - correction of dmg and jumppad foce 2014-02-27 11:01:55 +01:00
lanariel 1b7cebc2e9 Resize 2014-02-27 10:49:22 +01:00
Dander7BD f1e6a1c897 Merge fixes 
Warning! Possibility that code were lost during this merge.
Please oh please do check what branch you are in before you edit files.
 2014-02-27 10:46:30 +01:00
Erik Persson e43996bdc8 Se till så att man inte går över maxenergy 2014-02-27 10:32:08 +01:00
Dennis Andersen 22bc079ed7 GameLogic - Fixed drop on secondary, Modified how keys are sent 2014-02-27 10:32:08 +01:00
dean11 50acc12951 Broken shit, dont take 2014-02-27 10:31:16 +01:00
dean11 4e502b298b GameServer - minor 2014-02-27 10:31:15 +01:00