BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
527 Commits 116 Branches 0 Tags
e64358197190bc148ec0b63cb7d3b7de4063791a
Commit Graph

527 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
antc13 e643581971 Commit in order to pull from Master. 2016-01-19 18:21:27 +01:00
antc13 3826142e94 Now supporting multiple material per mesh. Simon changed glDrawElementsBaseVertex to glDrawElements in DrawFinalPass.cpp Hallelulijah! 2016-01-19 17:40:34 +01:00
antc13 2a3009212a Importing custom mesh without material. 2016-01-18 19:37:55 +01:00
antc13 16c39df439 Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer 
# Conflicts:
#	include/Engine/Collision/Collision.h
#	src/Engine/Rendering/Model.cpp
#	src/Engine/Rendering/RawModelAssimp.cpp
 2016-01-15 18:00:30 +01:00
antc13 8437b9c734 Commit for Pull 2016-01-15 17:58:26 +01:00
stiffly d28583ca9e Fixes for #34 (Licenses) 2016-01-15 17:20:11 +01:00
antc13 6317a6092d Merge branch 'MayaExporter' of https://github.com/teamfisk/TacticalZ into Importer 2016-01-15 16:51:10 +01:00
Jace 7b2a21f0b0 Merge pull request #34 from teamfisk/Sound 
Sound
 2016-01-15 16:26:55 +01:00
stiffly 5c45dbdd10 Merge remote-tracking branch 'origin/master' into Sound 
# Conflicts:
#	resources/Schema/Types/Entity.xsd
 2016-01-15 16:25:32 +01:00
Jace ce8dcd3022 Merge pull request #33 from teamfisk/Forward+ 
Forward+
 2016-01-15 16:20:53 +01:00
Jace a2e19013c6 Merge pull request #32 from teamfisk/AsyncResourceLoad 
Async resource load
 2016-01-15 16:20:36 +01:00
