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

372 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ViktorLjung e4a59cec61 Merge remote-tracking branch 'origin/master' into havok 
Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-05 06:01:49 +02:00
Jace 56e6545f0f Direct damage and VulnerableToSplash flag on Health component 2014-06-04 23:54:52 +02:00
Jace 2d716e2998 Merge branch 'master' into havok 
Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-04 22:01:25 +02:00
ViktorLjung 1b20204897 Player/Team specific triggers 2014-06-04 18:12:58 +02:00
Jace bf5106e5b6 Merge remote-tracking branch 'origin/deffered_rendering' 2014-06-04 17:14:34 +02:00
Jace 8b2fc86159 Main menu hidden for your debugging pleasure 2014-06-04 17:06:08 +02:00
Jace 5f1feffe0d Main menu finished 2014-06-04 16:59:30 +02:00
ViktorLjung c06c436cd1 Merge remote-tracking branch 'origin/master' into havok 2014-06-04 15:43:51 +02:00
ViktorLjung 70960c9eba Jeep working 2014-06-04 15:43:20 +02:00
Tleety 6cae09c5d8 Walls are now destroyable 2014-06-04 14:48:40 +02:00
Jace 7b90e54899 Merge branch 'master' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance 2014-06-04 13:40:23 +02:00
Jace d3f8ef2d9c Wallz 2014-06-04 06:20:22 +02:00
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