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

210 Commits

Author SHA1 Message Date
Stiffly 76a9081d4b Merge remote-tracking branch 'origin/master' into Sound+Particles 
Conflicts:
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-04 18:22:16 +02:00
Stiffly 6e9eeaf991 Dust particles from tank wheels. 2014-06-04 18:15:47 +02:00
Jace bf5106e5b6 Merge remote-tracking branch 'origin/deffered_rendering' 2014-06-04 17:14:34 +02:00
Jace 5f1feffe0d Main menu finished 2014-06-04 16:59:30 +02:00
Stiffly 2ef5d49f7e Added Destructor. (improved StopSound and PlayBGM events) 2014-06-04 15:21:05 +02:00
Tleety 6cae09c5d8 Walls are now destroyable 2014-06-04 14:48:40 +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
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
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
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
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
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 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 a5105e5859 tank modifications 2014-06-03 19:44:33 +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
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 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 d64be64ba4 Garage working, ready for vehicle swap implementation 2014-06-01 03:07:47 +02:00
Tleety 0e2934647c Added a movable tree or somthing dunno lol tired-. 2014-06-01 03:01:37 +02:00
Stiffly 756107363e Some pretty darn cool explosions 2014-06-01 01:15:53 +02:00
Stiffly 804b0cac60 Now uses now sorts and renders sprites by depth. 
Merge remote-tracking branch 'origin/deffered_rendering' into particles

Conflicts:
	assets
	src/GameWorld.cpp
 2014-05-31 23:40:21 +02:00
Tleety 2d1d4f02f3 Fixed some things in gameworld and added a new skymap. 2014-05-31 23:14:33 +02:00
Stiffly cea2faaaf8 Removed unnecessary info messages 2014-05-31 23:14:13 +02:00
Tleety 1af8d4909a Fixed things with the skybox and placed some items in the world. 2014-05-31 23:14:11 +02:00
Stiffly d407502432 CreateExplosion event published on shell collision now. 2014-05-31 22:15:44 +02:00
Stiffly a31e3faa1f Linear fade added to particles 2014-05-31 22:15:00 +02:00
Tleety 260c1295ec WIP on deffered_rendering: a459a1c Skybox bugfix 2014-05-31 17:12:31 +02:00
Tleety ad075f185e untracked files on deffered_rendering: a459a1c Skybox bugfix 2014-05-31 17:12:31 +02:00
ViktorLjung a142d368a7 Movement/rotation queue fixed and Simon force push 2014-05-31 03:55:23 +02:00
Stiffly 28c3cf5e16 Optimized ParticleSystem. Still can't see particles though D: 2014-05-30 22:19:03 +02:00
Stiffly bf77fba963 Omg dem filter merge skillz 
Merge remote-tracking branch 'origin/deffered_rendering' into particles

Conflicts:
	src/GameWorld.cpp
	src/Systems/ParticleSystem.cpp
	src/Systems/ParticleSystem.h
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-30 19:11:52 +02:00
ViktorLjung c489547294 Merge branch 'havok' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance into havok 
Conflicts:
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-30 19:05:52 +02:00