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 |
|
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
|
08bec9470e
|
Merge remote-tracking branch 'origin/GameServer' into Physics
|
2014-02-26 09:39:39 +01:00 |
Linda Andersson
|
4d077106dc
|
Weapon action enum added
|
2014-02-26 08:51:56 +01:00 |
|
Robin Engman
|
ca693c412f
|
Player air check function
|
2014-02-26 08:51:18 +01:00 |
|
dean11
|
081bd9db36
|
Merge branch 'New-inputsystem' of https://github.com/dean11/Danbias into GameServer
|
2014-02-26 08:49:15 +01:00 |
|
Robin Engman
|
47e6d93957
|
Fixed player going bonkers on lower hemisphere
|
2014-02-25 18:25:51 +01:00 |
|
dean11
|
8d7bff808a
|
NewInput - Merged with Gameserver
|
2014-02-25 16:49:33 +01:00 |
|
dean11
|
7c52fe236f
|
NewInput - Merged with gameClient
|
2014-02-25 16:42: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 |
|
Linda Andersson
|
638f2f6241
|
Addded objectDelete protocol. Enable/ disable will be used for visibility on client
|
2014-02-25 16:26:37 +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
|
d56d1d7569
|
Fixed error with reading lights from level format.
|
2014-02-25 16:07:50 +01:00 |
|
dean11
|
0fd038be8c
|
NewInpuit - Pre-merge with gameclient
|
2014-02-25 15:52:15 +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 |
|
dean11
|
b4ad883472
|
New input - added new input and more menu stuff
|
2014-02-25 14:25:54 +01:00 |
|
dean11
|
6dc60a2082
|
Input - Added more functionality, custom tag and all-in-one key callback
|
2014-02-25 14:20:11 +01:00 |
Erik Persson
|
31bf73c2fd
|
GL - weapon energy, force etc inside weapon
|
2014-02-25 13:56:49 +01:00 |
|
dean11
|
13167064cb
|
Input - Added mouse features, custom tags and all-in-one callback
|
2014-02-25 13:49:20 +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
|
5ba57c1a72
|
Merge remote-tracking branch 'origin/GameClient' into GameLogic
|
2014-02-25 10:44:51 +01:00 |
|
Erik Persson
|
bc17a9f09e
|
merge
|
2014-02-25 10:37:33 +01:00 |
lanariel
|
53f0699b61
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient
|
2014-02-25 09:45:13 +01:00 |
|
lanariel
|
f35f96b8f2
|
Instanced fix, render char, manual instanced flag per model, wireframe fix
|
2014-02-25 09:45:02 +01:00 |
|
Dennis Andersen
|
18d0a6460b
|
Input - Added method for releasing default input object
|
2014-02-25 09:01:06 +01:00 |
|
dean11
|
0af0404812
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer
|
2014-02-25 08:54:59 +01:00 |
|
Dennis Andersen
|
df2572a95e
|
Input - Added method for releasing default input object
|
2014-02-25 01:05:37 +01:00 |
|
Dennis Andersen
|
56258e48c7
|
Merge branch 'New-inputsystem' of https://github.com/dean11/Danbias into Input
|
2014-02-25 00:08:11 +01:00 |
|
Dennis Andersen
|
282cbebd7c
|
Merge branch 'Input' of https://github.com/dean11/Danbias into Input
|
2014-02-25 00:07:01 +01:00 |
Dander7BD
|
1f90de4cb4
|
some implemetations
|
2014-02-24 19:45:13 +01:00 |
|
Dander7BD
|
3071dfcb2f
|
Merge remote-tracking branch 'origin/Input' into New-inputsystem
|
2014-02-24 16:41:18 +01:00 |
|
dean11
|
feb7c51e1c
|
Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameServer
|
2014-02-24 16:30:31 +01:00 |
|
dean11
|
b46b6525cd
|
Input - Merged with old input stuff that caused errors
|
2014-02-24 16:27:43 +01:00 |
|
Pontus Fransson
|
9ccdbd55e2
|
Not connecting with broadcast anymore.
|
2014-02-24 16:18:47 +01:00 |
|
dean11
|
cc17f80fd7
|
Input - Added toggle for input
|
2014-02-24 16:01:06 +01:00 |
|
Linda Andersson
|
1b0772a004
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient
|
2014-02-24 14:59:35 +01:00 |
|
lindaandersson
|
114e14c408
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient
|
2014-02-24 14:59:09 +01:00 |
|
lindaandersson
|
627063748d
|
Player action protocol added
|
2014-02-24 14:59:01 +01:00 |
|
Linda Andersson
|
704e562d01
|
Merge branch 'GameServer' into GameClient
|
2014-02-24 14:48:36 +01:00 |