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

218 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stiffly 1b2f930afa Separated PlaySound into PlaySFX and PlayBGM. 2014-05-28 22:06:26 +02:00
Stiffly 1a043ab411 Using ResourceManager for cached laoding of sounds. 2014-05-28 19:56:28 +02:00
Stiffly 599e0c9bf0 Removed temporary event publishing code for PlaySound. 2014-05-27 08:53:12 +02:00
Stiffly 6cb802c845 Removed OpenAL. Added FMOD dll to batch file. 2014-05-27 08:48:48 +02:00
Stiffly 7e995fc8b7 Fixed bug. Sound not longer always in origin. 2014-05-27 06:05:47 +02:00
Stiffly 62adbdb2c8 Added more Error checks 2014-05-27 04:41:51 +02:00
Stiffly 3b96be2162 Fixed playsound event. Added remove sounds OnComponentsRemove only when stopped playing. 2014-05-27 00:36:54 +02:00
Stiffly f4cd50b741 Fixed a Playsound event logic. Temporarily 2014-05-26 21:43:08 +02:00
Stiffly e3e0d549f5 Använder Eventbaserade OnComponentCreated funktionen 2014-05-25 04:02:08 +02:00
Stiffly 072e4d4dbb OnComponentCreated nu eventbaserat 2014-05-25 04:01:40 +02:00
Stiffly ad902cb511 Merge remote-tracking branch 'origin/master' into FMOD 
Conflicts:
	src/GameWorld.cpp
	src/Systems/SoundSystem.h
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-25 01:42:26 +02:00
Stiffly 3a638a356c Some new logic, m_Channels and m_Sounds added. Sound is really low... 2014-05-25 01:34:57 +02:00
Jace 1bf5a8464e Merge branch 'events' 2014-05-23 23:42:00 +02:00
Jace e48df894cf Better events 2014-05-23 23:41:34 +02:00
Jace 4102756e33 Beautifully broken 2014-05-22 22:04:54 +02:00
Stiffly ecbcee0fbf Deleted fmodex.dll file from incorrect path 2014-05-21 17:45:19 +02:00
Stiffly fe6e21a2d1 FMOD library only linked for release configuration 2014-05-21 17:43:55 +02:00
Stiffly 462af02a6b Added logic for 3D sound 2014-05-21 17:14:07 +02:00
ViktorLjung 609687d6b4 MULTIPLAYER 2014-05-20 01:43:59 +02:00
Stiffly d06702a7e0 Added Listener component 2014-05-19 22:13:52 +02:00
ViktorLjung ff58f881ae Merge branch 'havok' into gui 
Conflicts:
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-19 22:06:04 +02:00
ViktorLjung ec74d700be fix 2014-05-19 21:57:13 +02:00
Jace 40718407ac Merge remote-tracking branch 'origin/master' into gui 
Conflicts:
	src/GameWorld.cpp
	src/InputManager.cpp
	src/Systems/RenderSystem.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-19 21:51:25 +02:00
ViktorLjung 7f77db97a0 Convert functions working in debug 2014-05-19 19:59:17 +02:00
Jace bd7ba73bca Split screen working 2014-05-19 17:20:43 +02:00
Jace e07a0a2b1a More viewport stuff 2014-05-19 04:29:30 +02:00
Jace 3023391358 Merge remote-tracking branch 'origin/deffered_rendering' into gui 
Conflicts:
	assets
	src/GameWorld.cpp
 2014-05-19 03:15:40 +02:00
Tleety 7455f4b865 NormalMaps Working and started work on specular maps. 2014-05-19 01:01:46 +02:00
ViktorLjung 998ee3cfab Brakes working 2014-05-19 00:58:48 +02:00
Jace 539196cd45 Viewport stuff 2014-05-19 00:55:58 +02:00
Stiffly 73afc8dad4 added wubs to the game, also FMOD 2014-05-19 00:49:57 +02:00
ViktorLjung f14a83caa8 Assets 2014-05-18 23:59:18 +02:00
ViktorLjung 02243becee Recoil while firing, clamp inputs, merge Helicopter 2014-05-18 23:54:01 +02:00
ViktorLjung 85e5d7461c Merge remote-tracking branch 'origin/vehicle-helicopter' into havok 
Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj
 2014-05-18 21:09:08 +02:00
ViktorLjung fd0bb18bd3 tank stuff 2014-05-18 21:07:03 +02:00
Jace a36d6c554a Merge branch 'master' into havok 
Conflicts:
	assets
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-17 21:23:46 +02:00
ViktorLjung a8ecacab11 tank steering 2014-05-17 18:45:54 +02:00
Tleety 2520fba1b4 Merge remote-tracking branch 'origin/master' into deffered_rendering 
Conflicts:
	assets
 2014-05-17 18:10:48 +02:00
ViktorLjung 4d15d3e02c Collision callbacks 2014-05-17 18:06:56 +02:00
Tleety 67778f391a Working on shadows 2014-05-17 18:02:10 +02:00
Jace 542ad075ea ECS improved to make it less annoying to use 
AddComponent<Components::Transform>(entity, "Transform")
is now
AddComponent<Components::Transform>(entity)
etc.
 2014-05-17 17:46:17 +02:00
Jace 16d51c64c5 Meh-ish helicopter physics 2014-05-17 03:49:53 +02:00
Jace add27aa8f4 Back to working order 2014-05-17 01:21:40 +02:00
Jace d98badc59a Latest assets 2014-05-17 00:57:24 +02:00
Jace f180abcd63 Input System improved to allow for multiple inputs for same bind 
Did not work properly between keyboard and controller before.
 2014-05-17 00:53:51 +02:00
Jace 2a28f65c37 FreeSteeringSystem updated to allow for controller input 2014-05-17 00:50:45 +02:00
Jace 33b14b1859 Mouse locking event 2014-05-17 00:49:23 +02:00
Jace 44e376e815 Pls go away 2014-05-16 02:13:28 +02:00
Jace 9723d80742 And then Microsoft happened... 2014-05-15 21:50:49 +02:00
Jace 6684aa06b7 Merge branch 'master' into gui 
Conflicts:
	src/GUI/Frame.h
	src/InputManager.cpp
 2014-05-15 21:16:43 +02:00