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

388 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Stiffly 349fab54a4 Merge remote-tracking branch 'origin/master' into particles 
Conflicts:
	src/GUI/GameFrame.h
	src/GUI/TextureFrame.h
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-02 17:37:25 +02:00
ViktorLjung 0144640a9b Merge remote-tracking branch 'origin/master' into havok 
Conflicts:
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-02 17:26:10 +02:00
Jace 94fc516a69 Cleanup 2014-06-02 17:01:07 +02:00
Jace 27bfbd2025 Fixed free cam viewport toggle bug 2014-06-02 17:00:45 +02:00
Stiffly 4ac67a22ac Removed temporary debug code 2014-06-02 16:25:00 +02:00
Jace 61fab09ceb UI scaling properly 2014-06-02 16:10:52 +02:00
ViktorLjung d64be64ba4 Garage working, ready for vehicle swap implementation 2014-06-01 03:07:47 +02:00
Jace 72420d4248 WIP Fullscreen Stuff (UI not scaling properly yet) 2014-06-01 03:05:42 +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 6e78307249 Merge remote-tracking branch 'origin/master' into deffered_rendering 
Conflicts:
	src/GUI/GameFrame.h
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-31 17:16:29 +02:00
Tleety 260c1295ec WIP on deffered_rendering: a459a1c Skybox bugfix 2014-05-31 17:12:31 +02:00
Tleety 1b252c95e0 index 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
Jace a6906886f5 Vehicle selection! 2014-05-31 03:45:37 +02:00