f89cef7a78
Text still disappears if its behind transparent sprites
2016-03-11 11:23:15 +01:00
551745b0a6
Merge remote-tracking branch 'origin/master' into CapturePointTake
2016-03-10 16:14:18 +01:00
Jace
777f382772
Merge branch 'master' of github.com:teamfisk/TacticalZ
2016-03-10 15:48:05 +01:00
Jace
e734d0c953
Oops.
2016-03-10 15:47:32 +01:00
c9fef65c4f
Merge pull request #198 from teamfisk/Menu
...
Menu
2016-03-10 15:38:06 +01:00
7e6288c597
Some merge fixes and some sprite fixes.
2016-03-10 15:36:33 +01:00
4322a5d8da
Some fixes for sprites
2016-03-10 15:21:11 +01:00
0a94373f3f
The children of the CapturePointModels now also get their visibility on/off. This is done since a capturepoint is actually 2 models and not just 1
2016-03-10 14:38:20 +01:00
329a15e08b
Bloom bad edge clamp fixed
2016-03-10 13:42:33 +01:00
28de31d84d
FIX #196 : Some variables had not been properly initialized and would cause the game to crash.
2016-03-10 13:28:38 +01:00
Jace
e9ef0e7060
Disabled GLERROR macro for release builds
2016-03-10 13:19:26 +01:00
Jace
416f55b6ce
Merge pull request #196 from teamfisk/RendererBugFixes
...
Fixed on window resize memory leak
2016-03-10 13:11:23 +01:00
Jace
0346f81234
Renderer resizing updated to send EResolutionChanged when the resolution is updated so cameras can update their aspect ratio and have a correct FOV. Renderer::SetResolution actually changes the resolution now too.
2016-03-10 13:09:34 +01:00
c3255519bf
Blur is now looking like real blur
2016-03-10 13:07:41 +01:00
a2244e87ad
WIP, trying to get blur to work with mipmaps
2016-03-10 12:18:06 +01:00
592edf7dba
Sprites can now be rendered with the texture ratio in mind
2016-03-09 23:31:54 +01:00
4e6ff16e58
Shadows for animated models and removed spam in console
2016-03-09 22:43:04 +01:00
087facc22e
Textures are now able to keep their scale even though the sprite is scaled.
2016-03-09 22:22:32 +01:00
e25c9ee690
Merge remote-tracking branch 'origin/master' into Shadows
...
# Conflicts:
# include/Engine/Rendering/DrawFinalPass.h
# include/Engine/Rendering/Renderer.h
# resources/Shaders/ForwardPlus.vert.glsl
# resources/Shaders/ForwardPlusSkinned.vert.glsl
# src/Engine/Rendering/Renderer.cpp
2016-03-09 19:38:55 +01:00
60ff53112e
Merge remote-tracking branch 'origin/master' into Movement
2016-03-09 18:27:36 +01:00
d42d886dcc
3rd person animations synced with 1st person animations
2016-03-09 18:27:09 +01:00
Jace
1f14087734
Merge branch 'master' of github.com:teamfisk/TacticalZ
2016-03-09 18:02:11 +01:00
Jace
0b58f32f32
Fixed third person animations over network
2016-03-09 18:01:32 +01:00
974d9101bd
Merge remote-tracking branch 'origin/master' into RendererBugFixes
...
Conflicts:
assets
2016-03-09 17:50:42 +01:00
99ccca6273
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
2016-03-09 17:38:37 +01:00
d093284569
Rename variable
2016-03-09 17:37:40 +01:00
7e7d98eaae
Merge remote-tracking branch 'origin/master' into Menu
2016-03-09 17:24:41 +01:00
1104166039
TextureSprite Resource that use GL_NEAREST for sampling aswell as some StartMenu changes
2016-03-09 17:24:21 +01:00
fad93ca5aa
Merge remote-tracking branch 'origin/master' into RendererBugFixes
...
Conflicts:
include/Engine/Rendering/DrawFinalPass.h
2016-03-09 16:54:26 +01:00
91cad561a4
Some more optimization and fixed sorting of render job objects in RenderSystem
2016-03-09 16:51:24 +01:00
7141756992
Merge remote-tracking branch 'origin/Weapons' into Movement
...
# Conflicts:
# resources/Schema/Entities/Player.xml
# resources/Schema/Entities/PlayerAssaultBlue.xml
# resources/Schema/Entities/PlayerAssaultFallbackBlue.xml
# resources/Schema/Entities/PlayerAssaultFallbackRed.xml
# resources/Schema/Entities/PlayerAssaultRed.xml
# resources/Schema/Entities/aaaatestremoveme.xml
# resources/Schema/Entities/aim_rays.xml
2016-03-09 15:59:36 +01:00
de125663fd
Merge remote-tracking branch 'origin/master' into Movement
...
# Conflicts:
# assets
# resources/Schema/Entities/Player.xml
# resources/Schema/Entities/PlayerAssaultFallbackBlue.xml
# resources/Schema/Entities/PlayerAssaultFallbackRed.xml
# resources/Schema/Entities/PlayerAssaultRed.xml
# resources/Schema/Entities/aaaatestremoveme.xml
# resources/Schema/Entities/aim_rays.xml
# src/Engine/Rendering/BoneAttachmentSystem.cpp
2016-03-09 15:54:00 +01:00
Jace
34e551663f
Merge remote-tracking branch 'origin/master' into Weapons
...
# Conflicts:
# assets
# resources/Schema/Entities/Player.xml
# resources/Schema/Entities/PlayerAssaultFallbackBlue.xml
# resources/Schema/Entities/PlayerAssaultFallbackRed.xml
# resources/Schema/Entities/PlayerAssaultRed.xml
# resources/Schema/Entities/aaaatestremoveme.xml
# resources/Schema/Entities/aim_rays.xml
2016-03-09 15:52:13 +01:00
fa0b52caec
When you disconnect you will delete the world and return to the menu.
2016-03-09 15:49:42 +01:00
Jace
9d368348d5
Updated 3rd person and 1st person animation trees for assault to allow for third person weapon animations
2016-03-09 15:48:57 +01:00
49040e9c4b
StartMenu system now sets the main menu camera to active as long as it exists.
2016-03-09 15:29:42 +01:00
a76a04260f
StartSystem skeleton and some changes to the StartMenu
2016-03-09 15:10:54 +01:00
877defdfee
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
2016-03-09 14:47:24 +01:00
09171a1a18
WIP connect from menu
2016-03-09 14:33:20 +01:00
4ae39dcc36
Merge pull request #182 from teamfisk/DamageIndicator
...
Friendly fire gives no DamageIndicator
2016-03-09 13:26:57 +01:00
67ccb5bee5
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
2016-03-09 13:23:31 +01:00
704242597a
Merge remote-tracking branch 'origin/master' into Menu
...
# Conflicts:
# resources/Schema/Components.xsd
# resources/Schema/Entities/NewMapWSpectatorCam.xml
# resources/Schema/Types/Entity.xsd
# src/Game/Game.cpp
2016-03-09 11:49:42 +01:00
697da620d3
Merge pull request #179 from teamfisk/TeamPickCamera
...
Spectator camera system
2016-03-09 11:41:05 +01:00
534d6639e5
Class enum instead of hardcoded ints.
...
Removed superfluous .Valid() checks.
Check for spectator spawnrequest in case they somehow has a class, so we don't get "x players were supposed to be spawned but failed" if it happens.
2016-03-09 11:35:32 +01:00
d7c30450dc
Should now read servername from config.
2016-03-09 10:08:23 +01:00
4abe73eae7
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
2016-03-09 10:00:44 +01:00
95f68cc888
ConnectRequest event and some other shit
2016-03-08 22:24:32 +01:00
7bc3c9f7b1
Don't force to spectator camera if player presses pickTeam/Class prematurely. Players team should be remembered after picked, spawn request is not erased anymore.
2016-03-08 18:26:17 +01:00
3394d65055
Servers now show up in the server list.
2016-03-08 18:13:21 +01:00
280de0e984
Merge remote-tracking branch 'origin/FriendlyHost/Join' into Menu
...
# Conflicts:
# include/Game/Systems/MainMenuSystem.h
# src/Engine/GUI/MainMenuSystem.cpp
2016-03-08 17:03:50 +01:00
viktorljung
verysecrethero
Jace
William Moberg
Tleety
stiffly
FakeShemp
Teejoon