Stiffly 2833b8df36 Merge branch 'master' into Sound+Particles ...

Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters

2014-06-03 20:39:44 +02:00

assets @ c61526f5fc

assets commit

2014-06-03 19:46:48 +02:00

libs

Missing FMOD libs

2014-06-02 23:00:37 +02:00

src

Merge branch 'master' into Sound+Particles

2014-06-03 20:39:44 +02:00

vs11

Merge branch 'master' into Sound+Particles

2014-06-03 20:39:44 +02:00

.gitattributes

Changed toolset to vs11, for future Havok implementation.

2014-04-12 01:59:55 +02:00

.gitignore

Assets now as Git submodule!

2014-05-10 19:21:46 +02:00

.gitmodules

Assets now as Git submodule!

2014-05-10 19:21:46 +02:00

deploy.bat

MKLINK made a corrupt FMOD DLL for some reason. Switching to COPY.

2014-06-03 03:53:47 +02:00

S

Description

No description provided

32 MiB

Languages

C 61.7%

C++ 32.7%

HTML 2.9%

Objective-C 1.6%

CMake 0.4%

Other 0.6%