NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 4c54be1e62 Player movement and weapon working master Linda Andersson 2014-02-27 16:02:17 +0100
  • 3c3e21209b Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Linda Andersson 2014-02-27 15:30:33 +0100
  • 69f7944b23 Updating energy on UI Linda Andersson 2014-02-27 15:30:21 +0100
  • ecad24450f GL - Normal gun implemented(not tested yet) Erik Persson 2014-02-27 15:15:44 +0100
  • 7063c6bc47 Pull from master. Cant pick up boxes. Linda Andersson 2014-02-27 15:14:34 +0100
  • fed63e3593 restored lost edits Dander7BD 2014-02-27 15:13:08 +0100
  • ea6a029f29 Merge remote-tracking branch 'origin/GameLogic' into GameServer Dander7BD 2014-02-27 15:00:47 +0100
  • d145853d34 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Linda Andersson 2014-02-27 14:58:30 +0100
  • b4409d2147 Sending energy update to client. Linda Andersson 2014-02-27 14:56:18 +0100
  • e006ede5ac Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Erik Persson 2014-02-27 14:41:48 +0100
  • 09d8825c66 sada Erik Persson 2014-02-27 14:41:31 +0100
  • ef3dd62ca3 GL - new weapon gun Erik Persson 2014-02-27 14:38:03 +0100
  • 36761a8314 OnDynamicCollision drop box .. missed a file in commit Dander7BD 2014-02-27 14:37:15 +0100
  • 701c0e19e1 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Dander7BD 2014-02-27 14:36:25 +0100
  • 2592e4d3e3 Picked box should be dropped when impacted by any dynamic object Dander7BD 2014-02-27 14:36:15 +0100
  • 0f989eed4f Merged with GameClientGraphics dean11 2014-02-27 14:23:57 +0100
  • 97ea35e91e Fixing player animation updates Linda Andersson 2014-02-27 14:11:03 +0100
  • 4920bfe9f3 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-27 13:51:05 +0100
  • 84a462de6c GL - Player pushed by weapon Erik Persson 2014-02-27 13:40:51 +0100
  • edd6169c44 quick fix lanariel 2014-02-27 13:12:18 +0100
  • 8111e9f51e GL - M,L controls activating/deactivating the window. lower threshhold for dmg Erik Persson 2014-02-27 13:09:45 +0100
  • 369333fa1c Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient Dander7BD 2014-02-27 13:08:06 +0100
  • 5970b23d3c lost code fix Dander7BD 2014-02-27 13:07:31 +0100
  • 74a833baf8 changed arena to sumLights.bias Dander7BD 2014-02-27 12:58:51 +0100
  • 10577c3a67 Merge remote-tracking branch 'origin/Physics' into PlayerRunEdits Dander7BD 2014-02-27 12:58:26 +0100
  • c59565a56f Fixed bodies sleeping after applyimpulse Robin Engman 2014-02-27 12:58:13 +0100
  • cf8a83e1e3 Merge fixes Dander7BD 2014-02-27 12:55:34 +0100
  • ee54ce5d73 Merge remote-tracking branch 'origin/GameClient' into PlayerRunEdits Dander7BD 2014-02-27 12:47:26 +0100
  • 3470bc48cc Merge remote-tracking branch 'origin/GameLogic' into PlayerRunEdits Dander7BD 2014-02-27 12:45:17 +0100
  • 19aa8e5ed4 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Linda Andersson 2014-02-27 12:11:03 +0100
  • 91d1186c93 fixed some mem leaks. Models are only released when program exits so restarting a level results in leaks because they are loaded again. Linda Andersson 2014-02-27 12:10:40 +0100
  • 978d071c90 GL - blablafixes Erik Persson 2014-02-27 12:09:51 +0100
  • 779b2ee00c More merge conflicts untanglement Dander7BD 2014-02-27 11:46:58 +0100
  • 68525b4e82 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient lanariel 2014-02-27 11:42:39 +0100
  • 21c92ac8a6 Merge branch 'Gtest' into GameClient lanariel 2014-02-27 11:42:29 +0100
  • 2b8dbee5f6 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic dean11 2014-02-27 11:41:36 +0100
  • a80b1fa96f Added back to main menu NOTE MEMORY LEAKS dean11 2014-02-27 11:41:17 +0100
  • b1cf134bea added support to resize lanariel 2014-02-27 11:40:58 +0100
  • 87dc036cc5 Merge conflict Linda Andersson 2014-02-27 11:38:16 +0100
  • 1bf7e21fcc Added player color to client. Spawnpoint class but logic needs to be implemented. Added kills and deatch counting and message sending for it. Linda Andersson 2014-02-27 11:35:32 +0100
  • 96cb865242 Merge remote-tracking branch 'origin/New-inputsystem' into PlayerRunEdits Dander7BD 2014-02-27 11:18:16 +0100
  • 2089b7f01f permanent disable of player friction Dander7BD 2014-02-27 11:17:13 +0100
  • a8fe18d98b merge anim change with fix tiles lanariel 2014-02-27 11:05:12 +0100
  • 44ec232310 GL - correction of dmg and jumppad foce Erik Persson 2014-02-27 11:01:55 +0100
  • 1b7cebc2e9 Resize lanariel 2014-02-27 10:49:22 +0100
  • f1e6a1c897 Merge fixes Dander7BD 2014-02-27 10:46:30 +0100
  • e43996bdc8 Se till så att man inte går över maxenergy Erik Persson 2014-02-27 09:11:13 +0100
  • 22bc079ed7 GameLogic - Fixed drop on secondary, Modified how keys are sent Dennis Andersen 2014-02-27 08:19:50 +0100
  • 50acc12951 Broken shit, dont take dean11 2014-02-26 16:57:32 +0100
  • 4e502b298b GameServer - minor dean11 2014-02-26 16:10:04 +0100
  • 9731cd9c5e Spawning players on rand spawnpoint when they connect Linda Andersson 2014-02-26 14:55:29 +0100
  • 2da9ef4506 Merged with physics and added filepath dean11 2014-02-26 14:33:08 +0100
  • 30c425f8fa Fixed the damn path Robin Engman 2014-02-26 14:08:49 +0100
  • d81a1c204c Added early triangle collisions Robin Engman 2014-02-26 14:06:02 +0100
  • c32871687e Found bug. Explosive box was increasing the ID. Pontus Fransson 2014-02-26 13:59:06 +0100
  • 977920b360 GL - merge stuff Erik Persson 2014-02-26 12:00:30 +0100
  • 7d7d475499 InGame keys: Go to mainMenu with M. Exit client with ESC. Fix drop in drop out correctly. Linda Andersson 2014-02-26 11:53:33 +0100
  • d4e80733d2 Fixed deleting problems when shuting down Linda Andersson 2014-02-26 11:09:24 +0100
  • 28e84854d1 Health pickups is now working! Pontus Fransson 2014-02-26 10:23:38 +0100
  • 8a65907625 Does not render non visible models anymore. Pontus Fransson 2014-02-26 10:22:43 +0100
  • 762aea73a0 Fixed static id not matching on client/server. Pontus Fransson 2014-02-26 10:22:08 +0100
  • 5675155be4 Fixed player jump Robin Engman 2014-02-26 10:05:18 +0100
  • 5a74f5368f Added collision and weapon events and send them to client Linda Andersson 2014-02-26 10:05:07 +0100
  • b39d52e536 Weapon action enum added Linda Andersson 2014-02-26 08:51:56 +0100
  • 4b4255cfcc Player air check function Robin Engman 2014-02-26 08:51:18 +0100
  • 800f514028 Fixed player going bonkers on lower hemisphere Robin Engman 2014-02-25 18:25:51 +0100
  • 6bd8c94d79 Addded objectDelete protocol. Enable/ disable will be used for visibility on client Linda Andersson 2014-02-25 16:26:37 +0100
  • a8d4ff2c89 Reading hp pickups from levelformat. Updating pickups. Pontus Fransson 2014-02-25 16:10:02 +0100
  • d91fa3073f Play action animation Linda Andersson 2014-02-25 16:08:45 +0100
  • 9a449253c2 Fixed error with reading lights from level format. Pontus Fransson 2014-02-25 16:07:50 +0100
  • 4f2738e921 Not finished Pickup system. Pontus Fransson 2014-02-25 14:36:54 +0100
  • 5620a3c517 Added eventfunctions for PlayerAction and PickupEvent Linda Andersson 2014-02-25 14:35:27 +0100
  • f2b63b7ad4 GL - weapon energy, force etc inside weapon Erik Persson 2014-02-25 13:56:35 +0100
  • 4d967b995d Added player stats. Added players to level. Respawn logic in level. Linda Andersson 2014-02-25 11:46:05 +0100
  • ba61838703 GL - only 1 player can manipulate a object at a time Erik Persson 2014-02-25 11:20:46 +0100
  • 5c023acc5b merge Erik Persson 2014-02-25 10:37:33 +0100
  • b78bc8c242 Merge remote-tracking branch 'origin/GameServer' into Physics Robin Engman 2014-02-27 09:19:58 +0100
  • 5ad5ad6f5f Se till så att man inte går över maxenergy Erik Persson 2014-02-27 09:11:13 +0100
  • ca715dbe05 GameLogic - Merged with gamelogic dean11 2014-02-27 09:11:00 +0100
  • 61dbace099 Removed some mf new Robin Engman 2014-02-27 09:09:28 +0100
  • d5eeb3eec1 Merge branch 'New-inputsystem' of https://github.com/dean11/Danbias into Gtest lanariel 2014-02-27 09:05:09 +0100
  • 3e72421cb5 half baked tiles lanariel 2014-02-27 09:04:12 +0100
  • ffa6da1a2f GameLogic - Fixed drop on secondary, Modified how keys are sent Dennis Andersen 2014-02-27 08:19:50 +0100
  • b289741897 Broken shit, dont take dean11 2014-02-26 16:57:32 +0100
  • 3bfedf920a GameServer - minor dean11 2014-02-26 16:10:04 +0100
  • 9c4f72882c Merged: game logic with new Input Linda Andersson 2014-02-26 15:12:13 +0100
  • c235c0309c Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Linda Andersson 2014-02-26 14:55:39 +0100
  • 74456a4d80 Spawning players on rand spawnpoint when they connect Linda Andersson 2014-02-26 14:55:29 +0100
  • 504f11ef4c Gameserver - Merged with gamelogic dean11 2014-02-26 14:42:17 +0100
  • a896d146c7 Merged with physics and added filepath dean11 2014-02-26 14:33:08 +0100
  • 469312bfe7 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-26 14:20:43 +0100
  • e680da9d54 GameServer - Merged with physics dean11 2014-02-26 14:20:33 +0100
  • 58df25c392 Fixed the damn path Robin Engman 2014-02-26 14:08:49 +0100
  • b1f82c8ef2 Merged with Physics dean11 2014-02-26 14:07:46 +0100
  • d5cda4deaa Added early triangle collisions Robin Engman 2014-02-26 14:06:02 +0100
  • 4cd91fadad Found bug. Explosive box was increasing the ID. Pontus Fransson 2014-02-26 13:59:06 +0100
  • 15df481dd3 GL - merge stuff Erik Persson 2014-02-26 12:00:30 +0100
  • 934bc80b62 InGame keys: Go to mainMenu with M. Exit client with ESC. Fix drop in drop out correctly. Linda Andersson 2014-02-26 11:53:33 +0100
  • 16ca665311 Fixed deleting problems when shuting down Linda Andersson 2014-02-26 11:09:24 +0100
  • 039dcef6a2 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Linda Andersson 2014-02-26 10:26:19 +0100