Robin Engman
|
2f19390cd2
|
Fixed player jump
|
2014-02-26 10:05:18 +01:00 |
|
Robin Engman
|
2d9f89676a
|
Merge with GL
|
2014-02-26 09:48:19 +01:00 |
|
Robin Engman
|
ca693c412f
|
Player air check function
|
2014-02-26 08:51:18 +01:00 |
|
Robin Engman
|
47e6d93957
|
Fixed player going bonkers on lower hemisphere
|
2014-02-25 18:25: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 |
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
|
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 |
Erik Persson
|
31bf73c2fd
|
GL - weapon energy, force etc inside weapon
|
2014-02-25 13:56:49 +01:00 |
|
Linda Andersson
|
f56323ee01
|
Merge with affectedByTag. Sending killer ID
|
2014-02-25 12:12:24 +01:00 |
|
Linda Andersson
|
7460f16512
|
Added player stats. Added players to level. Respawn logic in level.
|
2014-02-25 11:46:05 +01:00 |
|
Erik Persson
|
8a359bd1ba
|
GL - only 1 player can manipulate a object at a time
|
2014-02-25 11:20:46 +01:00 |
|
Erik Persson
|
bc17a9f09e
|
merge
|
2014-02-25 10:37:33 +01:00 |
|
lindaandersson
|
7bb67b6a85
|
sec respawn
|
2014-02-21 15:56:32 +01:00 |
|
lindaandersson
|
1d147004a2
|
small fixes and explosive crate do 90 dmg
|
2014-02-21 15:54:43 +01:00 |
|
lindaandersson
|
4f838bb39e
|
Merge remote-tracking branch 'origin/GameLogic' into GameClient
|
2014-02-21 15:42:21 +01:00 |
|
lindaandersson
|
22f52150d5
|
Sending dmg, respawn and dead from player to client
|
2014-02-21 15:42:09 +01:00 |
|
Erik Persson
|
ed3152057c
|
GL - fixing with explosivecrate and massdriver
|
2014-02-21 15:02:42 +01:00 |
|
Erik Persson
|
a4a531264f
|
GL - second draft damage
|
2014-02-21 11:56:48 +01:00 |
|
Erik Persson
|
1776601961
|
GL - damage first draft
|
2014-02-21 11:35:38 +01:00 |
|
Erik Persson
|
3178f08bf0
|
GL - player can shoot, lookdir is now sent
|
2014-02-21 11:10:47 +01:00 |
dean11
|
f84c996a52
|
GameLogic - Added disconnect messages and reuse of players
|
2014-02-20 16:52:36 +01:00 |
|
dean11
|
8583e40d2f
|
Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-20 16:12:33 +01:00 |
|
Erik Persson
|
41cd83500c
|
GL - deleteing cones in attatchmentMassdriver
|
2014-02-20 16:02:53 +01:00 |
|
Robin Engman
|
f8f656d7c9
|
Player now has better movement
Something is "dragging" the player slightly, but will be fixed. Bumps up
and down, tweaking physical properties should fix it.
|
2014-02-20 15:14:02 +01:00 |
|
dean11
|
8f3eb586c6
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer
|
2014-02-20 12:44:24 +01:00 |
|
lindaandersson
|
50fc2fcc29
|
Merge remote-tracking branch 'origin/GameLogic' into GameClient
|
2014-02-20 11:59:44 +01:00 |
|
lindaandersson
|
1079b20e15
|
Updating player pos and RB, moved camera pos for testing
|
2014-02-20 11:59:26 +01:00 |
|
dean11
|
7ee63f887e
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer
|
2014-02-20 11:58:08 +01:00 |
|
dean11
|
4150ba0fc3
|
GameLogic - Added default scael 1:1
|
2014-02-20 11:57:26 +01:00 |
|
dean11
|
8cf0087a95
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer
|
2014-02-20 11:32:57 +01:00 |
|
lindaandersson
|
e6cd1f1e5f
|
GameClient now objects say to client that they have moved!
|
2014-02-20 10:33:27 +01:00 |
|
lindaandersson
|
dd397ec752
|
GameClient set onMoveFunc for all objects
|
2014-02-20 10:13:01 +01:00 |
|
dean11
|
641442854e
|
GameServer - Added debug traps
|
2014-02-20 09:23:33 +01:00 |
|
dean11
|
208885d4eb
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer
|
2014-02-20 09:22:03 +01:00 |
|
lindaandersson
|
7b87707714
|
GmaeClient fix RBsphere radius
|
2014-02-20 09:21:38 +01:00 |
|
dean11
|
d93d900d40
|
GameServer - Misc
|
2014-02-20 09:14:42 +01:00 |
|
lindaandersson
|
0c0fde51b0
|
GameClient Correct scaling on drawn RB
|
2014-02-20 08:56:36 +01:00 |
|
lindaandersson
|
80b2a9edd7
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient
|
2014-02-20 08:44:03 +01:00 |
|
Dennis Andersen
|
f872cfffd1
|
Added debug project to game server and some other stuff
|
2014-02-20 08:33:07 +01:00 |
|
Dennis Andersen
|
4ac5cdd147
|
GameServer - Painly merge with GameLogic
|
2014-02-19 22:44:31 +01:00 |
|
Dennis Andersen
|
b5639bec90
|
GameServer - Some white spaces etc..
|
2014-02-19 22:07:53 +01:00 |
Dander7BD
|
3b70e0baec
|
Merge remote-tracking branch 'origin/GameClientGraphics' into GameClient
|
2014-02-19 16:09:07 +01:00 |
lanariel
|
4697b85e3b
|
Small fixes
|
2014-02-19 15:57:52 +01:00 |
|
lindaandersson
|
0876e5797a
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient
|
2014-02-19 15:54:01 +01:00 |
|
lindaandersson
|
a2979a2bf5
|
GameClient - modified player Data and out commented physics
|
2014-02-19 15:53:28 +01:00 |
|
dean11
|
89b73cdf01
|
GameLogic - fixed wrong pointer cast
|
2014-02-19 15:52:16 +01:00 |