91b0ac5fbd
Some groundwork for cubemaps.
2016-02-23 16:00:43 +01:00
4ffb03fdd5
Merge remote-tracking branch 'origin/master' into SmallFixes-Tobias
...
# Conflicts:
# src/Engine/Rendering/DrawFinalPass.cpp
2016-02-23 10:02:53 +01:00
fa4f007604
Changed name from Indicator to SpriteIndicator. Can now be an indicator for a single team or every one
2016-02-22 18:35:00 +01:00
127edb4e60
Fixed some memory leaks
2016-02-22 17:47:30 +01:00
6fab971734
Merge branch 'master' of https://github.com/teamfisk/TacticalZ into SeeTeamMates
...
Conflicts:
include/Engine/Rendering/SpriteJob.h
resources/Schema/Components.xsd
resources/Schema/Entities/Player.xml
resources/Schema/Entities/PlayerRed.xml
2016-02-22 16:43:18 +01:00
09aec08d0e
Pull request fixes
2016-02-22 16:38:20 +01:00
abd36c81f8
Added BlendTree that stores and blends multiple animations
2016-02-22 15:58:38 +01:00
4cf8c3d8d7
Fixed PerformanceTimer start and stop in Renderer.cpp since I have changed a little code there
2016-02-22 15:02:20 +01:00
37414ce124
Merge branch 'master' of https://github.com/teamfisk/TacticalZ into SSAO
...
Conflicts:
include/Engine/Rendering/Renderer.h
src/Engine/Rendering/Renderer.cpp
2016-02-22 14:51:42 +01:00
adceccf402
SSAO now working. Changed in DrawFinalePass so that th AOTexture is on texture position 0 and only get binded once.
...
Changed so that the picking pass get drawn once in the beginning so that the AO shatde could calculate AO from the depthbuffer generated during pthe pickingpass.
In the ImGUI debugg window there is now sliders to change the behavior of the AO shader. Only the minimum ambient lightning is HardCoded in to the frowardPlus fragmentshaders with a define in the begining.
2016-02-22 14:48:20 +01:00
201480b17f
SSAO is working, but is kinda crappy. You can change shade variables in the debug window.
2016-02-19 16:50:04 +01:00
97fcdb342d
Bloom should now show behind transparent objects.
2016-02-19 14:23:40 +01:00
d135ea2da6
Small fix
2016-02-19 13:53:43 +01:00
949ee76f55
Fallow and name fix
2016-02-19 13:52:16 +01:00
cf2bf4e14d
Merge remote-tracking branch 'origin/master' into ResolutionChange
2016-02-19 13:17:31 +01:00
Jace
2ac584bafb
Merge pull request #113 from teamfisk/Menu-Tobias
...
Menu tobias
2016-02-19 13:16:50 +01:00
fc5d054cb2
Entity is now sent with the click events.
...
Fixed small things
2016-02-19 12:49:07 +01:00
8c9f4bb84b
Resize should now be working correctly.
2016-02-19 11:42:52 +01:00
e15a7b9485
You can now change resolution without any apparent bugs.
2016-02-18 18:00:26 +01:00
3c9c95cff4
Animation blending improved and Animation Override added
2016-02-18 16:34:18 +01:00
5e3af7ac5d
Player Indicator now working OK. Scaling depending on how far away you are makes the Indicator to hide players head behind it. Shields are making indicators to disappear.
2016-02-17 17:58:01 +01:00
3e7936ef00
You can now change resolution by pressing buttons.
2016-02-17 17:44:33 +01:00
4fd0108443
Working billbording
2016-02-17 16:50:24 +01:00
debb1881bf
BoneAttachment working
2016-02-17 15:48:45 +01:00
db8bc612bd
AdditiveBlend now working, needs cleanup
2016-02-17 14:55:02 +01:00
e7118ce8e5
WIP
2016-02-17 10:52:50 +01:00
42b49f9dba
Added more timers to Rendering.
2016-02-16 17:51:39 +01:00
8f84a5ddd6
Buttons are now clickable
2016-02-16 16:28:19 +01:00
17da9a8036
WIP
2016-02-16 15:56:58 +01:00
6bc7131290
Glow Intencity can now be changed in the model component.
2016-02-16 14:57:21 +01:00
Jace
ca457d9c00
Player names
2016-02-12 09:07:59 +01:00
d357e365cb
Merge remote-tracking branch 'origin/TCPConnections' into WeaponSystem
...
# Conflicts:
# include/Engine/Network/Server.h
# src/Engine/Network/Client.cpp
# src/Engine/Network/Server.cpp
2016-02-12 05:21:00 +01:00
7de76376cf
Merge remote-tracking branch 'origin/master' into TCPConnections
...
# Conflicts:
# src/Engine/Network/Client.cpp
# src/Engine/Network/Server.cpp
# src/Engine/Rendering/PickingPass.cpp
# src/Game/Systems/PlayerSpawnSystem.cpp
2016-02-12 05:16:30 +01:00
Jace
47053285c8
Merge remote-tracking branch 'origin/Menu' into WeaponSystem
...
# Conflicts:
# resources/Schema/Entities/Player.xml
# resources/Schema/Types/Entity.xsd
2016-02-12 02:30:38 +01:00
Jace
bee0630a26
Merge remote-tracking branch 'origin/master' into WeaponSystem
2016-02-12 02:27:44 +01:00
e1196204eb
asdfsdaferf
2016-02-12 02:20:40 +01:00
fb5164221f
HealthHUD redesigned
2016-02-12 01:57:53 +01:00
Jace
88c7c57671
Merge remote-tracking branch 'origin/master' into WeaponSystem
2016-02-12 01:46:45 +01:00
Jace
5295133311
Hack to sync ammo over network until we have input replaying + Reload effect from all views
2016-02-12 01:45:54 +01:00
648d864d6e
Merge remote-tracking branch 'origin/master' into Animations
2016-02-11 23:48:30 +01:00
Jace
e473194671
Merge branch 'WeaponSystem'
2016-02-11 23:46:23 +01:00
Jace
b761439c84
Added config flag Debug.OutOfBodyExperience that allows you to spawn and view a player from a third person perspective, without the active camera being changed.
2016-02-11 23:45:30 +01:00
Jace
c4c53944d9
Merge pull request #103 from teamfisk/WeaponSystem
...
Working weapon system
2016-02-11 23:16:44 +01:00
70f4002d70
Merge remote-tracking branch 'origin/Animations' into TCPConnections
2016-02-11 22:15:59 +01:00
055f6517a1
Merge remote-tracking branch 'origin/master' into TCPConnections
2016-02-11 21:24:16 +01:00
afd9e24df6
Reverted last commit. Also testing to delay OnPlayerSpawn event for clients. No progress...
2016-02-11 21:23:53 +01:00
f79649cf9a
Fixed material file reading bug
2016-02-11 19:38:43 +01:00
2096779eb6
Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer
2016-02-11 18:48:21 +01:00
f088aa1d85
Commit the files now....
2016-02-11 18:45:48 +01:00
Jace
e2a8605101
Merge remote-tracking branch 'origin/master' into WeaponSystem
2016-02-11 17:25:37 +01:00
Tleety
Teejoon
viktorljung
Jace
verysecrethero
Jocke
stiffly