Jace
81943516a9
Protected inheritance, not even once.
2016-02-11 11:36:39 +01:00
Jace
9d9c6bdf1e
Third person animations and shoot effects base work
2016-02-11 00:08:50 +01:00
Jace
6396925b68
Merge remote-tracking branch 'origin/Animations' into WeaponSystem
2016-02-10 20:47:33 +01:00
224e95f34a
Fixed BoneAttachment component and optimized animation code a bit
2016-02-10 20:45:24 +01:00
Jace
2c0f66d9c7
Merge remote-tracking branch 'origin/master' into WeaponSystem
...
# Conflicts:
# include/Engine/Collision/FillFrustumOctreeSystem.h
# include/Engine/Core/Octree.h
# include/Engine/Rendering/RenderSystem.h
# include/Game/Game.h
# resources/DefaultInput.ini
# resources/Schema/Components.xsd
# resources/Schema/Entities/Player.xml
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/RenderSystem.cpp
# src/Game/Game.cpp
# src/Game/Systems/PlayerMovementSystem.cpp
2016-02-10 17:02:00 +01:00
61275274f7
Commited this
2016-02-10 14:39:45 +01:00
08328a781c
Merge remote-tracking branch 'origin/master' into Animations
...
# Conflicts:
# assets
# include/Engine/Rendering/Model.h
# src/Engine/Collision/Collision.cpp
2016-02-10 14:13:08 +01:00
afebf879a0
Merge fixes
2016-02-10 13:44:47 +01:00
49e6252ee1
Merge remote-tracking branch 'origin/master' into Animations
...
# Conflicts:
# include/Engine/Rendering/DrawFinalPass.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/CollisionTestLevel.xml
# resources/Schema/Types/Entity.xsd
# src/Engine/Collision/Collision.cpp
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/RenderSystem.cpp
2016-02-10 11:33:45 +01:00
0bbb627790
Merge branch 'master' into FrustumCulling
2016-02-10 11:04:31 +01:00
c09c2f4783
Merge remote-tracking branch 'origin/Importer' into Animations
...
# Conflicts:
# resources/Schema/Components.xsd
# resources/Schema/Entities/RenderingWorld.xml
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/PickingPass.cpp
# src/Engine/Rendering/Skeleton.cpp
2016-02-09 22:50:19 +01:00
239a8e7a6a
Frustum culling should be working.
2016-02-09 17:12:23 +01:00
b30891aecd
WIP, debugging code added, still not working.
2016-02-09 15:00:30 +01:00
b748deb1e1
WIP FrustumCulling, most code added but not working now.
2016-02-09 10:05:49 +01:00
Jace
2b4e00e4b0
Refactored System constructor to take a struct instead of a bunch of parameters to reduce future pain and to be able to extend it with IsClient and IsServer flags.
2016-02-08 13:33:55 +01:00
92ab22e779
Splatmapping now working.
...
Rendering pipleline now support 3 different types of Material:
Basic: a material with a single color on every property (diffuse, specular, ect).
SingleTextures: a material with a single texture in all or any property. Have a single color on the rest.
SplatMapping: has a SplatMap and 0 to 5 different textures to every property. Properties with o texture uses a single color insted.
All materials with a texture has a UVRepeat, telling how many time to till in U and in V.
modelJobs now uses ShadeID, ModelID and TextureID for the Hash insted of only Texture
MayaExported exports 3 differnt types of material, the same as the piplen now supports.
2016-02-07 13:39:13 +01:00
Jace
bd2da7bc9f
Revert "Revert "Merge pull request #75 from teamfisk/NormalSpecularMapping""
...
This reverts commit b56824786c
2016-02-03 16:30:00 +01:00
Jace
b56824786c
Revert "Merge pull request #75 from teamfisk/NormalSpecularMapping"
...
This reverts commit 192de8078224aac6a00d
2016-02-03 16:16:06 +01:00
5665c0f298
Models with Shield and shielded component now added to queues
2016-02-03 14:20:47 +01:00
7ffbd8455f
Added Queues for the models with shield and shielded components.
2016-02-03 13:53:57 +01:00
b131f56f5e
Made a quality assurance world that will need to be used before creating a pull request
2016-02-02 16:06:42 +01:00
89bc063ef0
Merge remote-tracking branch 'origin/Importer' into Animations
...
# Conflicts:
# src/Engine/Rendering/DrawFinalPass.cpp
2016-02-02 15:01:34 +01:00
dba2fbdc0c
WIP
2016-02-02 14:52:31 +01:00
7054822be2
SceneLight component now working
2016-02-01 11:12:03 +01:00
8bcafc1151
WIP
2016-01-27 18:07:05 +01:00
a63ecb8133
Some wierd shader faults and merge error fixe
2016-01-27 15:54:36 +01:00
0e70dc6fa3
Merge remote-tracking branch 'origin/master' into NormalSpecularMapping
...
# Conflicts:
# include/Engine/Rendering/RenderSystem.h
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/RenderSystem.cpp
2016-01-27 15:41:31 +01:00
Jace
dec2234019
Merge branch 'Cleanup'
...
# Conflicts:
# src/Engine/Rendering/RenderSystem.cpp
2016-01-27 13:44:15 +01:00
8102f3a2ea
Working transparency in most common cases.
...
Transparency check is automatically set if the alpha color value is under 1
2016-01-27 12:59:44 +01:00
cbb17d22d4
WIP
2016-01-27 12:10:00 +01:00
Jace
8bed5194d8
"Proper" handling of conditional rendering of entities parented to camera or entities that should be hidden from the active local player perspective
2016-01-27 11:36:24 +01:00
Jace
7e12d00874
Merge branch 'master' into CoolDeathAnimation
...
# Conflicts:
# include/Engine/Rendering/ModelJob.h
# resources/Shaders/ForwardPlus.frag.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/RenderSystem.cpp
2016-01-27 10:43:23 +01:00
Jace
505a6c7396
Hiding first person models properly
2016-01-25 14:32:48 +01:00
Jace
4245264029
Weapon RayZ
...
Weapon RayZ
2016-01-25 11:26:33 +01:00
44baa47bba
Merge remote-tracking branch 'origin/master' into CoolDeathAnimation
...
# Conflicts:
# include/Engine/Common.h
# include/Engine/Rendering/DrawFinalPass.h
# include/Engine/Rendering/DrawScenePass.h
# include/Engine/Rendering/RenderQueue.h
# include/Engine/Rendering/Renderer.h
# resources/Shaders/ForwardPlus.frag.glsl
# resources/Shaders/ForwardPlus.vert.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/DrawScenePass.cpp
# src/Engine/Rendering/RenderSystem.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
2016-01-25 01:21:15 +01:00
7e92d6f53f
Healthbar on player
2016-01-24 22:21:10 +01:00
ada1bac2a7
Merge remote-tracking branch 'origin/master' into Menu
...
# Conflicts:
# include/Engine/Rendering/RenderSystem.h
# resources/Schema/Entities/RenderingWorld.xml
# resources/Shaders/ForwardPlus.frag.glsl
# src/Engine/Rendering/RenderSystem.cpp
2016-01-24 20:48:17 +01:00
aa115befa9
UnitRaptor is now displayed while models are being loaded in.
2016-01-24 17:04:12 +01:00
aa20b48188
Merge remote-tracking branch 'origin/master' into Importer
...
# Conflicts:
# resources/Schema/Entities/MovementTest.xml
# resources/Schema/Entities/Player.xml
2016-01-24 16:22:22 +01:00
666f1fd878
Removed temp variables & the "forced" animation in DrawFinalPass
2016-01-24 15:30:20 +01:00
4c5d17b203
Merge remote-tracking branch 'origin/master' into Importer
...
# Conflicts:
# resources/Schema/Entities/RenderingWorld.xml
# resources/Shaders/ForwardPlus.frag.glsl
# src/Engine/Editor/EditorSystem.cpp
# src/Engine/Network/Server.cpp
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Tests/OctTreeTestGameClass.cpp
# src/Tests/OctTreeTestHardCodedTestWorld.h
# src/Tests/ResourceManagerTest.cpp
2016-01-24 14:40:52 +01:00
3baa988ad4
Changed .obj files to our own format. DummyScene.mesh may be broken.
2016-01-23 20:35:58 +01:00
f1835fd89c
Animations PROBABLY works fine if all joints got keyframes.
2016-01-23 18:02:42 +01:00
680a12d88f
HealthMeter
2016-01-23 14:53:17 +01:00
9a23d8887a
Merge remote-tracking branch 'origin/master' into TextRendering
...
# Conflicts:
# include/Engine/Rendering/RenderSystem.h
# src/Engine/Rendering/RenderSystem.cpp
2016-01-23 11:48:10 +01:00
Jace
db0e67b9bd
Added EntityWrapper::IsChildOf and made snapshot interpolation and rendering exceptions for player less hacky
2016-01-23 11:44:16 +01:00
Jace
31e7340daf
Ignoring interpolation and rendering for local player entities!
2016-01-23 00:40:37 +01:00
Jace
90867b094a
Merge remote-tracking branch 'origin/TextRendering' into Networking
...
# Conflicts:
# include/Engine/Rendering/RenderSystem.h
# src/Engine/Rendering/RenderSystem.cpp
2016-01-22 22:08:56 +01:00
46dff1a59c
Merge remote-tracking branch 'origin/master' into Menu
...
# Conflicts:
# include/Engine/Rendering/RenderSystem.h
# src/Engine/Rendering/RenderSystem.cpp
2016-01-22 17:02:56 +01:00
Jace
ca2aab449e
Basic movement and camera management between players and editor
2016-01-22 16:12:51 +01:00
Jace
viktorljung
William Moberg
Teejoon
Tleety
stiffly
antc13