NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GL - merge error

This commit is contained in:
Linda Andersson 2013-12-20 11:27:49 +01:00
parent 16715f3f2a d3721fcada
commit 59ba530761
6 changed files with 7946 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Bin/Content/crate.mtl Normal file
View File

@ -0,0 +1,8 @@
newmtl matCrateSG
illum 4
Kd 0.00 0.00 0.00
Ka 0.00 0.00 0.00
Tf 1.00 1.00 1.00
map_Kd tex_crate.png
Ni 1.00
Ks 0.50 0.50 0.50

BIN
Bin/Content/crate.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
Bin/Content/tex_worldDummy.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 MiB

8
Bin/Content/worldDummy.mtl Normal file
View File

@ -0,0 +1,8 @@
newmtl matWorldSG
illum 4
Kd 0.00 0.00 0.00
Ka 0.00 0.00 0.00
Tf 1.00 1.00 1.00
map_Kd tex_worldDummy.jpg
Ni 1.00
Ks 0.50 0.50 0.50

7928
Bin/Content/worldDummy.obj Normal file
View File

File diff suppressed because it is too large Load Diff

4
Code/Game/DanBiasLauncher/Launcher.cpp
View File

@ -17,8 +17,8 @@ int WINAPI WinMain( HINSTANCE hinst, HINSTANCE prevInst, PSTR cmdLine, int cmdSh
// Game client starter code goes here // Game client starter code goes here
DanBias::DanBiasGameDesc gameDesc; DanBias::DanBiasGameDesc gameDesc;
gameDesc.port = 15151; gameDesc.port = 15151;
gameDesc.IP = "193.11.184.196"; //gameDesc.IP = "193.11.184.196";
//gameDesc.IP = "193.11.186.101"; gameDesc.IP = "193.11.184.31";
//gameDesc.IP = "127.0.0.1"; //gameDesc.IP = "127.0.0.1";
gameDesc.hinst = hinst; gameDesc.hinst = hinst;
gameDesc.nCmdShow = cmdShow; gameDesc.nCmdShow = cmdShow;