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
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
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
4c1a284636
Server now does Capture point logic too.
2016-02-22 11:30:31 +01:00
23dc8e07b2
Will this do the trick? Now tells the server to send HUD entities too.
2016-02-22 10:41:37 +01:00
c7d31cac2d
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
...
# Conflicts:
# src/Engine/Network/Client.cpp
2016-02-22 10:19:48 +01:00
a1e932d261
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
2016-02-22 10:06:51 +01:00
070f1bd394
Merge remote-tracking branch 'origin/FriendlyHost/Join' into FriendlyHost/Join
...
# Conflicts:
# src/Engine/Network/Client.cpp
2016-02-22 10:06:25 +01:00
993d804cef
Added an event to search for servers.
...
Client now broadcasts a serverlistrequest.
An active server will then answer the request and send info about the server.
The client saves this data to a list and presents it to the user.
2016-02-22 10:05:47 +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
bac23f6e8c
Merge pull request #124 from teamfisk/FixNetworkBugs
...
Test text here. Good work Jocke.
2016-02-19 16:47:34 +01:00
68f2d5327d
added extra check in HealthSystem
2016-02-19 16:37:26 +01:00
2263fd2ad6
Fixed crash in Client::parsePlayerDamage.
2016-02-19 16:18:16 +01:00
2f259c3773
Added an event to search for servers.
...
Client now broadcasts a serverlistrequest.
An active server will then answer the request and send info about the server.
The client saves this data to a list and presents it to the user.
2016-02-19 15:38:09 +01:00
8cc928b5f4
Merge pull request #122 from teamfisk/WorldSnapshots
...
World snapshots
2016-02-19 15:12:31 +01:00
Jace
881ce7b02f
Proper string handling without nasty memory leaks. PHEW.
2016-02-19 15:11:10 +01:00
Jace
c130fdda5e
Merge pull request #123 from teamfisk/BoxModelCollision
...
Falling through ground + dash fix.
2016-02-19 14:53:37 +01:00
4c87ca10b9
Merge branch 'master' into BoxModelCollision
2016-02-19 14:17:17 +01:00
22664848dc
You should not be able to fall through ground or dash thru walls. Very thin objects may still be possible to go through, e.g. the grid border walls in GameMap.xml.
2016-02-19 14:16:22 +01:00
d135ea2da6
Small fix
2016-02-19 13:53:43 +01:00
Jace
844825813b
Merge pull request #121 from teamfisk/ResolutionChange
...
Resolution change
2016-02-19 13:31:06 +01:00
722b795d37
Fixed spelling
2016-02-19 13:30:41 +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
6e5335a266
Release now return name and entity of the entity that was previously klicked.
2016-02-19 13:16:26 +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
a141da3d8c
Merge pull request #118 from teamfisk/AndersTest
...
Test fixes
2016-02-18 15:29:33 +01:00
Jace
ca907b912e
Copy constructor for deep copy of World.
2016-02-18 13:54:32 +01:00
Jace
97499f1c28
Made ComponentPool copyable by making sure string fields are handled properly
2016-02-18 11:37:03 +01:00
64610e3c03
Fixed so some of the tests are working again. Also removed the test errors
2016-02-18 11:27:07 +01:00
Jace
5dd85d2748
Merge pull request #110 from teamfisk/PerformanceTiming
...
Performance timing
2016-02-18 10:33:24 +01:00
Jace
261c2e021e
Merge pull request #115 from teamfisk/Respawning
...
Spawn blocking fix
2016-02-18 10:26:08 +01:00
581a7b470c
Merge pull request #94 from teamfisk/AndersTest
...
Added 3 PickupSpawnSystem test
2016-02-18 10:21:37 +01:00
3e7936ef00
You can now change resolution by pressing buttons.
2016-02-17 17:44:33 +01:00
46987beefb
Updated the serverlist, now prints adress and port of the server.
2016-02-17 17:05:10 +01:00
8845054965
Merge remote-tracking branch 'origin/master' into PerformanceTiming
...
# Conflicts:
# resources/Schema/Entities/NewMap.xml
2016-02-17 16:59:26 +01:00
stiffly
Jocke
Viktor Ljung
Teejoon
William Moberg
Jace
Tleety
verysecrethero