f1343e2f82
Collision may be working, kind of.
2016-01-24 21:08:42 +01:00
c9dc9a3570
Merge branch 'master' into BoxModelCollision
2016-01-24 15:38:38 +01:00
910b3d10e4
WIP (false collisions), collision method expanded, not working.
2016-01-24 15:32:10 +01:00
e6224a4e96
WIP (not working), attempt at separating axis theorem stuff.
2016-01-23 18:31:27 +01:00
132de88d28
Merge pull request #50 from teamfisk/Forward+
...
Forward+
2016-01-23 18:23:16 +01:00
df485ccf7b
Merge branch 'master' into Forward+
2016-01-23 18:21:35 +01:00
85a4d98c81
Revert "Revert "Merge pull request #43 from teamfisk/Forward+""
...
This reverts commit bd62b5873d
2016-01-23 18:21:10 +01:00
ef020a3770
Text fixed
2016-01-23 18:17:20 +01:00
160b7183b2
WIP
2016-01-23 18:07:07 +01:00
6eeb3ea524
WIP, Bug fix + nitpicks + optimizations.
2016-01-23 17:50:35 +01:00
5edf5a41f1
Transparency bug fix
2016-01-23 16:45:26 +01:00
ff6ec82a6c
AMD fix
2016-01-23 16:27:01 +01:00
bd62b5873d
Revert "Merge pull request #43 from teamfisk/Forward+"
...
This reverts commit d59ab5aba2bef95235d0
2016-01-23 15:57:26 +01:00
d59ab5aba2
Merge pull request #43 from teamfisk/Forward+
...
Bloom render pass and HDR colors
2016-01-23 14:58:10 +01:00
f623232a2b
Removed a temp variable.
2016-01-23 14:52:29 +01:00
71404c8828
Special case for collision vs ground (upward facing) triangles.
2016-01-23 14:01:54 +01:00
6a18cb88af
Merge remote-tracking branch 'origin/master' into Forward+
...
# Conflicts:
# include/Engine/Rendering/Renderer.h
# src/Engine/Rendering/PickingPass.cpp
# src/Engine/Rendering/Renderer.cpp
2016-01-23 13:59:21 +01:00
b499f4b020
Fixed some rendering bugs and some code refactoring
2016-01-23 12:17:38 +01:00
Jace
bef95235d0
Merge pull request #41 from teamfisk/TextRendering
...
Text rendering
2016-01-23 11:51:11 +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
e4513376bb
fixup! Changed name and made a TextPassState
2016-01-23 11:39:10 +01:00
445248af55
Changed name and made a TextPassState
2016-01-23 11:38:31 +01:00
Jace
64a7239b17
Merge pull request #46 from teamfisk/CapturePointCrashFixBranch
...
Crash fix for: if you delete a team component in editor.
2016-01-23 11:10:57 +01:00
3974c649ab
WIP on ModelBoxCollision. Octree works in Release mode.
2016-01-23 10:45:50 +01:00
7498cebf5e
Merge remote-tracking branch 'origin/master' into Forward+
...
# Conflicts:
# src/Engine/Rendering/DrawFinalPassState.cpp
# src/Engine/Rendering/PickingPass.cpp
# src/Engine/Rendering/Renderer.cpp
2016-01-22 15:57:38 +01:00
2b8debbfff
Added MipMap texture generation
2016-01-22 15:55:32 +01:00
1670fb4e48
Moved triangle vs ray code to method.
2016-01-22 14:45:50 +01:00
3955e1d60c
Can resolve collision when AABB corners cut through triangle.
...
At least two more cases left to resolve.
2016-01-22 13:46:09 +01:00
d25804e6f8
Merge branch 'master' into BoxModelCollision
2016-01-22 11:24:19 +01:00
52765cc85b
TriangleVsBox detection seems to work in all cases, but cannot resolve all cases yet.
...
Also added default ctor for Ray and removed compilation errors in CollisionSystem.
2016-01-22 11:22:56 +01:00
caf55fb8d1
Small fix to the bloom light, now feels smoother.
2016-01-22 10:52:45 +01:00
6f739e22f3
Crash fix for: if you delete a team component in editor.
2016-01-22 10:10:39 +01:00
Jace
8cf83454d7
Fixed input going through editor UI
2016-01-21 17:45:20 +01:00
d2984c6ae4
Merge branch 'master' into BoxModelCollision
2016-01-21 17:42:58 +01:00
41f0daaf3f
Merge pull request #45 from teamfisk/ShootEvent
...
Changed some files so it works with the changes in master. (weaponsys…
2016-01-21 17:40:57 +01:00
deb6ff1b16
Changed some files so it works with the changes in master. (weaponsystem,capturepoint,some tests)
2016-01-21 17:36:47 +01:00
9f6fa40448
Merge branch 'master' into BoxModelCollision
...
# Conflicts:
# src/Engine/Collision/CollisionSystem.cpp
2016-01-21 17:16:55 +01:00
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
f740d46683
Merge branch 'EditorUsefulness' of github.com:teamfisk/TacticalZ into EditorUsefulness
2016-01-21 17:01:06 +01:00
Jace
75dcdcec41
Fixed inconsistent editor input controls. Left mouse = select and move. Right mouse = camera.
2016-01-21 17:00:47 +01:00
254caf9e5d
Picking depthbuffer fix
2016-01-21 16:49:20 +01:00
Jace
1c6750f5b0
Fixed uniform scale on editor widgets
2016-01-21 16:37:35 +01:00
3548cfa248
Merge pull request #27 from teamfisk/ShootEvent
...
Shoot event
2016-01-21 16:35:55 +01:00
973ccd34c9
Removed unnecessary string in EPlayerDamage (TypeOfDamage). Renamed a variable in WeaponSystem
2016-01-21 16:30:07 +01:00
Jace
43b8fd29f6
Fixed widget world movement
2016-01-21 16:21:20 +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
7deb32431e
Removed Color TestCode in WeaponSystem
2016-01-21 16:03:30 +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
c6e9aad0c7
Merge pull request #42 from teamfisk/SpawnMiniBranch
...
HealthSystem now deletes the entity after publishing the PlayerDeath …
2016-01-21 15:10:16 +01:00
William Moberg
Viktor Ljung
viktorljung
Tleety
Jace
verysecrethero