Pontus Fransson
|
762aea73a0
|
Fixed static id not matching on client/server.
|
2014-02-27 10:24:39 +01:00 |
Robin Engman
|
5675155be4
|
Fixed player jump
|
2014-02-27 10:24:38 +01:00 |
Linda Andersson
|
5a74f5368f
|
Added collision and weapon events and send them to client
|
2014-02-27 10:24:37 +01:00 |
|
Linda Andersson
|
b39d52e536
|
Weapon action enum added
|
2014-02-27 10:21:49 +01:00 |
|
Robin Engman
|
4b4255cfcc
|
Player air check function
|
2014-02-27 10:21:49 +01:00 |
|
Robin Engman
|
800f514028
|
Fixed player going bonkers on lower hemisphere
|
2014-02-27 10:18:18 +01:00 |
|
Linda Andersson
|
6bd8c94d79
|
Addded objectDelete protocol. Enable/ disable will be used for visibility on client
|
2014-02-27 10:07:11 +01:00 |
|
Pontus Fransson
|
a8d4ff2c89
|
Reading hp pickups from levelformat. Updating pickups.
|
2014-02-27 10:07:10 +01:00 |
|
Linda Andersson
|
d91fa3073f
|
Play action animation
|
2014-02-27 10:07:10 +01:00 |
|
Pontus Fransson
|
9a449253c2
|
Fixed error with reading lights from level format.
|
2014-02-27 10:07:09 +01:00 |
|
Pontus Fransson
|
4f2738e921
|
Not finished Pickup system.
|
2014-02-27 10:07:08 +01:00 |
|
Linda Andersson
|
5620a3c517
|
Added eventfunctions for PlayerAction and PickupEvent
|
2014-02-27 10:07:07 +01:00 |
Erik Persson
|
f2b63b7ad4
|
GL - weapon energy, force etc inside weapon
|
2014-02-27 10:06:02 +01:00 |
|
Linda Andersson
|
4d967b995d
|
Added player stats. Added players to level. Respawn logic in level.
|
2014-02-27 10:06:01 +01:00 |
|
Erik Persson
|
ba61838703
|
GL - only 1 player can manipulate a object at a time
|
2014-02-27 10:02:50 +01:00 |
|
Erik Persson
|
5c023acc5b
|
merge
|
2014-02-27 10:02:49 +01:00 |
|
Erik Persson
|
5ad5ad6f5f
|
Se till så att man inte går över maxenergy
|
2014-02-27 09:11:27 +01:00 |
dean11
|
ca715dbe05
|
GameLogic - Merged with gamelogic
|
2014-02-27 09:11:00 +01:00 |
|
Robin Engman
|
61dbace099
|
Removed some mf new
|
2014-02-27 09:09:28 +01:00 |
lanariel
|
d5eeb3eec1
|
Merge branch 'New-inputsystem' of https://github.com/dean11/Danbias into Gtest
|
2014-02-27 09:05:09 +01:00 |
|
lanariel
|
3e72421cb5
|
half baked tiles
|
2014-02-27 09:04:12 +01:00 |
|
Dennis Andersen
|
ffa6da1a2f
|
GameLogic - Fixed drop on secondary, Modified how keys are sent
|
2014-02-27 08:19:50 +01:00 |
|
dean11
|
b289741897
|
Broken shit, dont take
|
2014-02-26 16:57:32 +01:00 |
|
dean11
|
3bfedf920a
|
GameServer - minor
|
2014-02-26 16:10:04 +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
|
469312bfe7
|
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameServer
|
2014-02-26 14:20:43 +01:00 |
|
dean11
|
e680da9d54
|
GameServer - Merged with physics
|
2014-02-26 14:20:33 +01:00 |
|
Robin Engman
|
58df25c392
|
Fixed the damn path
|
2014-02-26 14:08:49 +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
|
934bc80b62
|
InGame keys: Go to mainMenu with M. Exit client with ESC. Fix drop in drop out correctly.
|
2014-02-26 11:53:33 +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
|
9ec3fc6fa4
|
Does not render non visible models anymore.
|
2014-02-26 10:22:43 +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 |
|
Robin Engman
|
08bec9470e
|
Merge remote-tracking branch 'origin/GameServer' into Physics
|
2014-02-26 09:39:39 +01:00 |
|
Linda Andersson
|
8438b7dfbb
|
Renamed actionEvent
|
2014-02-26 09:11:45 +01:00 |
|
Linda Andersson
|
4d077106dc
|
Weapon action enum added
|
2014-02-26 08:51:56 +01:00 |