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
fcc9d64e7a
Now publishes an EPlayerDisconnected event
2016-01-22 10:58:10 +01:00
7a95880e10
Merge remote-tracking branch 'origin/master' into Networking
2016-01-22 10:36:11 +01:00
6cd073c3c8
Added network metrics logging and reactored code.
2016-01-22 10:32:54 +01:00
Jace
8cf83454d7
Fixed input going through editor UI
2016-01-21 17:45:20 +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
75dcdcec41
Fixed inconsistent editor input controls. Left mouse = select and move. Right mouse = camera.
2016-01-21 17:00:47 +01:00
973ccd34c9
Removed unnecessary string in EPlayerDamage (TypeOfDamage). Renamed a variable in WeaponSystem
2016-01-21 16:30:07 +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
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
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
Jace
f1345419b6
EditorWidgetSystem that takes care of moving widgets around
2016-01-21 10:30:19 +01:00
Jace
5e70d6eef6
EntityWrapper::Parent helper function
2016-01-21 10:29:48 +01:00
Jace
4aa9100c69
Camera::WorldToScreen helper function
2016-01-21 10:29:36 +01:00
7b34e001ba
Merge remote-tracking branch 'origin/master' into ShootEvent
2016-01-21 10:26:42 +01:00
c2e05de89f
Deleted some components, etc for ShootEvent that will likely be used in a WeaponSystem instead
2016-01-21 10:24:34 +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
70cab9ef30
Merge pull request #40 from teamfisk/Networking
...
Networking
2016-01-21 10:03:44 +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
b098bd2bd3
Merge remote-tracking branch 'origin/master' into ShootEvent
...
# Conflicts:
# include/Engine/Core/ComponentWrapper.h
# include/Game/PlayerSystem.h
# include/Game/Systems/HealthSystem.h
# resources/Schema/Components.xsd
# resources/Schema/Components/Player.xml
# resources/Schema/Types/Entity.xsd
# src/Game/PlayerSystem.cpp
# src/Tests/HealthSystemTest.cpp
# src/Tests/OctTreeTestAnders.cpp
# src/Tests/OctTreeTestGameClass.cpp
# src/Tests/OctTreeTestGameClass.h
# src/Tests/OctTreeTestHardCodedTestWorld.h
2016-01-20 17:53:33 +01:00
cd67253173
Added logic to go from spectator to player.
2016-01-20 17:41:16 +01:00
f6ce98249e
Merge remote-tracking branch 'origin/master' into CapturePointTake
2016-01-20 16:32:14 +01:00
00588b07c5
Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking
...
# Conflicts:
# src/Engine/Network/Client.cpp
# src/Engine/Network/Server.cpp
2016-01-20 16:30:12 +01:00
3376f4a16e
Added server has timed out logic to client. (>'')>
2016-01-20 16:27:53 +01:00
25d2aa3464
"Supporting" spectators. Using a vector for connected units as we do not interpret as players. ““”̿ ̿ ̿ ̿ ̿’̿’̵͇̿̿з=(•̪●)=ε/̵͇̿̿/̿ ̿ ̿ ̿ ̿’““
2016-01-20 16:27:23 +01:00
8189e3c00c
Logic in CapturePointSystem is working again. Need to update all Tests!
2016-01-20 14:59:18 +01:00
f52cddb445
Added packet loss logic for multiple clients.
...
Changed packet class to fit our needs.
2016-01-20 13:43:11 +01:00
78a1037983
WIP
...
DrawScreenQuad implemented and working.
Started work on HDR coloring.
2016-01-20 13:34:56 +01:00
85523343b2
Merge remote-tracking branch 'origin/master' into Networking
2016-01-20 10:24:53 +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
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
f0763bc2a3
Font loading crash fixed
2016-01-19 17:18:18 +01:00
a8ffb24040
latest commit fix
2016-01-19 16:08:09 +01:00
893ef38237
Removed world from renderer and moved depth-calculation code to modeljob
2016-01-19 15:41:17 +01:00
713ebbe18c
Can add any objects that inherit from AABB into the Octree.
2016-01-19 14:50:46 +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
e0c4394f20
Merge. Also fixed interpolation for scale and rotation.
...
Merge remote-tracking branch 'origin/master' into Networking
# Conflicts:
# include/Game/Game.h
# src/Game/CMakeLists.txt
# src/Game/Game.cpp
2016-01-19 14:04:25 +01:00
Jace
d030e8f699
Editor widget selection and creation
2016-01-19 13:28:02 +01:00
Jace
cfe023cc1d
Created ComponentInfo::EnumType which defines which native type to use for enums.
2016-01-19 12:33:53 +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
dbe56280a6
Resolution fixed and Centered text
2016-01-19 11:45:34 +01:00
William Moberg
stiffly
Jocke
Jace
verysecrethero
Tleety
viktorljung
antc13