160b7183b2
WIP
2016-01-23 18:07:07 +01:00
ff6ec82a6c
AMD fix
2016-01-23 16:27:01 +01:00
f623232a2b
Removed a temp variable.
2016-01-23 14:52:29 +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
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
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
Jace
8cf83454d7
Fixed input going through editor UI
2016-01-21 17:45:20 +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
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
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
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
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
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
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
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
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
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
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
d1b6fb1259
Tiny logic alteration so we don't get false warnings in debug.
2016-01-19 16:59:02 +01:00
5d6d0f82b9
Removed some debug code
2016-01-19 16:48:59 +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
viktorljung
Tleety
Jace
William Moberg
verysecrethero
Jocke
stiffly