NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,550 Commits 1 Branch 0 Tags 38 MiB
Commit Graph

1550 Commits

Author SHA1 Message Date
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
dean11 342aada491 Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameServer 2014-02-24 12:31:19 +01:00
dean11 7f067b0010 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-24 11:05:30 +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
dean11 17d5991545 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer 2014-02-21 13:24:58 +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
Robin Engman d7e0b55a82 Experiment - Release from limbo 2014-02-21 12:21:10 +01:00
lanariel 5aeac78f60 instanced structure in place 2014-02-21 12:19:53 +01:00
Dander7BD 40276391af post merge fixes 2014-02-21 12:18:46 +01:00
Dander7BD 60a5ddc79d Merge remote-tracking branch 'origin/GameClient' into New-inputsystem 
Conflicts:
	Code/Game/GameClient/GameClient.vcxproj
	Code/Game/GameClient/GameClientState/GameState.cpp
 2014-02-21 12:14:22 +01:00
Dander7BD 9a470fc175 post merge fixes 2014-02-21 12:09:38 +01:00
Robin Engman 7f4120e807 Merge remote-tracking branch 'origin/GameLogic' into Physics 2014-02-21 11:59:42 +01:00
Robin Engman 3c25bb62ba Merge remote-tracking branch 'origin/GameClient' into Physics 2014-02-21 11:58:59 +01:00
Erik Persson 695d6db7a9 Merge remote-tracking branch 'origin/GameServer' into GameLogic 2014-02-21 11:57:21 +01:00
Erik Persson a4a531264f GL - second draft damage 2014-02-21 11:56:48 +01:00
Dander7BD adda3c1fff Merge remote-tracking branch 'origin/Input' into New-inputsystem 
Conflicts:
	Code/Misc/Input/Include/Mouse.h
 2014-02-21 11:54:40 +01:00
dean11 c04ef3a425 Misc - Merged with Input 2014-02-21 11:52:48 +01:00
lanariel 8f0a0464a5 Merge branch 'Misc' of https://github.com/dean11/Danbias into GameClient 2014-02-21 11:51:00 +01:00
lanariel 957d73f0f7 Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameClient 2014-02-21 11:50:22 +01:00
lanariel bd0daf363d start with Instanced 2014-02-21 11:49:24 +01:00
Pontus Fransson 5742f45392 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer 2014-02-21 11:45:11 +01:00
dean11 ed6f80765e Misc - Intergrated seperate textual input 2014-02-21 11:43:05 +01:00
Erik Persson 0ceab1640d Merge remote-tracking branch 'origin/Physics' into GameLogic 2014-02-21 11:36:32 +01:00
Erik Persson 1776601961 GL - damage first draft 2014-02-21 11:35:38 +01:00
Robin Engman 628c81c33a Fixed linear velocity 2014-02-21 11:33:57 +01:00