Commit Graph

25 Commits

Author SHA1 Message Date
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
Stiffly 128ff7ae4b I'm coming at you like a dark horse 2014-05-29 21:40:51 +02:00
Stiffly 2ec484c906 Uses an enumerator to seperate 3D and 2D sound instead of the path name. 2014-05-29 21:25:21 +02:00
Stiffly 03d6594f9a Loads BGM and SFX sounds differently depending on path to sound file. 2014-05-29 19:10:22 +02:00
Stiffly 4012edfd43 Added Stop Sound event. 2014-05-29 18:22:45 +02:00
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
Jace f31b2b7ddb Merge branch 'render_queue'
Conflicts:
	src/GameWorld.cpp
	src/Renderer.cpp
	src/Shaders/Fragment.glsl
	src/Systems/PhysicsSystem.h
	vs11/Returngeance/Returngeance.vcxproj.filters
2014-05-27 09:35:52 +02:00
ViktorLjung c37df5c178 Damage and Spashdamage working, phantomShapes not really working 2014-05-27 07:04:29 +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
Jace 22442708cc One hell of a GUI interface (minus graphical)
"how does this even work lol"
2014-05-26 03:33:11 +02:00
Stiffly e3e0d549f5 Använder Eventbaserade OnComponentCreated funktionen 2014-05-25 04:02:08 +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
Stiffly 462af02a6b Added logic for 3D sound 2014-05-21 17:14:07 +02:00
Stiffly d06702a7e0 Added Listener component 2014-05-19 22:13:52 +02:00
Stiffly 73afc8dad4 added wubs to the game, also FMOD 2014-05-19 00:49:57 +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 57d29d0db7 Started implementation of events for InputSystem and SoundSystem 2014-04-28 19:55:31 +02:00
Jace 062242ab8e Refactored existing systems to register their own components and resource types. 2014-04-13 17:15:46 +02:00
Jace 3470a80f40 Revert "Indentation style changed to Horstmann"
This reverts commit f2259f712d.

Conflicts:

	src/GameWorld.cpp
	src/Systems/PhysicsSystem.cpp
2014-04-12 01:48:15 +02:00
Jace f2259f712d Indentation style changed to Horstmann 2014-04-11 21:53:05 +02:00
Jace 4c081d0e1c Indentation style changed to Allman
Using Artistic Style (http://astyle.sourceforge.net/)
Options:
--style=allman
--indent=tab
--keep-one-line-blocks
--align-pointer=type
--align-reference=name
2014-04-11 20:59:42 +02:00
Jace d7fa9eb70f Sound! 2014-04-10 07:39:44 +02:00