Erik Persson
52ba5602d5
GameLogic - player now using some of the new phys api
2014-01-09 13:06:18 +01:00
Erik Persson
48b9189a03
Revert "state"
...
This reverts commit 4a07586076
.
2014-01-09 12:51:17 +01:00
Erik Persson
4a07586076
state
2014-01-09 12:43:32 +01:00
Dennis Andersen
ed202a15a2
Worked over the holidays
2014-01-07 10:26:09 +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
Dennis Andersen
694d5576d7
GameLogic - Pre-merge with physics
2013-12-19 15:35:49 +01:00
Erik Persson
0ea08fbd54
gamesession testing
2013-12-19 10:21:03 +01:00
Erik Persson
8173f3818d
gamelogic update and added some level design elements
...
teammanager, team,
2013-12-18 08:30:58 +01:00
Erik Persson
c63e9f1c08
Some comments on the massdriver and player
2013-12-12 12:21:19 +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
c801ab829a
Merge remote-tracking branch 'origin/Physics' into GameLogic
...
Conflicts:
Bin/Content/Shaders/TextureDebug.cso
2013-12-12 10:10:52 +01:00
Erik Persson
e11d7d94f7
updated the weapon system, collisionManager and redid the "object" heirarki
2013-12-12 09:36:14 +01:00
Erik Persson
4b9f2671bf
updated weapon
2013-12-10 11:17:25 +01:00
Erik Persson
97e0b1298a
added functionallity to player and weapon, started on the weapon design.
2013-12-10 09:57:05 +01:00
Erik Persson
63addde51e
made "interfaces" of most classes
2013-12-05 11:50:39 +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