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 |
|
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 |
|
lanariel
|
f77f67eaaa
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient
|
2014-02-24 14:44:46 +01:00 |
|
lanariel
|
37e9d47207
|
Instanced Rendering
|
2014-02-24 14:44:36 +01:00 |
|
Dander7BD
|
6e0338ee6b
|
Minor mathematical fix
AngularAxis had a bug.
SnapAngularAxis is determined broken. Do not use. :(
|
2014-02-24 14:35:38 +01:00 |
|
Dander7BD
|
2d788137b2
|
Dans Raw device lab demo
To be reverted
|
2014-02-24 13:15:01 +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
|
203220f43b
|
When OysterThread was idle it was using a lot of cpu power.
|
2014-02-23 22:06:18 +01:00 |
|
Pontus Fransson
|
0cb7940bae
|
Sending real ip address, port and server name.
|
2014-02-23 21:15:16 +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
|
a0bf9e862a
|
Started implementing broadcasting.
|
2014-02-23 18:38:20 +01:00 |
|
Pontus Fransson
|
8e9d1a4999
|
Reworked NetworkClient's thread.
Cpu usage is decreased and recv/send rate should be increased.
|
2014-02-22 22:38:28 +01:00 |
|
Pontus Fransson
|
6eb0a282c2
|
LevelLoader reads lights and cgMesh correctly.
|
2014-02-22 12:58:43 +01:00 |
|
Dennis Andersen
|
44aab68bfb
|
Input - More support for mouse
|
2014-02-21 21:04:30 +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
|
8e0f6eefda
|
Merge remote-tracking branch 'origin/Physics' into GameLogic
|
2014-02-21 15:04:48 +01:00 |
|
Erik Persson
|
ed3152057c
|
GL - fixing with explosivecrate and massdriver
|
2014-02-21 15:02:42 +01:00 |
Robin Engman
|
e133562021
|
Merge with server
|
2014-02-21 14:14:30 +01:00 |
|
Robin Engman
|
954dc67f7a
|
Fixed multiple collisions
|
2014-02-21 14:09:38 +01:00 |
|
Pontus Fransson
|
1c71d7ef80
|
Don't update/send to inavlidated clients
|
2014-02-21 13:54:04 +01:00 |
|
Erik Persson
|
4360519be7
|
Merge remote-tracking branch 'origin/GameClient' into GameLogic
|
2014-02-21 13:00:20 +01:00 |
|
Erik Persson
|
87cf2d8ac5
|
GL - stuff
|
2014-02-21 12:59:04 +01:00 |
|
lindaandersson
|
b0aa6acdd6
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient
|
2014-02-21 12:38:34 +01:00 |
|
lindaandersson
|
38717f011c
|
Render players with run animation
|
2014-02-21 12:38:25 +01:00 |
|
Dander7BD
|
dee6c5f8d1
|
MainState renders now a mouseCursor
|
2014-02-21 12:31:31 +01:00 |