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

41 Commits

Author SHA1 Message Date
Linda Andersson 59ba530761 GL - merge error 2013-12-20 11:27:49 +01:00
Linda Andersson 16715f3f2a GL - push before merge 2013-12-20 11:27:04 +01:00
Erik Persson d3721fcada last updates 
random stuff
 2013-12-20 11:10:36 +01:00
Dennis Andersen 694d5576d7 GameLogic - Pre-merge with physics 2013-12-19 15:35:49 +01:00
Linda Andersson e16c939285 GL - using window manager, fixed consistent linking in danBiasGame 2013-12-18 10:47:30 +01:00
dean11 8667e14afb Merged with Linda after merge conflicts 2013-12-17 10:28:44 +01:00
dean11 4650615a61 Gamelogic - Pre merge with Linda 2013-12-17 10:25:34 +01:00
dean11 abc94e9acb Nothing important done 2013-12-17 00:51:42 +01:00
Linda Andersson 3ee25f0112 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2013-12-16 11:08:22 +01:00
Linda Andersson dc3221ee11 GL - set pos function for C_models 2013-12-16 11:08:10 +01:00
Sam Mario Svensson 1c8f9c7801 Fixed link errors with dll files 2013-12-16 11:04:21 +01:00
Erik Persson 77bc6050fc Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2013-12-16 10:04:27 +01:00
Erik Persson f5b806a512 launcher include 2013-12-16 10:03:30 +01:00
dean11 b351a7bac4 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2013-12-16 10:02:41 +01:00
Linda Andersson fa1473455f GL - added C_obj files, client obj in game state to send input 2013-12-16 09:45:12 +01:00
Pontus Fransson 6f979b1044 Network - Merge with gamelogic 2013-12-16 09:15:13 +01:00
Pontus Fransson 3a752f6b95 Network - Merge with gamelogic 2013-12-16 09:09:48 +01:00
dean11 f29f50f830 Merged with Gamelogic branch and fixed errors and added features 2013-12-14 22:04:42 +01:00
dean11 8b1c2b91e8 Fixed some craches and stuff 2013-12-13 23:47:16 +01:00
Linda Andersson 7c1d19946d GL - Connection to network in clinet 2013-12-13 12:02:49 +01:00
dean11 a3e4262c08 Merge with Other part of gamelogic(DanbiasGame) 2013-12-12 14:44:06 +01:00
Erik Persson c801ab829a Merge remote-tracking branch 'origin/Physics' into GameLogic 
Conflicts:
	Bin/Content/Shaders/TextureDebug.cso
 2013-12-12 10:10:52 +01:00
Robin Engman c740bd5935 Added some data to PhysicsAPI 
GetRigidLinearVelocity() and void* as reference to game object.
 2013-12-12 10:02:35 +01:00
Erik Persson 2424b51c3e Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 
Conflicts:
	Bin/Content/Shaders/DebugVertex.cso
 2013-12-12 09:39:27 +01:00
Erik Persson e11d7d94f7 updated the weapon system, collisionManager and redid the "object" heirarki 2013-12-12 09:36:14 +01:00
dean11 fd3776a53b GameLogic - Pre-network merge 2013-12-12 09:33:59 +01:00
Linda Andersson 38a1602d3f GL - merge with graphics api. Lobby and game state. 2013-12-09 09:23:39 +01:00
dean11 64a8089e54 GameLogic - Worked on server 2013-12-04 11:37:26 +01:00
lanariel ce294cd1d7 Forgot to add a folder 2013-12-04 09:43:43 +01:00
dean11 a852e8eab4 Created the game modules 2013-12-03 12:07:37 +01:00
lanariel 469ccaab6c Merge branch 'Sprint1' of https://github.com/dean11/Danbias into Graphics 
Conflicts:
	Bin/DLL/DebugCameraVertex.cso
	Bin/DLL/DebugPixel.cso
	Bin/DLL/GamePhysics_x86D.dll
	Bin/DLL/GamePhysics_x86D.exp
	Bin/DLL/GamePhysics_x86D.ilk
	Bin/DLL/GamePhysics_x86D.pdb
	Bin/DLL/OysterGraphics_x86D.dll
	Bin/DLL/OysterGraphics_x86D.exp
	Bin/DLL/OysterGraphics_x86D.ilk
	Bin/DLL/OysterGraphics_x86D.pdb
	Bin/DLL/TextureDebug.cso
	Bin/DLL/VertexGatherData.cso
	Code/OysterGraphics/FileLoader/ObjReader.cpp
	Code/OysterGraphics/FileLoader/TextureLoader.cpp
	Code/OysterGraphics/FileLoader/TextureLoader.h
	Code/OysterGraphics/OysterGraphics.vcxproj
	Code/OysterGraphics/OysterGraphics.vcxproj.filters
	Code/OysterGraphics/Render/Resources/Resources.cpp
	Code/OysterGraphics/Shader/HLSL/SimpleDebug/Debug.hlsl
	Code/OysterGraphics/Shader/HLSL/SimpleDebug/DebugCameraVertex.hlsl
	Code/OysterGraphics/Shader/HLSL/SimpleDebug/DebugPixel.hlsl
	Code/OysterGraphics/Shader/HLSL/SimpleDebug/TextureDebug.hlsl
	Code/Tester/MainTest.cpp
 2013-11-29 10:31:19 +01:00
lanariel ca20a5af9e Stable Resource Management with 4 unidentified Memory Leaks 2013-11-29 10:25:27 +01:00
Linda Andersson 5ab1c39e3a GL stable - running from DanBiasGame 2013-11-28 11:46:20 +01:00
Linda Andersson 92c20b368b merge with GL 2013-11-28 11:31:00 +01:00
Erik Persson acd8681489 asd 2013-11-28 08:33:29 +01:00
lanariel 8f6ca79e6b Unstable RenderTexture 2013-11-27 15:26:29 +01:00
Erik Persson 61777e23df Merge remote-tracking branch 'origin/Graphics' into GameLogicBranch 
Conflicts:
	Bin/DLL/GamePhysics_x86D.dll
	Bin/DLL/GamePhysics_x86D.exp
	Bin/DLL/GamePhysics_x86D.ilk
	Bin/DLL/GamePhysics_x86D.pdb
	Code/OysterGraphics/OysterGraphics.vcxproj
	Code/OysterGraphics/OysterGraphics.vcxproj.filters
	Code/OysterGraphics/OysterGraphics.vcxproj.filters.orig
 2013-11-27 09:12:21 +01:00
lanariel f9d9479dad Stable Dll read, unstable Pos 2013-11-26 15:33:05 +01:00
Erik Persson 5cc6ff81b5 Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch 
Conflicts:
	Code/GameLogic/Player.cpp
 2013-11-26 09:26:04 +01:00
Linda Andersson f78027a1cf dll - working 
fix in unique pointer and array - missing copy constructor
 2013-11-26 09:16:51 +01:00
dean11 33e7afabcd Restructured folders to give a flexible solution for dependencies and added to ignore list 2013-11-18 15:41:09 +01:00