Commit Graph

1572 Commits

Author SHA1 Message Date
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
Robin Engman d5cda4deaa Added early triangle collisions 2014-02-26 14:06:02 +01:00
Pontus Fransson 4cd91fadad Found bug. Explosive box was increasing the ID. 2014-02-26 13:59:06 +01:00
Erik Persson 15df481dd3 GL - merge stuff 2014-02-26 12:00:30 +01:00
Linda Andersson 934bc80b62 InGame keys: Go to mainMenu with M. Exit client with ESC. Fix drop in drop out correctly. 2014-02-26 11:53:33 +01:00
Linda Andersson 16ca665311 Fixed deleting problems when shuting down 2014-02-26 11:09:24 +01:00
Linda Andersson 039dcef6a2 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-26 10:26:19 +01:00
Linda Andersson a8055cfbf7 Merge with physics 2014-02-26 10:25:39 +01:00
Pontus Fransson dbbc7a9769 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-26 10:24:42 +01:00
Pontus Fransson 925f05b3b0 Health pickups is now working! 2014-02-26 10:23:38 +01:00
Pontus Fransson 9ec3fc6fa4 Does not render non visible models anymore. 2014-02-26 10:22:43 +01:00
Pontus Fransson 8798fc9006 Fixed static id not matching on client/server. 2014-02-26 10:22:08 +01:00
Robin Engman 2f19390cd2 Fixed player jump 2014-02-26 10:05:18 +01:00
Linda Andersson 13d6a062fc Added collision and weapon events and send them to client 2014-02-26 10:05:07 +01:00
Robin Engman 2d9f89676a Merge with GL 2014-02-26 09:48:19 +01:00
Robin Engman 08bec9470e Merge remote-tracking branch 'origin/GameServer' into Physics 2014-02-26 09:39:39 +01:00
Linda Andersson 8438b7dfbb Renamed actionEvent 2014-02-26 09:11:45 +01:00
Linda Andersson 4d077106dc Weapon action enum added 2014-02-26 08:51:56 +01:00
Robin Engman ca693c412f Player air check function 2014-02-26 08:51:18 +01:00
dean11 081bd9db36 Merge branch 'New-inputsystem' of https://github.com/dean11/Danbias into GameServer 2014-02-26 08:49:15 +01:00
Robin Engman 47e6d93957 Fixed player going bonkers on lower hemisphere 2014-02-25 18:25:51 +01:00
dean11 8d7bff808a NewInput - Merged with Gameserver 2014-02-25 16:49:33 +01:00
dean11 7c52fe236f NewInput - Merged with gameClient 2014-02-25 16:42:51 +01:00
Linda Andersson de3250f650 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-25 16:26:46 +01:00
Linda Andersson 638f2f6241 Addded objectDelete protocol. Enable/ disable will be used for visibility on client 2014-02-25 16:26:37 +01:00
Pontus Fransson 11eda5065e Reading hp pickups from levelformat. Updating pickups. 2014-02-25 16:10:02 +01:00
Linda Andersson f2bb50804c Play action animation 2014-02-25 16:08:45 +01:00
Pontus Fransson d56d1d7569 Fixed error with reading lights from level format. 2014-02-25 16:07:50 +01:00
dean11 0fd038be8c NewInpuit - Pre-merge with gameclient 2014-02-25 15:52:15 +01:00
Pontus Fransson 2052f60ea4 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-25 14:37:07 +01:00
Pontus Fransson 0369d8cf19 Not finished Pickup system. 2014-02-25 14:36:54 +01:00
Linda Andersson 2996627c56 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-25 14:35:39 +01:00
Linda Andersson b8395e9af7 Added eventfunctions for PlayerAction and PickupEvent 2014-02-25 14:35:27 +01:00
dean11 b4ad883472 New input - added new input and more menu stuff 2014-02-25 14:25:54 +01:00
dean11 6dc60a2082 Input - Added more functionality, custom tag and all-in-one key callback 2014-02-25 14:20:11 +01:00
Erik Persson 31bf73c2fd GL - weapon energy, force etc inside weapon 2014-02-25 13:56:49 +01:00
dean11 13167064cb Input - Added mouse features, custom tags and all-in-one callback 2014-02-25 13:49:20 +01:00