Jace
8cf83454d7
Fixed input going through editor UI
2016-01-21 17:45:20 +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
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
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
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
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
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
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
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
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
29aefc5af2
Added some more visual CaptureTestState xml files
2016-01-20 16:06:35 +01:00
39ae83efd4
Fixed all tests in CapturePointTest and cleaned up some comments
2016-01-20 15:40:56 +01:00
8189e3c00c
Logic in CapturePointSystem is working again. Need to update all Tests!
2016-01-20 14:59:18 +01:00
4d01cdf895
Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking
...
# Conflicts:
# src/Engine/Network/Client.cpp
2016-01-20 14:33:17 +01:00
7e7ca7edcf
Listening to "DisconnectFromServer"
2016-01-20 14:32:04 +01:00
e9a576341e
Started on server disconnect logic.
2016-01-20 14:31:50 +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
85523343b2
Merge remote-tracking branch 'origin/master' into Networking
2016-01-20 10:24:53 +01:00
410e349329
Added test map for capture points and some debug code.
2016-01-19 18:27:58 +01:00
b45de542da
CapturePointSystem updated, all tests are green
2016-01-19 17:19:58 +01:00
d1b6fb1259
Tiny logic alteration so we don't get false warnings in debug.
2016-01-19 16:59:02 +01:00
dfa96f74e1
Merge pull request #39 from teamfisk/Forward+
...
Forward+
2016-01-19 16:53:07 +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
d2263b0c90
Assets added
2016-01-19 16:09:30 +01:00
Jace
William Moberg
verysecrethero
viktorljung
Tobias Dahl
Jocke
stiffly