BTH/fishtanks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
410 Commits 15 Branches 0 Tags
13a0d1521cb6389b8dd9c1879cd067c831b5c811
Commit Graph

410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stiffly f9426745f7 Merge remote-tracking branch 'origin/master' into Sound+Particles 
Conflicts:
	assets
 2014-06-04 06:17:05 +02:00
Stiffly 5e78fdc930 Not deleting in a "foreach"-loop 2014-06-04 06:09:59 +02:00
Tleety 5a6ae2a24e Merge remote-tracking branch 'origin/master' into deffered_rendering 
Conflicts:
	assets
	src/GameWorld.cpp
 2014-06-04 06:02:21 +02:00
Tleety d5dcb0b72c Fixed normals nor averaging when at a corner. 2014-06-04 05:56:38 +02:00
ViktorLjung 94178098ea Merge remote-tracking branch 'origin/master' into havok 
Conflicts:
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-04 05:48:48 +02:00
Jace 62dd85349f A gate and better bridges. 2014-06-04 05:47:29 +02:00
ViktorLjung f9f20535ba Jeep and tank tuning 2014-06-04 05:47:17 +02:00
Tleety 74b86bc6d4 Lights working without much visable bugs. 2014-06-04 05:44:12 +02:00
Stiffly 27b735325a Improved splashes 2014-06-04 05:31:05 +02:00
Stiffly e39e1eda89 Merge remote-tracking branch 'origin/master' into Sound+Particles 
Conflicts:
	src/GameWorld.cpp
 2014-06-04 05:30:42 +02:00
Jace 3c17ab6037 Bridges 2014-06-04 05:12:06 +02:00
Stiffly 7f017bfaed Tanks now have listeners. 2014-06-04 04:40:16 +02:00
Jace 9813e9a058 Merge remote-tracking branch 'origin/Sound+Particles' 
Conflicts:
	src/GameWorld.cpp
 2014-06-04 04:24:10 +02:00
Tleety cf2040f038 Inget funkar, broken commit, dont use. 2014-06-04 04:20:15 +02:00
Jace e11f656b3d Fixed physics relative orientations! 2014-06-04 04:18:44 +02:00
Stiffly 72a8ee9080 Water splash 2014-06-04 03:26:29 +02:00
Jace 7d9f1a7ac7 Merge remote-tracking branch 'origin/havok' 2014-06-04 02:36:59 +02:00
Stiffly 90a92d05e4 Merge remote-tracking branch 'origin/master' into Sound+Particles 
Conflicts:
	src/GameWorld.cpp
 2014-06-04 01:27:15 +02:00
Stiffly 9f1d5206bd Muzzle Flash 2014-06-04 01:23:15 +02:00
Jace 397188b855 Fixed frame scissor test 2014-06-04 00:46:03 +02:00
ViktorLjung ac855f554b Fixed local physics orientation 2014-06-04 00:45:43 +02:00
Stiffly 909ee94e26 Billboarding working again 2014-06-03 23:48:13 +02:00
Stiffly df32a3b07d PlaySFX now uses Position instead of Emitter ID for playing a sound. 2014-06-03 21:02:39 +02:00
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
Jace 0addc672b4 Multiple vehicle selection 2014-06-03 20:36:35 +02:00
Jace 80846a29ad Terrain creation stuff 2014-06-03 20:36:23 +02:00
Stiffly 87b02711f4 Doppler scale ruined everything 2014-06-03 20:05:31 +02:00
Stiffly 96a608db27 Merge branch 'FMOD' into Sound+Particles 2014-06-03 19:47:01 +02:00
Stiffly 5265fb9734 assets commit 2014-06-03 19:46:48 +02:00
Stiffly a5105e5859 tank modifications 2014-06-03 19:44:33 +02:00
Jace e15474c3d4 Fixed filters 2014-06-03 19:09:10 +02:00
ViktorLjung 486922a7c5 Tank tuning 2014-06-03 18:59:41 +02:00
Jace a00c145616 Safety check for spawns 2014-06-03 18:47:08 +02:00
Jace aeb29cde8b Merge branch 'deffered_rendering' 
Conflicts:
	assets
	src/Components/Physics.h
	src/GameWorld.cpp
	src/GameWorld.h
	src/Systems/PhysicsSystem.cpp
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-03 18:46:49 +02:00
Jace 7f328332c4 Merge branch 'master' into particles 
Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-03 17:19:53 +02:00
Jace 0ad3d8ed76 Fixed vehicle selection hiding on selection 2014-06-03 03:55:35 +02:00
Jace 4596fffb91 Vehicle spawning 2014-06-03 03:55:34 +02:00
Jace 46f377c94c Interface input revised 2014-06-03 03:55:34 +02:00
Jace 68abdbb4e0 SpawnVehicle event 2014-06-03 03:55:34 +02:00
Jace c55b9333a9 MKLINK made a corrupt FMOD DLL for some reason. Switching to COPY. 2014-06-03 03:53:47 +02:00
Jace 826f390d28 Merge remote-tracking branch 'origin/FMOD' 2014-06-02 23:03:47 +02:00
Stiffly f5b50ba66e Missing FMOD libs 2014-06-02 23:00:37 +02:00
Stiffly e7eca74b03 Merge branch 'particles' into Sound+Particles 
Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-02 22:59:58 +02:00
Jace 78cf4a0223 Multiple binds per input 2014-06-02 22:38:11 +02:00
Tleety f5f6a5cf3a Fixed transparency 2014-06-02 22:15:52 +02:00
Tleety 179c5c1feb Merge remote-tracking branch 'origin/particles' into deffered_rendering 
Conflicts:
	assets
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-02 20:20:36 +02:00
Stiffly 98399c3995 Merge branch 'FMOD' 
Conflicts:
	src/GameWorld.cpp
	src/Renderer.cpp
	src/Systems/PhysicsSystem.cpp
	src/Systems/PhysicsSystem.h
	src/Systems/SoundSystem.cpp
	src/Systems/SoundSystem.h
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-02 20:16:08 +02:00
Tleety f1a9afc097 Fixed a createWall function. 2014-06-02 20:01:28 +02:00
Tleety 00268f027a Walls are now destroyable! 2014-06-02 18:21:39 +02:00
ViktorLjung 2f2154ffe1 Kind of retarded tank 2014-06-02 17:50:46 +02:00