 Tleety
|
a124ab2400
|
Some asset shit.
Fixed testworld to use the right model.
|
2016-01-19 16:11:56 +01:00 |
|
|
Tleety
|
a8ffb24040
|
latest commit fix
|
2016-01-19 16:08:09 +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 |
|
|
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
|
6680f6863f
|
DirectionalLight component added.
|
2016-01-18 14:30:22 +01:00 |
|
 Jace
|
f281d220de
|
Working Spawner, SpawnPoint, PlayerSpawn and Team components, along with their systems.
|
2016-01-17 01:00:48 +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
|
f65ac65e30
|
Updated component defaults files to match component schema and made schema validation strict.
|
2016-01-16 17:03:57 +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
|
bbabc84127
|
Fixed default values for CPlayerSpawn
|
2016-01-15 20:26:30 +01:00 |
|
|
Jace
|
db1b972cd1
|
Spawner, SpawnPoint and PlayerSpawn components, and base work on their systems
|
2016-01-15 18:32:47 +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 |
|
|
Tleety
|
3de853ac8b
|
Frustum culling now works correctly for all resolutions
|
2016-01-15 15:38:14 +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 |
|
|
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
|
e248b37ea8
|
Merge remote-tracking branch 'origin/master' into Sound
# Conflicts:
# src/Game/Game.cpp
|
2016-01-15 09:52:52 +01:00 |
|
|
Jace
|
5e721325a4
|
Merge fixes
|
2016-01-14 18:20:51 +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 |
|
|
Jace
|
6ad1839def
|
Initial work on PlayerMovementSystem
|
2016-01-14 17:03:48 +01:00 |
|
|
Jace
|
71d936f8d1
|
Start of a movement system with collisions against AABBs
|
2016-01-14 14:54:12 +01:00 |
|
|
stiffly
|
7f0ff6c4d7
|
Added a sound testing level.
|
2016-01-14 14:20:34 +01:00 |
|
|
Jace
|
d6ef527f25
|
Basic collisions using Octree. Seems buggy over octree boundaries.
|
2016-01-13 15:34:43 +01:00 |
|
|
William Moberg
|
a58cc33ed0
|
WIP, multithreaded loading based on exceptions, very slow probably.
|
2016-01-13 10:58:31 +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 |
|
|
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 |
|
|
stiffly
|
976033c2f6
|
Added events: PlayBackgroundMusic, SetBGMGain, SetSFXGain. Added some editor specific code.
|
2016-01-12 14:03:00 +01:00 |
|
|
viktorljung
|
d469fe6e9a
|
Removed picking event and added a pick function to renderer
|
2016-01-12 11:45:50 +01:00 |
|
|
Tleety
|
24ba3ae1f6
|
WIP, falloff things.
# Conflicts:
# resources/Schema/Components/PointLight.xsd
# resources/Shaders/ForwardPlus.frag.glsl
|
2016-01-11 17:57:15 +01:00 |
|
|
Tleety
|
0cf8d26557
|
Revert "Revert "Forward+""
This reverts commit b908a9f9c6.
|
2016-01-11 17:56:58 +01:00 |
|
|
stiffly
|
f80ad1377b
|
Making use of Doppler effect. Added a bunch of events: Pause, stop, continue, variations of play.
|
2016-01-11 17:52:27 +01:00 |
|
|
Jace
|
2a5e0420c8
|
Added template entity "Empty.xml" for use as root entity when creating a new map.
|
2016-01-11 16:40:26 +01:00 |
|
|
Jace
|
0bcbcda8b8
|
EntityFilePreprocessor
WIP
WIP
EntityFilePreprocessor
|
2016-01-11 14:35:15 +01:00 |
|
|
Jace
|
b908a9f9c6
|
Revert "Forward+"
|
2016-01-11 13:48:55 +01:00 |
|
|
viktorljung
|
a7b43b06a2
|
Camera component and RenderQueue changes
|
2016-01-08 16:21:59 +01:00 |
|
|
Tleety
|
6e6460a000
|
Commented out the bugged models
|
2016-01-08 16:15:18 +01:00 |
|
|
stiffly
|
3cce9f8075
|
Using absolute transform
|
2016-01-08 15:29:20 +01:00 |
|
|
Tleety
|
2bd60be741
|
Merge remote-tracking branch 'origin/master' into Forward+
# Conflicts:
# resources/Schema/Types/Entity.xsd
|
2016-01-08 14:14:43 +01:00 |
|
|
Tleety
|
25a99a04c5
|
Added Visable bool and a better description to Pointlight component.
|
2016-01-08 14:11:35 +01:00 |
|
|
stiffly
|
d8c4c6e5ff
|
Created a primitive SoundSystem. Can play a sound with 'P' button. Using resourcemanager. Not using the created components yet.
|
2016-01-07 15:22:46 +01:00 |
|
 verysecrethero
|
638c236ceb
|
HealthSystem tested and working. Also the 3 new PlayerEvents seems to work. TODO: a proper test in the testclass
|
2016-01-07 14:53:31 +01:00 |
|
|
Tleety
|
e7bb8954bf
|
Merge remote-tracking branch 'origin/master' into Forward+
# Conflicts:
# include/Engine/Rendering/Renderer.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/Test.xml
# src/Engine/Rendering/Renderer.cpp
|
2016-01-06 11:35:55 +01:00 |
|
|
Tleety
|
eb69e03e82
|
Merge branch 'Forward+' of github.com:teamfisk/TacticalZ into Forward+
|
2015-12-18 15:28:25 +01:00 |
|
|
Tleety
|
d38f58165f
|
Merge remote-tracking branch 'origin/master' into Forward+
# Conflicts:
# include/Engine/Rendering/Renderer.h
# src/Engine/Rendering/RenderState.cpp
# src/Engine/Rendering/Renderer.cpp
|
2015-12-18 15:27:47 +01:00 |
|
|
stiffly
|
330f08b926
|
Merge remote-tracking branch 'origin/master' into Networking
# Conflicts:
# include/Game/PlayerSystem.h
# src/Game/Game.cpp
# src/Game/PlayerSystem.cpp
|
2015-12-18 14:18:53 +01:00 |
|