William Moberg c09fe4ae55 Added a bool option to disable threads in in the configfile regarding resource loading. 2016-01-15 16:18:39 +01:00
stiffly be33dfbd69 Forgot to change the velocity for the emitters as well... 2016-01-15 16:10:02 +01:00
stiffly 63704b2e6b Now calculating the velocity for the listener correctly. 2016-01-15 15:43:20 +01:00
Tleety 3de853ac8b Frustum culling now works correctly for all resolutions 2016-01-15 15:38:14 +01:00
William Moberg f5ea4d513c ResourceManager::Load never returns null, throws exceptions instead. 2016-01-15 15:25:01 +01:00
stiffly d9dd7f535f When changing camera listener is updated. Also fixed some crashes in RenderSystem when there were no cameras available. 2016-01-15 13:45:08 +01:00
William Moberg 76f90ab031 The main thread is not mutex blocked while child threads load anymore. 2016-01-15 11:29:46 +01:00
stiffly 3e2cb33bc0 Played around with new map MapVersion1. Was fun ヽ(´▽`)/ 2016-01-15 11:23:29 +01:00
Tleety 14bc850fab Merge remote-tracking branch 'origin/master' into Forward+ 2016-01-15 11:02:27 +01:00
Tleety ecf524eb4e Merge remote-tracking branch 'origin/master' into Forward+ 
# Conflicts:
#	include/Engine/Rendering/PickingPass.h
#	include/Engine/Rendering/Renderer.h
#	resources/Schema/Entities/Test.xml
#	src/Engine/Rendering/DrawScenePass.cpp
#	src/Engine/Rendering/PickingPass.cpp
#	src/Engine/Rendering/RenderQueueFactory.cpp
#	src/Engine/Rendering/Renderer.cpp
 2016-01-15 11:01:58 +01:00
William Moberg 4cf6dcfc14 Merge branch 'master' into AsyncResourceLoad 
# Conflicts:
#	include/Engine/Rendering/RawModel.h
#	src/Engine/Rendering/RenderQueueFactory.cpp
 2016-01-15 10:10:57 +01:00
stiffly 32634f742e Merge remote-tracking branch 'origin/master' into Sound 2016-01-15 09:53:39 +01:00
stiffly e248b37ea8 Merge remote-tracking branch 'origin/master' into Sound 
# Conflicts:
#	src/Game/Game.cpp
 2016-01-15 09:52:52 +01:00
antc13 4e70439653 Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer 2016-01-15 09:48:42 +01:00
Jace 627108c6ee Fixes for #30 
# Conflicts:
#	src/Game/Game.cpp
 2016-01-14 18:15:38 +01:00
Viktor Ljung a8f7d5f6b9 Merge pull request #30 from teamfisk/Rendering 
Rendering Scenes
 2016-01-14 16:43:35 +01:00
William Moberg 71047b08ec Async load works, using exceptions for special resources. 2016-01-14 16:27:45 +01:00
viktorljung c99a8685bb Removed Debug scene 2016-01-14 15:40:13 +01:00
stiffly b80ecc29d8 Added comments and cleaned up in Game.cpp/h 2016-01-14 15:32:53 +01:00
viktorljung 143648860b Added world pointer to PickData 2016-01-14 15:32:41 +01:00
viktorljung 96371a08c8 Changed Picking colors from vec2 to ivec2. Picking now working for multiple scenes (Solution not perfect in the editor, yet) 2016-01-14 15:26:06 +01:00
stiffly c916185a7c Does not crash when removing soundemitter component. 2016-01-14 15:06:26 +01:00
stiffly 7f0ff6c4d7 Added a sound testing level. 2016-01-14 14:20:34 +01:00
stiffly 773a417a90 Merge branch 'master' into Sound 2016-01-14 14:19:48 +01:00
stiffly cca64dca24 Refactoring and commenting. 2016-01-14 13:54:38 +01:00
viktorljung e7f02f14a0 Added Transform.h that holds all the AbsoluteTransformation functions. Camera now working better with scenes. Changed Modeljob Matrix to only hold the model matrix instad of all matrix info 2016-01-14 11:12:02 +01:00
William Moberg 9f185a1e35 Wrecked the last commit. Async loading works now. 2016-01-13 18:51:45 +01:00
William Moberg a143ae7c85 Changed to relative #include paths. 2016-01-13 15:53:55 +01:00
antc13 24486c314d Reworked the Exporter. 2016-01-13 14:03:58 +01:00
William Moberg a58cc33ed0 WIP, multithreaded loading based on exceptions, very slow probably. 2016-01-13 10:58:31 +01:00
William Moberg 704e8825c4 Merge pull request #29 from teamfisk/Networking 
Networking
 2016-01-12 17:48:33 +01:00
Jocke 2284399538 Removed Close method from Client, Server and Network. 
Removed legacy variable m_ThreadIsRunning in Client.h and Server.h.
Removed m_EventBroker->Unsubscribe(m_EInputCommand) in Client destructor.
 2016-01-12 17:47:03 +01:00
viktorljung 0f17f9a888 Merge remote-tracking branch 'origin/master' into Rendering 
# Conflicts:
#	include/Engine/Editor/EditorSystem.h
#	include/Engine/Rendering/EPicking.h
#	include/Engine/Rendering/Renderer.h
#	include/Game/Game.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Test.xml
#	src/Engine/Editor/EditorSystem.cpp
#	src/Engine/Rendering/RawModel.cpp
#	src/Engine/Rendering/RenderQueueFactory.cpp
#	src/Engine/Rendering/Renderer.cpp
#	src/Game/Game.cpp
 2016-01-12 16:13:20 +01:00
antc13 7b62dc19bf Spitting out Meshes & Animation Data to file. 2016-01-12 15:39:29 +01:00
stiffly c9f11f62d2 Does not delete emitters that are paused and has not yet been played. 2016-01-12 15:37:10 +01:00
stiffly 5697e8bc85 Deleting an entity now tells openal to behave accordingly. 2016-01-12 14:51:10 +01:00
stiffly 729ebe6c8b Merge remote-tracking branch 'origin/master' into Sound 
# Conflicts:
#	README.md
#	resources/Schema/Components.xsd
#	resources/Schema/Types/Entity.xsd
 2016-01-12 14:50:10 +01:00
Jocke 56ac592d6d Removed debug code from Game.cpp 2016-01-12 14:16:01 +01:00
stiffly 976033c2f6 Added events: PlayBackgroundMusic, SetBGMGain, SetSFXGain. Added some editor specific code. 2016-01-12 14:03:00 +01:00