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

47 Commits

Author SHA1 Message Date
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
Erik Persson 3a80a71143 GL - working on weapon 2014-02-12 11:32:30 +01:00
Robin Engman ba0d6ca73a Amazing merge with server 2014-02-10 12:42:31 +01:00
Robin Engman 99146430a4 Major overhaul 2014-02-09 21:24:09 +01:00
Dennis Andersen 310ed3dfc5 GameServer - Multiplayer now working properly 2014-02-09 16:42:26 +01:00
Dennis Andersen 201a07f0dc GameServer - Merged with GameLogic 2014-02-05 15:16:31 +01:00
lindaandersson 426444ca34 GL - added more boxes and weaponfunctionality 2014-02-05 11:46:04 +01:00
lindaandersson 6818dda2b9 GL - testing 2014-02-05 09:06:33 +01:00
Dennis Andersen b7f550859d GameServer - Merge with GameLogic 2014-02-04 22:13:07 +01:00
Erik Persson 4ad86ae83b GL - Added jumppad(implemented but not tested) 2014-02-04 16:24:48 +01:00
Dennis Andersen de8c76f051 GameServer - Fixed bugg where threads touched same data, n players should now be able to connect 2014-02-04 16:07:10 +01:00
Erik Persson bd9e4599cb GL - fixed respawning and also fixed weapon 2014-02-04 13:58:48 +01:00
Erik Persson 3bf9f59f5a GL - Player dies and respawns 2014-02-04 11:13:16 +01:00
Erik Persson 2c3b1e5038 GL - using real dmg algorithm 2014-02-03 16:20:50 +01:00
Erik Persson d77b3d92d8 GL - using movetolimbo in massdriver pickup functionallity 2014-02-03 15:45:48 +01:00
Erik Persson 99b041f165 GL - first implementation of weapons forcepull with pickup functionallity 2014-02-03 15:32:58 +01:00
Erik Persson 16f535bfa3 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 
Conflicts:
	Code/Game/GameLogic/AttatchmentMassDriver.cpp
	Code/Game/GameLogic/Game_PlayerData.cpp
	Code/Game/GameLogic/Level.cpp
 2014-01-31 14:16:32 +01:00
Erik Persson 16a342da49 GL - adjusting in GL, added forcepushData struct for passing args when shooting. connect changes in network 2014-01-31 14:05:52 +01:00
lindaandersson fa7f400c71 GL - test this robin 2014-01-31 10:58:03 +01:00
lindaandersson 4df6b849a6 GL - working with new models and server 2014-01-31 09:39:44 +01:00
Erik Persson 31feccf284 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 
Conflicts:
	Code/Game/DanBiasGame/GameClientState/GameState.cpp
	Code/Game/GameLogic/Game.cpp
 2014-01-31 09:17:54 +01:00
Erik Persson c30db71e94 GL - more testing and changes to the level and using the physics API 2014-01-31 09:12:15 +01:00
Erik Persson ae6a570a12 GL - trying to make walking nice 2014-01-30 15:12:53 +01:00
lindaandersson 2a69af5c9f GL - merge 2014-01-30 12:01:48 +01:00
Erik Persson 323b7322fa GL - testing 2014-01-30 11:11:45 +01:00
lindaandersson 09693c7f35 GL - merge 2014-01-30 09:40:58 +01:00
lindaandersson 446bdd412b GL - updated constructors to set before and after collision response functions 2014-01-29 14:33:21 +01:00
lindaandersson 3b552d5361 GL - change gamelogic to use the new physics 2014-01-28 15:44:32 +01:00
lindaandersson a56fcbcb9b GL - can send object position from level objects, gravity and frustrum problems. 2014-01-28 15:04:25 +01:00
lindaandersson a8dbf2a4c9 GL - added test box to level 2014-01-27 14:43:39 +01:00
Erik Persson 1ed1bab751 Created test box that should now be shot at by the player 2014-01-27 13:55:09 +01:00
Erik Persson 74ac5e2d31 Updated creation of objects 2014-01-27 08:54:25 +01:00
Erik Persson 121fd51c45 GL collision with level should worm 2014-01-23 08:57:46 +01:00
Erik Persson 6a888cb154 GL - adjusting collisionManager 2014-01-22 15:47:44 +01:00
Erik Persson ce80e8155c GL - formatting mistake 2014-01-22 14:39:10 +01:00
Erik Persson 43eac4cbe3 moved ForcePushAction for massdriver to collisionManager 2014-01-22 14:26:45 +01:00
Erik Persson ebaa668382 Major updates to Collision handling with the class CollitionManager. changes started on the massdriver 2014-01-21 16:09:39 +01:00
Erik Persson eaf0ae1479 GL - can now compile 2014-01-17 08:52:34 +01:00
Erik Persson 225d8912da GL - make rigidbody level 2014-01-16 11:40:29 +01:00
Dennis Andersen 0065779205 Added comments where the physic generated errors due to big patch 2013-12-21 17:37:30 +01:00
Dennis Andersen 15d6ac8cf9 GameLogic - Final sprint2 merge 2013-12-20 09:42:02 +01:00
Erik Persson 0ea08fbd54 gamesession testing 2013-12-19 10:21:03 +01:00
Erik Persson 8f36f64c4f updated AttatchmentMassDriver and CollisionManager 
weapon attatchments now have a owner(player) to facillitate the weapon
manipulating the player using it.

CollisionManager now works with a tag void* in the rigidbody to link
with a game object instead of the RefManager component
 2013-12-12 12:16:13 +01:00
Erik Persson e11d7d94f7 updated the weapon system, collisionManager and redid the "object" heirarki 2013-12-12 09:36:14 +01:00
dean11 3d973c16a2 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2013-12-03 12:09:22 +01:00
dean11 a852e8eab4 Created the game modules 2013-12-03 12:07:37 +01:00
Renamed from Code/GameLogic/CollisionManager.cpp (Browse further)