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

1452 Commits

Author SHA1 Message Date
lanariel 4697b85e3b Small fixes 2014-02-19 15:57:52 +01:00
lindaandersson 0876e5797a Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-19 15:54:01 +01:00
lindaandersson a2979a2bf5 GameClient - modified player Data and out commented physics 2014-02-19 15:53:28 +01:00
Dander7BD 48487e681b Merge remote-tracking branch 'origin/GameLogic' into GameClient 2014-02-19 15:53:21 +01:00
dean11 13755c0aeb Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer 2014-02-19 15:53:20 +01:00
dean11 d07ee997f5 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-19 15:53:09 +01:00
dean11 89b73cdf01 GameLogic - fixed wrong pointer cast 2014-02-19 15:52:16 +01:00
Dander7BD 908d52020a Some fixes and traps 2014-02-19 15:47:55 +01:00
Dander7BD c2226fa9d1 Clamp fixed 
WTF!? I'm 100% positive that I already did this fix. WTF!?
 2014-02-19 15:47:55 +01:00
Pontus Fransson f69f3af23d Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-19 15:40:23 +01:00
Pontus Fransson 03efca45b8 Fixed ButonEllipse it was not up to date. And only resizing the buttons now. 2014-02-19 15:40:09 +01:00
dean11 b81995b84b Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameLogic 2014-02-19 15:32:52 +01:00
dean11 b5d7109e13 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameLogic 2014-02-19 15:28:32 +01:00
dean11 89857c03e6 Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameLogic 2014-02-19 15:25:10 +01:00
Dander7BD a9f554448c some edits in Camera_FPSV2 2014-02-19 15:20:50 +01:00
Dander7BD 4104ae8df7 Camera_FPSV2 fix + Added bug trap 
Camera_FPSV2::SetRotation

Though it caught no bugs
 2014-02-19 15:00:40 +01:00
dean11 6409b051b4 GameServer - Added more feature to standalone server 2014-02-19 14:53:59 +01:00
Pontus Fransson da94d7d827 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-19 14:52:24 +01:00
Dander7BD 706395680f Added bunch of Quaternion functions 
Needed one of them to create  a bug trap
 2014-02-19 14:51:37 +01:00
Pontus Fransson 717e95bdfe Network - Added reconnect with the last address you connected on. 2014-02-19 14:49:20 +01:00
Dander7BD 8917caf08a removed debug comment 2014-02-19 14:20:46 +01:00
dean11 d79e65657c Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-19 14:04:53 +01:00
Dander7BD f04a928d6e Merge remote-tracking branch 'origin/Physics' into GameClient 2014-02-19 14:01:46 +01:00
Dander7BD cd4e5ae0ec compilation error fixes 2014-02-19 14:00:48 +01:00
Robin Engman 3520062577 Implemented TurnLeft function 2014-02-19 13:59:59 +01:00
lindaandersson d972bd7685 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-19 13:57:09 +01:00
lindaandersson b25a08ff90 Fix in lvl loader - can now load shere RB 2014-02-19 13:57:00 +01:00
Robin Engman 0a9b522e15 Merge remote-tracking branch 'origin/GameLogic' into Physics 2014-02-19 13:50:33 +01:00
dean11 d4baf33ef5 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-19 13:50:32 +01:00
dean11 47b9b69e7f Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer 2014-02-19 13:50:23 +01:00
dean11 f0c581ca04 GameLogic - Added functions for relative rotation 2014-02-19 13:47:49 +01:00
Dander7BD e585589d6e Merge remote-tracking branch 'origin/GameServer' into GameClient 2014-02-19 13:44:55 +01:00
lanariel 273995e204 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClientGraphics 2014-02-19 13:43:03 +01:00
Dander7BD 7ece3b62a0 Changed Player_Look protocol to Player_LeftTurn 2014-02-19 13:42:57 +01:00
lindaandersson b3f8754f47 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-19 13:41:12 +01:00
lindaandersson 3fe0221342 GameClient - fixed render RB 2014-02-19 13:41:05 +01:00
lanariel 90072484b8 Merge branch 'GameClientGraphics' of https://github.com/dean11/Danbias into GameClientGraphics 2014-02-19 13:39:20 +01:00
lanariel 5cc858ba1b Normal normals 2014-02-19 13:38:36 +01:00
Dander7BD 220cf30abb Merge remote-tracking branch 'origin/GameServer' into GameClient 2014-02-19 13:15:56 +01:00
Dander7BD 0f1d07cee0 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-19 13:15:29 +01:00
Dander7BD 8816efafc8 GameState pre-work for subStates 2014-02-19 13:15:19 +01:00
lindaandersson d6d45392d3 Merge remote-tracking branch 'origin/GameServer' into GameClient 2014-02-19 13:13:05 +01:00
dean11 be73d95568 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-19 13:10:17 +01:00
dean11 8a3cd796ca GameServer - Pontus found idiot bug that dennis made 2014-02-19 12:46:05 +01:00
lindaandersson 14deeeebca Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-19 12:09:50 +01:00
lindaandersson 932ef429c2 GameClient - removed hardcoding for lvl, use 2ofAll map for correct world. Init player gets wrong scale and isMyPlayer. Need to verify camera on client 2014-02-19 12:09:42 +01:00
Pontus Fransson f1cd73425c Removed old LevelLoader, it's now in a seperate project. 2014-02-19 11:38:36 +01:00
lindaandersson ad37095a80 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-19 11:31:14 +01:00
lindaandersson 77ad199cf6 GameClient - merged with all new things 2014-02-19 11:31:05 +01:00
Pontus Fransson 6c19c12682 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 
Conflicts:
	Code/Game/GameLogic/LevelLoader/LevelLoader.cpp
	Code/Game/GameLogic/LevelLoader/LevelLoader.h
	Code/Game/GameLogic/LevelLoader/LevelParser.cpp
	Code/Game/GameLogic/LevelLoader/LevelParser.h
	Code/Game/GameLogic/LevelLoader/Loader.cpp
	Code/Game/GameLogic/LevelLoader/Loader.h
	Code/Game/GameLogic/LevelLoader/ObjectDefines.h
	Code/Game/GameLogic/LevelLoader/ParseFunctions.cpp
 2014-02-19 11:25:33 +01:00