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

1501 Commits

Author SHA1 Message Date
Dander7BD 3470bc48cc Merge remote-tracking branch 'origin/GameLogic' into PlayerRunEdits 2014-02-27 12:45:17 +01:00
Dander7BD 779b2ee00c More merge conflicts untanglement 2014-02-27 11:46:58 +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
Erik Persson 44ec232310 GL - correction of dmg and jumppad foce 2014-02-27 11:01:55 +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
Linda Andersson 9731cd9c5e Spawning players on rand spawnpoint when they connect 2014-02-27 10:31:15 +01:00
dean11 2da9ef4506 Merged with physics and added filepath 2014-02-27 10:31:13 +01:00
Robin Engman 30c425f8fa Fixed the damn path 2014-02-27 10:31:13 +01:00
Robin Engman d81a1c204c Added early triangle collisions 2014-02-27 10:31:12 +01:00
Pontus Fransson c32871687e Found bug. Explosive box was increasing the ID. 2014-02-27 10:30:34 +01:00
Erik Persson 977920b360 GL - merge stuff 2014-02-27 10:30:33 +01:00
Linda Andersson 7d7d475499 InGame keys: Go to mainMenu with M. Exit client with ESC. Fix drop in drop out correctly. 2014-02-27 10:28:49 +01:00
Linda Andersson d4e80733d2 Fixed deleting problems when shuting down 2014-02-27 10:27:55 +01:00
Pontus Fransson 28e84854d1 Health pickups is now working! 2014-02-27 10:27:54 +01:00
Pontus Fransson 8a65907625 Does not render non visible models anymore. 2014-02-27 10:24:39 +01:00
Pontus Fransson 762aea73a0 Fixed static id not matching on client/server. 2014-02-27 10:24:39 +01:00
Robin Engman 5675155be4 Fixed player jump 2014-02-27 10:24:38 +01:00
Linda Andersson 5a74f5368f Added collision and weapon events and send them to client 2014-02-27 10:24:37 +01:00
Linda Andersson b39d52e536 Weapon action enum added 2014-02-27 10:21:49 +01:00
Robin Engman 4b4255cfcc Player air check function 2014-02-27 10:21:49 +01:00
Robin Engman 800f514028 Fixed player going bonkers on lower hemisphere 2014-02-27 10:18:18 +01:00
Linda Andersson 6bd8c94d79 Addded objectDelete protocol. Enable/ disable will be used for visibility on client 2014-02-27 10:07:11 +01:00
Pontus Fransson a8d4ff2c89 Reading hp pickups from levelformat. Updating pickups. 2014-02-27 10:07:10 +01:00
Linda Andersson d91fa3073f Play action animation 2014-02-27 10:07:10 +01:00
Pontus Fransson 9a449253c2 Fixed error with reading lights from level format. 2014-02-27 10:07:09 +01:00
Pontus Fransson 4f2738e921 Not finished Pickup system. 2014-02-27 10:07:08 +01:00
Linda Andersson 5620a3c517 Added eventfunctions for PlayerAction and PickupEvent 2014-02-27 10:07:07 +01:00
Erik Persson f2b63b7ad4 GL - weapon energy, force etc inside weapon 2014-02-27 10:06:02 +01:00
Linda Andersson 4d967b995d Added player stats. Added players to level. Respawn logic in level. 2014-02-27 10:06:01 +01:00
Erik Persson ba61838703 GL - only 1 player can manipulate a object at a time 2014-02-27 10:02:50 +01:00
Erik Persson 5c023acc5b merge 2014-02-27 10:02:49 +01:00
Erik Persson 5ad5ad6f5f Se till så att man inte går över maxenergy 2014-02-27 09:11:27 +01:00
dean11 ca715dbe05 GameLogic - Merged with gamelogic 2014-02-27 09:11:00 +01:00
Dennis Andersen ffa6da1a2f GameLogic - Fixed drop on secondary, Modified how keys are sent 2014-02-27 08:19:50 +01:00
dean11 b289741897 Broken shit, dont take 2014-02-26 16:57:32 +01:00
dean11 3bfedf920a GameServer - minor 2014-02-26 16:10:04 +01:00
Linda Andersson 9c4f72882c Merged: game logic with new Input 2014-02-26 15:12:13 +01:00
Linda Andersson c235c0309c Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-26 14:55:39 +01:00
Linda Andersson 74456a4d80 Spawning players on rand spawnpoint when they connect 2014-02-26 14:55:29 +01:00
dean11 504f11ef4c Gameserver - Merged with gamelogic 2014-02-26 14:42:17 +01:00
dean11 a896d146c7 Merged with physics and added filepath 2014-02-26 14:33:08 +01:00
dean11 469312bfe7 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameServer 2014-02-26 14:20:43 +01:00
dean11 e680da9d54 GameServer - Merged with physics 2014-02-26 14:20:33 +01:00
Robin Engman 58df25c392 Fixed the damn path 2014-02-26 14:08:49 +01:00
dean11 b1f82c8ef2 Merged with Physics 2014-02-26 14:07:46 +01:00