NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
College Game Group Project, sadly missing its content files. I have them somewhere. http://noedge.nerdcavestudio.com/
1,078 Commits 1 Branch 0 Tags 38 MiB
C++ 94.9%
C 3.4%
HLSL 1%
CMake 0.5%
C# 0.2%
Go to file
Dander7BD 60d1fdba97 Merge remote-tracking branch 'origin/GameLogic' into Camera-test-merge 
Conflicts:
	Code/Game/DanBiasGame/DanBiasGame.vcxproj
	Code/Game/DanBiasGame/DanBiasGame_Impl.cpp
	Code/Game/DanBiasGame/GameClientState/C_Object.h
	Code/Game/DanBiasGame/GameClientState/GameClientState.h
	Code/Game/DanBiasGame/GameClientState/GameState.cpp
	Code/Game/DanBiasGame/GameClientState/GameState.h
	Code/Game/DanBiasGame/GameClientState/LobbyState.h
	Code/Game/DanBiasGame/GameClientState/LoginState.h
	Code/Game/DanBiasGame/GameClientState/MainState.cpp
	Code/Game/GameProtocols/ObjectProtocols.h
	Code/Game/GameServer/Implementation/GameSession_General.cpp
 		2014-02-12 13:23:50 +01:00
Code Merge remote-tracking branch 'origin/GameLogic' into Camera-test-merge 2014-02-12 13:23:50 +01:00
.gitignore Master - Modified igore 2014-01-08 13:07:55 +01:00
README.md Initial commit 2013-10-22 14:34:17 -07:00

README.md

Danbias

Repository containing Oyster engine and DanBias