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

349 Commits

Author SHA1 Message Date
antc13 8286d052b3 Changed color values from floats to glm::vec4 2016-01-24 14:38:17 +01:00
antc13 b5b1140f5c Custom Animations should now work. We also save color values if there's no texture. 2016-01-24 13:28:40 +01:00
antc13 3baa988ad4 Changed .obj files to our own format. DummyScene.mesh may be broken. 2016-01-23 20:35:58 +01:00
antc13 f1835fd89c Animations PROBABLY works fine if all joints got keyframes. 2016-01-23 18:02:42 +01:00
antc13 c984f76b2f Importing & Reading Custom animation data. TODO: Shaders. 2016-01-20 18:36:03 +01:00
antc13 a47317bb32 Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer 
# Conflicts:
#	include/Engine/Collision/Collision.h
#	resources/Shaders/ForwardPlus.frag.glsl
#	resources/Shaders/ForwardPlus.vert.glsl
 2016-01-19 18:26:45 +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
Tleety a8ffb24040 latest commit fix 2016-01-19 16:08:09 +01:00
Tleety 893ef38237 Removed world from renderer and moved depth-calculation code to modeljob 2016-01-19 15:41:17 +01:00
Tleety 982837052a DirectionalLight now correctly getting directions 2016-01-19 14:44:17 +01:00
Tleety 4cafb2fc4c Merge remote-tracking branch 'origin/master' into Forward+ 2016-01-19 12:33:08 +01:00
Tleety 46e17b7e0d Working directional light 2016-01-19 12:32:34 +01:00
antc13 2a3009212a Importing custom mesh without material. 2016-01-18 19:37:55 +01:00
Tleety 4b29d48f27 WIP 2016-01-18 17:57:45 +01:00
Tleety 601ce85c05 WIP 2016-01-18 16:50:41 +01:00
Tleety 01a164847c Directional light now fully added to all lists. 2016-01-18 15:15:33 +01:00
Tleety 794635b6a1 Added DirectionalLights to renderqueue jobs 2016-01-18 14:58:19 +01:00
Tleety 0a3b6f4da1 Added DirectionalLightJob 2016-01-18 14:57:55 +01:00
Tleety 4092f6b4d4 New Lightstruct working. 2016-01-18 14:20:28 +01:00
William Moberg bf3f8aea89 Merge pull request #36 from teamfisk/PlayerMovement 
Player movement
 2016-01-18 13:32:42 +01:00
William Moberg 0669d91767 CollisionSystem loops over Collidable components. 2016-01-18 13:29:10 +01:00
William Moberg 942064c450 Removed class PlayerSystem and associated files. 2016-01-18 13:07:04 +01:00
William Moberg a346a329b3 Added an option to disable the Pool allocation in Config.ini, in case there is a mess with the MemoryPool. 2016-01-18 10:16:35 +01:00
Jace f281d220de Working Spawner, SpawnPoint, PlayerSpawn and Team components, along with their systems. 2016-01-17 01:00:48 +01:00
Jace 6385a98eca Added runtime type size check to ComponentWrapper to avoid corruption when types don't match 2016-01-17 00:59:26 +01:00
Jace d8a24bbfde Renamed all instances of "Property" to "Field" in ComponentWrapper to maintain consistent naming with ComponentInfo 2016-01-17 00:38:25 +01:00
Jace 9ec32464bc Added enum support to entity file format, see "Team" component for an example. Use ComponentInfo::Enum to convert enum string keys to its corresponding integer representation at runtime. 2016-01-16 23:12:24 +01:00
Jace b2213dbe9a Merge remote-tracking branch 'origin/master' into PlayerMovement 
# Conflicts:
#	include/Engine/Collision/Collision.h
#	include/Engine/Collision/CollisionSystem.h
#	include/Engine/Collision/TriggerSystem.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/CollisionTestLevel.xml
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Collision/Collision.cpp
#	src/Game/Game.cpp
 2016-01-15 20:28:43 +01:00
Jace db1b972cd1 Spawner, SpawnPoint and PlayerSpawn components, and base work on their systems 2016-01-15 18:32:47 +01:00
Jace 97e12ff550 Made EntityFileParser::MergeEntities return the base entity that was created, and also take an optional parent entity to create it under. 2016-01-15 18:31:32 +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
Jace 0469460029 Input binding format changed to allow custom values for bindings. Relevant code must clamp input values to prevent speedhaxx! 2016-01-15 16:32:04 +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
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 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
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
Jace 567173c565 Merge branch 'master' into PlayerMovement 
# Conflicts:
#	src/Engine/Rendering/RenderSystem.cpp
#	src/Game/Game.cpp
 2016-01-14 18:24:34 +01:00
Jace 5e721325a4 Merge fixes 2016-01-14 18:20:51 +01:00
Jace 627108c6ee Fixes for #30 
# Conflicts:
#	src/Game/Game.cpp
 2016-01-14 18:15:38 +01:00
Jace 3a4f378ac5 Merge remote-tracking branch 'origin/master' into PlayerMovement 
# Conflicts:
#	src/Game/Game.cpp
 2016-01-14 17:07:39 +01:00