08fcdb382b
Used config for a lot of things
2016-01-22 13:18:53 +01:00
b1ea5429ce
Used config for a lot of things
2016-01-22 11:53:04 +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
fcc9d64e7a
Now publishes an EPlayerDisconnected event
2016-01-22 10:58:10 +01:00
caf55fb8d1
Small fix to the bloom light, now feels smoother.
2016-01-22 10:52:45 +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
1e3fc1ae2d
Created EPlayerSpawned that gets published when a player spawns
2016-01-22 10:16:35 +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
382e00cff4
Randomness fixed
...
Redundant continue removed
Redundant cross product removed
2016-01-21 15:34:08 +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
afe43c5f44
Shader will now handle Glowmaps. However the load code is not there yet.
2016-01-21 14:53:47 +01:00
2381f01d12
HealthSystem now deletes the entity after publishing the PlayerDeath event
2016-01-21 14:25:01 +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
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
60037c2849
Merge pull request #31 from teamfisk/CapturePointTake
...
Capture point take
2016-01-20 17:43:20 +01:00
cd67253173
Added logic to go from spectator to player.
2016-01-20 17:41:16 +01:00
a596b8746b
CapturePointTimers are now reset for "inactive" CapturePoints after a capture.
2016-01-20 17:32:20 +01:00
stiffly
William Moberg
Tleety
Jocke
Jace
verysecrethero
viktorljung
Ayumiwii
antc13