de7c8e9234
WIP, collision detects too much, no resolving for most cases.
2016-01-21 17:10:36 +01:00
4d60f387ed
Merge pull request #44 from teamfisk/EditorUsefulness
...
Editor refactoring
2016-01-21 17:03:52 +01:00
Jace
1c6750f5b0
Fixed uniform scale on editor widgets
2016-01-21 16:37:35 +01:00
Jace
a6548a72b3
Merge remote-tracking branch 'origin/master' into EditorUsefulness
...
# Conflicts:
# include/Engine/Collision/CollidableOctreeSystem.h
# include/Engine/Collision/CollisionSystem.h
# include/Engine/Collision/TriggerSystem.h
# include/Engine/Rendering/RenderSystem.h
# include/Game/Systems/PlayerSystem.h
# resources/Schema/Components/Physics.xsd
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/RenderSystem.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
# src/Game/Systems/HealthSystem.cpp
# src/Game/Systems/PlayerSystem.cpp
# src/Tests/OctTreeTestGameClass.cpp
2016-01-21 16:16:35 +01:00
Jace
fc06a4babc
Editor keyboard shortcuts:
...
Ctrl+S to save the currently selected entity file (iterates to the base parent)
Ctrl+N to create a new empty entity under the selection
Ctrl+O to import an entity file
Del to delete an entity
2016-01-21 15:58:27 +01:00
382e00cff4
Randomness fixed
...
Redundant continue removed
Redundant cross product removed
2016-01-21 15:34:08 +01:00
afe43c5f44
Shader will now handle Glowmaps. However the load code is not there yet.
2016-01-21 14:53:47 +01:00
Jace
b9147344e1
Semi-working translation widget
2016-01-21 14:14:22 +01:00
70bbc5ed0a
Normals scaling with model scale bug fixed.
2016-01-21 13:52:43 +01:00
Jace
0183e1bdb7
Fixed enum string parsing bug that would ignore parsing additional fields in a component after it encountered the first enum.
2016-01-21 12:24:08 +01:00
983f90504d
Bloom effect added, will have to see if it needs improving. Also added HDR colors and gamma correction.
2016-01-21 12:02:28 +01:00
bdebc9de62
WeaponSystem now handles "PrimaryFire" input events. It sends out ePlayerDamage event if it hits a player. Included some tests
2016-01-21 11:55:51 +01:00
Jace
f1345419b6
EditorWidgetSystem that takes care of moving widgets around
2016-01-21 10:30:19 +01:00
ea9c4d19d0
Merge remote-tracking branch 'origin/master' into TextRendering
...
# Conflicts:
# include/Game/Game.h
2016-01-21 10:19:32 +01:00
f3bfe388af
Clean up
2016-01-21 10:16:03 +01:00
Jace
f1a54a89b3
Merge pull request #37 from teamfisk/OctTree
...
Oct tree
2016-01-21 09:57:46 +01:00
c984f76b2f
Importing & Reading Custom animation data. TODO: Shaders.
2016-01-20 18:36:03 +01:00
a596b8746b
CapturePointTimers are now reset for "inactive" CapturePoints after a capture.
2016-01-20 17:32:20 +01:00
4d5b835352
WIP triangles vs. AABB.
2016-01-20 16:43:09 +01:00
35876f6425
Removed membervariable m_NextPossibleCapturePointand added it as local instead
2016-01-20 16:37:10 +01:00
f6ce98249e
Merge remote-tracking branch 'origin/master' into CapturePointTake
2016-01-20 16:32:14 +01:00
29aefc5af2
Added some more visual CaptureTestState xml files
2016-01-20 16:06:35 +01:00
86824f1b1f
Colors above value 1 is now added to the bloomtexture, and will be used to get a glow effect in later stage.
2016-01-20 15:23:49 +01:00
8189e3c00c
Logic in CapturePointSystem is working again. Need to update all Tests!
2016-01-20 14:59:18 +01:00
78a1037983
WIP
...
DrawScreenQuad implemented and working.
Started work on HDR coloring.
2016-01-20 13:34:56 +01:00
410e349329
Added test map for capture points and some debug code.
2016-01-19 18:27:58 +01:00
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
e643581971
Commit in order to pull from Master.
2016-01-19 18:21:27 +01:00
3826142e94
Now supporting multiple material per mesh. Simon changed glDrawElementsBaseVertex to glDrawElements in DrawFinalPass.cpp Hallelulijah!
2016-01-19 17:40:34 +01:00
ce27b224df
Merge remote-tracking branch 'origin/master' into TextRendering
...
# Conflicts:
# include/Engine/Rendering/RenderQueue.h
# include/Engine/Rendering/RenderSystem.h
# include/Engine/Rendering/Renderer.h
# src/Engine/Rendering/RenderSystem.cpp
2016-01-19 17:27:09 +01:00
b45de542da
CapturePointSystem updated, all tests are green
2016-01-19 17:19:58 +01:00
f0763bc2a3
Font loading crash fixed
2016-01-19 17:18:18 +01:00
5d6d0f82b9
Removed some debug code
2016-01-19 16:48:59 +01:00
a124ab2400
Some asset shit.
...
Fixed testworld to use the right model.
2016-01-19 16:11:56 +01:00
a8ffb24040
latest commit fix
2016-01-19 16:08:09 +01:00
f197993beb
Changed CapturePointSystem in light of new enums in the components and a teamcomponent. Half the tests are currently working
2016-01-19 15:31:15 +01:00
982837052a
DirectionalLight now correctly getting directions
2016-01-19 14:44:17 +01:00
Jace
8854794cbc
fixup! Editor widget selection and creation
2016-01-19 14:31:56 +01:00
Jace
260203fa4d
Annotation on physics component
2016-01-19 13:28:16 +01:00
Jace
d030e8f699
Editor widget selection and creation
2016-01-19 13:28:02 +01:00
4cafb2fc4c
Merge remote-tracking branch 'origin/master' into Forward+
2016-01-19 12:33:08 +01:00
46e17b7e0d
Working directional light
2016-01-19 12:32:34 +01:00
Jace
a6445c65aa
Fixed EntityParser to handle string enums properly.
2016-01-19 12:15:20 +01:00
dbe56280a6
Resolution fixed and Centered text
2016-01-19 11:45:34 +01:00
Jace
3fb975a8d9
Editor widget entities
2016-01-19 11:44:03 +01:00
77e1dacb6f
Merge
2016-01-19 09:58:52 +01:00
2a3009212a
Importing custom mesh without material.
2016-01-18 19:37:55 +01:00
b2358a1854
Added bool in Physics to toggle gravity for entities.
2016-01-18 18:16:24 +01:00
4b29d48f27
WIP
2016-01-18 17:57:45 +01:00
c4594524da
Better default values and documentation
2016-01-18 17:51:17 +01:00
William Moberg
Jace
Ayumiwii
Tleety
verysecrethero
viktorljung
antc13