10cd3bae40
experimental changes
2016-02-26 10:33:15 +01:00
8740e8b77a
experimental fix for pickup
2016-02-25 15:23:00 +01:00
bc227c3d61
Merge remote-tracking branch 'origin/master' into AndersTestNetwork
...
# Conflicts:
# include/Game/Systems/DamageIndicatorSystem.h
# src/Game/Systems/DamageIndicatorSystem.cpp
# src/Game/Systems/SoundSystem.cpp
2016-02-25 10:30:35 +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
cca237b33f
miscellaneous tests
2016-02-24 17:43:24 +01:00
Jace
9a41bda4cf
Merge pull request #132 from teamfisk/CubeMap
...
Cube map
2016-02-24 16:03:49 +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
f7ef6707a7
Merge pull request #116 from teamfisk/SeeTeamMates
...
See team mates
2016-02-24 15:05:19 +01:00
feeff5b164
Debug tool for different CubeMap
...
changed cubemap influence.
2016-02-24 14:47:47 +01:00
7394436e7a
Removed unnecessary comment.
2016-02-24 14:23:54 +01:00
f41e0b29be
assets
2016-02-24 14:21:48 +01:00
607e83134d
Cubemaps working
2016-02-24 14:16:49 +01:00
5af4f9d8e7
Removed a comment originating from HUDDesynch branch
2016-02-24 14:06:41 +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
e2831c5593
CapturePointSystem fix, DamageIndicatorSystem fix
2016-02-23 17:29:33 +01:00
8d23c531af
Cubemaps kinda functioning, still somthing wierd with the vectors.
2016-02-23 17:17:50 +01:00
9bba9e493c
Done with the fix & test for DamageIndicatorSystem
2016-02-23 17:12:16 +01:00
91b0ac5fbd
Some groundwork for cubemaps.
2016-02-23 16:00:43 +01:00
2c9c374f51
Almost done with the fix for DamageIndicatorSystem
2016-02-23 15:54:44 +01:00
25a7240962
Fix for PlayerSpawnSystem
2016-02-23 13:55:24 +01:00
99cdcdf289
CapturePointSystem now re-reads the CapturePoints if the map has "changed"...
2016-02-23 11:59:18 +01:00
f1d78ae790
Fixed CapturePointSystem
2016-02-23 11:52:30 +01:00
d77119bb2d
Fixed print for serverlist.
2016-02-23 11:47:44 +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
c42e1e0967
SoundSystem Fix. Now subscribes to an event that was thought to be listened to.
2016-02-23 11:07:41 +01:00
fe9dbf0b0f
Serverlist fix.
2016-02-23 10:33:20 +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
bcc42a8cb7
Merge remote-tracking branch 'origin/HUDDesync' into AndersTestNetwork
2016-02-23 09:50:55 +01:00
fe3e0bac5b
Changed SpritIndicator values on player
2016-02-22 18:45:02 +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
041c409128
Misc TestBranch testing
2016-02-22 17:46:49 +01:00
e5ff88d3c9
SoundSystem bug fix
2016-02-22 17:41:14 +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
2c18068059
Merge pull request #126 from teamfisk/SSAO
...
SSAO
2016-02-22 16:40:11 +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
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
verysecrethero
William Moberg
Jace
Tleety
stiffly
Teejoon
Jocke
Viktor Ljung