b34df93e49
GL - Massdriver updates
2014-02-12 13:12:51 +01:00
3a80a71143
GL - working on weapon
2014-02-12 11:32:30 +01:00
1db41a863b
Merge remote-tracking branch 'origin/GamePhysics' into GameLogic
2014-02-12 10:44:13 +01:00
0d643a890d
GL - massdriver
2014-02-12 10:43:41 +01:00
d7c381cc85
GL- fixed subscription
2014-02-12 09:23:25 +01:00
99146430a4
Major overhaul
2014-02-09 21:24:09 +01:00
91db71fe0e
GL - 20 boxes and a house
2014-02-05 15:54:48 +01:00
426444ca34
GL - added more boxes and weaponfunctionality
2014-02-05 11:46:04 +01:00
bd9e4599cb
GL - fixed respawning and also fixed weapon
2014-02-04 13:58:48 +01:00
7f29b62c6f
GL - YOU CAN NOW SHOOT STUFF YAAAAY
2014-02-03 16:19:24 +01:00
d77b3d92d8
GL - using movetolimbo in massdriver pickup functionallity
2014-02-03 15:45:48 +01:00
99b041f165
GL - first implementation of weapons forcepull with pickup functionallity
2014-02-03 15:32:58 +01:00
8f234611d2
GL - mergeissues fixed
2014-02-03 10:48:12 +01:00
ef71b365ab
asd
2014-02-03 10:42:40 +01:00
5b263caccd
GL - merge with GL
2014-01-31 16:42:25 +01:00
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
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
fa7f400c71
GL - test this robin
2014-01-31 10:58:03 +01:00
323b7322fa
GL - testing
2014-01-30 11:11:45 +01:00
3b552d5361
GL - change gamelogic to use the new physics
2014-01-28 15:44:32 +01:00
a56fcbcb9b
GL - can send object position from level objects, gravity and frustrum problems.
2014-01-28 15:04:25 +01:00
1ed1bab751
Created test box that should now be shot at by the player
2014-01-27 13:55:09 +01:00
74ac5e2d31
Updated creation of objects
2014-01-27 08:54:25 +01:00
43eac4cbe3
moved ForcePushAction for massdriver to collisionManager
2014-01-22 14:26:45 +01:00
80204ecbe3
GL - Massdriver usage of applyeffect
2014-01-22 13:02:13 +01:00
ebaa668382
Major updates to Collision handling with the class CollitionManager. changes started on the massdriver
2014-01-21 16:09:39 +01:00
0080a9f6f2
small name changes
2014-01-16 11:17:19 +01:00
0065779205
Added comments where the physic generated errors due to big patch
2013-12-21 17:37:30 +01:00
c63e9f1c08
Some comments on the massdriver and player
2013-12-12 12:21:19 +01:00
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
4b9f2671bf
updated weapon
2013-12-10 11:17:25 +01:00
97e0b1298a
added functionallity to player and weapon, started on the weapon design.
2013-12-10 09:57:05 +01:00
Erik Persson
Robin Engman
lindaandersson
Dennis Andersen