a38c18fd3a
Merge remote-tracking branch 'origin/master' into CPArrow
2016-03-01 20:33:30 +01:00
6281e20000
Arrow should now track the CapturePoint specified in the Component.
2016-03-01 20:31:09 +01:00
15195964da
ECaptured: added NextCapturePoint entitywrapper. Changed CapturePointID to CapturePointTakenID. Fixed so CapturePoints works in singleplayer again. Captured event is now sent in the next Update, since the information for NextCapturePoint is needed
2016-03-01 17:34:30 +01:00
b0a66f9e83
Components for CapturePoint arrow HUD element and a system skeleton
2016-03-01 16:19:59 +01:00
77eaa45702
Merge remote-tracking branch 'origin/master' into HEAD
...
Conflicts:
src/Engine/Rendering/CubeMapPass.cpp
src/Engine/Rendering/DrawFinalPass.cpp
2016-03-01 12:11:27 +01:00
658eace093
Added component CapturePointGameMode that contains respawntime.
2016-02-29 18:20:14 +01:00
df7ace6626
We only uses one depth buffer now
2016-02-29 11:44:29 +01:00
Jace
bb76c9d248
WIP multi-weapon behaviours
2016-02-29 06:58:57 +01:00
9cbc6f7755
Added GenerateTexture, GenerateMipMapTexture and DeleteTexture to CommonFunctions
2016-02-28 16:16:22 +01:00
d3a245606a
SSAO and Glow is no longe conflicting with each other.
...
Texture should get the id = 0 when they are deleted and not assigned a new texture after. Else they will start to conflict with each other.
2016-02-28 15:02:40 +01:00
b320d8d1e4
WIP
2016-02-26 18:01:38 +01:00
62e22d3821
Fix
2016-02-26 13:32:16 +01:00
0805375483
Deleted SSAO sliders except Quality
2016-02-26 13:25:19 +01:00
d411de894f
Merge pull request #140 from teamfisk/FixNetworkBugs
...
Death explosion should always get triggered now.
2016-02-26 12:01:19 +01:00
f56705d921
You can now change the quality of SSAO by sliding the SSAO Quality
2016-02-26 11:51:20 +01:00
18450ff4f3
Death explosion should always get triggered now. (I hope)
2016-02-26 11:08:05 +01:00
22b473a0b6
Merge pull request #139 from teamfisk/EditorCopyPaste
...
Editor copy paste
2016-02-26 11:01:18 +01:00
Jace
f161fce719
Merge pull request #138 from teamfisk/PlayerAtOriginFix
...
Teleporting to origin on spawn fixed.
2016-02-25 17:55:03 +01:00
Jace
9e6c67596d
Basic editor copy and paste. Doesn't actually copy the entity until you paste it.
2016-02-25 17:51:28 +01:00
89d0d5753f
Fix for player teleporting to (0,0,0). Saves player previous position in CollisionSystem instead of Physics component so it won't be saved when editing Players.
2016-02-25 16:16:24 +01:00
eac9a9daf6
Pull request #136 Merge remote-tracking branch 'origin/master' into FixNetworkBugs
...
# Conflicts:
# src/Engine/Network/Client.cpp
2016-02-25 16:07:06 +01:00
059fe5c6c0
Fixed typo m_EPDoubleJump to m_EDoubleJump.
2016-02-25 16:04:27 +01:00
f66fa7a183
Merge remote-tracking branch 'origin/master' into FixNetworkBugs
...
# Conflicts:
# include/Engine/Network/Client.h
# include/Engine/Network/MessageType.h
# include/Engine/Network/Server.h
# include/Engine/Network/TCPServer.h
# src/Engine/Network/Client.cpp
# src/Engine/Network/TCPServer.cpp
2016-02-25 15:13:11 +01:00
508d8a6f00
Fixed memory leak in TCPServer::AcceptNewConnections caused by acceptor->async_accept().
...
Fixed some formating and comments.
2016-02-25 14:24:38 +01:00
8ce6308649
In snapshot: now sends player information and also CP information. Now it is no longer true that they will arrive in pre order. Appropriate actions were therefor implemented.
2016-02-25 11:56:40 +01:00
da1c7b3093
Merge pull request #133 from teamfisk/AndersTest
...
Ammo,HealthPickup now takes in account for possible parenting/childin…
2016-02-25 09:58:14 +01:00
ef87102d1f
Ammo,HealthPickup now takes in account for possible parenting/childing of the pickup. Also saved the xml files with the new scaling
2016-02-24 17:53:37 +01:00
fc18932068
Merge remote-tracking branch 'origin/master' into CubeMap
...
# Conflicts:
# src/Engine/Rendering/Renderer.cpp
2016-02-24 15:45:30 +01:00
b874ea8641
Merge pull request #131 from teamfisk/ResizeWindowFixFromSSAOMerge
...
Have fix the resizing errors
2016-02-24 15:22:12 +01:00
2609a0253d
Merge pull request #129 from teamfisk/HUDDesync
...
Networking improvements
2016-02-24 15:22:01 +01:00
de309d3b9d
Merge pull request #130 from teamfisk/AndersTest
...
CapturePointSystem fix, DamageIndicatorSystem fix
2016-02-24 15:17:36 +01:00
feeff5b164
Debug tool for different CubeMap
...
changed cubemap influence.
2016-02-24 14:47:47 +01:00
af68236e71
now using a define INDICATOR_TEST to activate the DamageIndicatorSystem test.
2016-02-24 13:58:05 +01:00
6f9ce8a0c1
WIP
2016-02-24 13:57:54 +01:00
6465fe6ed6
Have fix the resizing errors
2016-02-24 13:22:41 +01:00
fa13c1d065
Double jump is now working.
2016-02-23 18:24:46 +01:00
e2831c5593
CapturePointSystem fix, DamageIndicatorSystem fix
2016-02-23 17:29:33 +01:00
91b0ac5fbd
Some groundwork for cubemaps.
2016-02-23 16:00:43 +01:00
27669b7383
Merge remote-tracking branch 'origin/master' into HUDDesync
2016-02-23 11:09:44 +01:00
fc7d62a5ad
Various clean ups.
2016-02-23 11:07:56 +01:00
845a30ed0f
Merge remote-tracking branch 'origin/DynamicPacketBuffer' into HUDDesync
...
# Conflicts:
# include/Engine/Network/TCPServer.h
# src/Engine/Network/TCPServer.cpp
2016-02-22 17:39:48 +01:00
34a71b0767
Fixed linking issue.
2016-02-22 17:24:35 +01:00
833006744a
WIP
2016-02-22 17:00:25 +01:00
b2d8cddfb7
WE now send the map on connect after that only player information.
2016-02-22 16:46:31 +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
ed9149fe63
Network buffer should now dynamically increase when needed.
2016-02-22 16:04:27 +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
a1e932d261
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
2016-02-22 10:06:51 +01:00
Tleety
verysecrethero
Teejoon
William Moberg
Jace
Jocke
stiffly