Linda Andersson
|
4c54be1e62
|
Player movement and weapon working
|
2014-02-27 16:02:17 +01:00 |
|
Linda Andersson
|
69f7944b23
|
Updating energy on UI
|
2014-02-27 15:30:21 +01:00 |
|
Linda Andersson
|
7063c6bc47
|
Pull from master. Cant pick up boxes.
|
2014-02-27 15:14:34 +01:00 |
|
Linda Andersson
|
b4409d2147
|
Sending energy update to client.
|
2014-02-27 14:56:18 +01:00 |
dean11
|
0f989eed4f
|
Merged with GameClientGraphics
|
2014-02-27 14:23:57 +01:00 |
Erik Persson
|
8111e9f51e
|
GL - M,L controls activating/deactivating the window. lower threshhold for dmg
|
2014-02-27 13:09:57 +01:00 |
|
Linda Andersson
|
91d1186c93
|
fixed some mem leaks. Models are only released when program exits so restarting a level results in leaks because they are loaded again.
|
2014-02-27 12:10:40 +01:00 |
|
dean11
|
2b8dbee5f6
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-27 11:41:36 +01:00 |
|
dean11
|
a80b1fa96f
|
Added back to main menu NOTE MEMORY LEAKS
|
2014-02-27 11:41:17 +01:00 |
|
Linda Andersson
|
87dc036cc5
|
Merge conflict
|
2014-02-27 11:38:16 +01:00 |
|
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 |
|
dean11
|
ca715dbe05
|
GameLogic - Merged with gamelogic
|
2014-02-27 09:11:00 +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
|
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
|
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 |
|
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
|
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 |
|
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 |
|
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
|
638f2f6241
|
Addded objectDelete protocol. Enable/ disable will be used for visibility on client
|
2014-02-25 16:26:37 +01:00 |
|
Linda Andersson
|
f2bb50804c
|
Play action animation
|
2014-02-25 16:08:45 +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 |
Tobias Grundel
|
73ca65516d
|
More stuff
|
2014-02-25 14:12:06 +01:00 |
|
Tobias Grundel
|
70419e9dd8
|
Nothing of importance
|
2014-02-25 14:08:15 +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 |
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 |
Dander7BD
|
1f90de4cb4
|
some implemetations
|
2014-02-24 19:45:13 +01:00 |
|
Pontus Fransson
|
9ccdbd55e2
|
Not connecting with broadcast anymore.
|
2014-02-24 16:18:47 +01:00 |
|
Linda Andersson
|
704e562d01
|
Merge branch 'GameServer' into GameClient
|
2014-02-24 14:48:36 +01:00 |
|
lanariel
|
37e9d47207
|
Instanced Rendering
|
2014-02-24 14:44:36 +01:00 |
|
Pontus Fransson
|
bf07ef5f5f
|
Connecting to the ip and port received in the last broadcast message.
|
2014-02-23 22:25:41 +01:00 |
|
Pontus Fransson
|
5fe89f1d8f
|
Fixed some crashes and added mutex around broadcast options on network server.
|
2014-02-23 22:07:33 +01:00 |
|
Pontus Fransson
|
be1c3e2af0
|
Sending strings in broadcast message.
|
2014-02-23 20:40:29 +01:00 |
|
Pontus Fransson
|
d64f3d7a20
|
Broadcasting works and I am getting the protocols out to LanMenuState!
|
2014-02-23 20:23:15 +01:00 |
|
Pontus Fransson
|
6eb0a282c2
|
LevelLoader reads lights and cgMesh correctly.
|
2014-02-22 12:58:43 +01:00 |