Linda Andersson
|
1bf7e21fcc
|
Added player color to client. Spawnpoint class but logic needs to be implemented. Added kills and deatch counting and message sending for it.
|
2014-02-27 11:35:32 +01:00 |
|
Linda Andersson
|
9c4f72882c
|
Merged: game logic with new Input
|
2014-02-26 15:12:13 +01:00 |
|
Linda Andersson
|
c235c0309c
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-26 14:55:39 +01:00 |
|
Linda Andersson
|
74456a4d80
|
Spawning players on rand spawnpoint when they connect
|
2014-02-26 14:55:29 +01:00 |
dean11
|
504f11ef4c
|
Gameserver - Merged with gamelogic
|
2014-02-26 14:42:17 +01:00 |
|
dean11
|
a896d146c7
|
Merged with physics and added filepath
|
2014-02-26 14:33:08 +01:00 |
|
dean11
|
e680da9d54
|
GameServer - Merged with physics
|
2014-02-26 14:20:33 +01:00 |
|
dean11
|
b1f82c8ef2
|
Merged with Physics
|
2014-02-26 14:07:46 +01:00 |
Robin Engman
|
d5cda4deaa
|
Added early triangle collisions
|
2014-02-26 14:06:02 +01:00 |
Pontus Fransson
|
4cd91fadad
|
Found bug. Explosive box was increasing the ID.
|
2014-02-26 13:59:06 +01:00 |
Erik Persson
|
15df481dd3
|
GL - merge stuff
|
2014-02-26 12:00:30 +01:00 |
|
Linda Andersson
|
16ca665311
|
Fixed deleting problems when shuting down
|
2014-02-26 11:09:24 +01:00 |
|
Linda Andersson
|
039dcef6a2
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-26 10:26:19 +01:00 |
|
Linda Andersson
|
a8055cfbf7
|
Merge with physics
|
2014-02-26 10:25:39 +01:00 |
|
Pontus Fransson
|
dbbc7a9769
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-26 10:24:42 +01:00 |
|
Pontus Fransson
|
925f05b3b0
|
Health pickups is now working!
|
2014-02-26 10:23:38 +01:00 |
|
Pontus Fransson
|
8798fc9006
|
Fixed static id not matching on client/server.
|
2014-02-26 10:22:08 +01:00 |
|
Robin Engman
|
2f19390cd2
|
Fixed player jump
|
2014-02-26 10:05:18 +01:00 |
|
Linda Andersson
|
13d6a062fc
|
Added collision and weapon events and send them to client
|
2014-02-26 10:05:07 +01:00 |
|
Robin Engman
|
2d9f89676a
|
Merge with GL
|
2014-02-26 09:48:19 +01:00 |
|
Linda Andersson
|
8438b7dfbb
|
Renamed actionEvent
|
2014-02-26 09:11:45 +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 |