Dander7BD
|
f1e6a1c897
|
Merge fixes
Warning! Possibility that code were lost during this merge.
Please oh please do check what branch you are in before you edit files.
|
2014-02-27 10:46:30 +01:00 |
Erik Persson
|
e43996bdc8
|
Se till så att man inte går över maxenergy
|
2014-02-27 10:32:08 +01:00 |
Dennis Andersen
|
22bc079ed7
|
GameLogic - Fixed drop on secondary, Modified how keys are sent
|
2014-02-27 10:32:08 +01:00 |
|
dean11
|
50acc12951
|
Broken shit, dont take
|
2014-02-27 10:31:16 +01:00 |
|
dean11
|
4e502b298b
|
GameServer - minor
|
2014-02-27 10:31:15 +01:00 |
Linda Andersson
|
9731cd9c5e
|
Spawning players on rand spawnpoint when they connect
|
2014-02-27 10:31:15 +01:00 |
|
dean11
|
2da9ef4506
|
Merged with physics and added filepath
|
2014-02-27 10:31:13 +01:00 |
Robin Engman
|
30c425f8fa
|
Fixed the damn path
|
2014-02-27 10:31:13 +01:00 |
|
Robin Engman
|
d81a1c204c
|
Added early triangle collisions
|
2014-02-27 10:31:12 +01:00 |
Pontus Fransson
|
c32871687e
|
Found bug. Explosive box was increasing the ID.
|
2014-02-27 10:30:34 +01:00 |
|
Erik Persson
|
977920b360
|
GL - merge stuff
|
2014-02-27 10:30:33 +01:00 |
|
Linda Andersson
|
7d7d475499
|
InGame keys: Go to mainMenu with M. Exit client with ESC. Fix drop in drop out correctly.
|
2014-02-27 10:28:49 +01:00 |
|
Linda Andersson
|
d4e80733d2
|
Fixed deleting problems when shuting down
|
2014-02-27 10:27:55 +01:00 |
|
Pontus Fransson
|
28e84854d1
|
Health pickups is now working!
|
2014-02-27 10:27:54 +01:00 |
|
Pontus Fransson
|
8a65907625
|
Does not render non visible models anymore.
|
2014-02-27 10:24:39 +01:00 |
|
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 |
|
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 |
|
dean11
|
0fd038be8c
|
NewInpuit - Pre-merge with gameclient
|
2014-02-25 15:52:15 +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 |
|
dean11
|
13167064cb
|
Input - Added mouse features, custom tags and all-in-one callback
|
2014-02-25 13:49:20 +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 |
|
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
|
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 |