fa13c1d065
Double jump is now working.
2016-02-23 18:24:46 +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
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
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
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
8845054965
Merge remote-tracking branch 'origin/master' into PerformanceTiming
...
# Conflicts:
# resources/Schema/Entities/NewMap.xml
2016-02-17 16:59:26 +01:00
7dfd68467e
Merge branch 'Menu-Tobias' into ResolutionChange
2016-02-17 16:54:06 +01:00
52355a63e2
Merge branch 'master' into Respawning
2016-02-17 16:08:00 +01:00
72db672dbf
Ray will not hit objects in octree if they are transparent or invisible.
2016-02-17 16:06:35 +01:00
0d665c10fe
Merge pull request #114 from teamfisk/HealthPickup
...
The rotation of the Pickups are now also included in the AmmoPickup.x…
2016-02-17 14:56:45 +01:00
23bb1a6405
Cannot respawn inside other players, unless all are blocked.
2016-02-17 14:54:59 +01:00
b8222c7b2e
The rotation of the Pickups are now also included in the AmmoPickup.xml, HealthPickup.xml
2016-02-17 14:54:42 +01:00
43bbc063cf
Merge pull request #111 from teamfisk/HealthPickup
...
Fixed RespawnModel of Pickups
2016-02-17 14:39:09 +01:00
3e4b87da7c
Merge remote-tracking branch 'origin/master' into HealthPickup
...
# Conflicts:
# resources/Schema/Entities/NewMap.xml
2016-02-17 14:32:59 +01:00
ac9ce8ea83
Merge remote-tracking branch 'origin/master' into HealthPickup
2016-02-17 14:30:31 +01:00
99643fd748
Merge pull request #112 from teamfisk/AssaultDash
...
You can now AssaultDash in the air
2016-02-17 14:24:58 +01:00
a6c30100af
FrameWork for menu buttons
2016-02-17 14:16:17 +01:00
833015f45e
Small code cleanup for PerformanceTimer
2016-02-17 13:44:41 +01:00
657125b469
Moved menu code into GUI
...
Button events are now sent when you click.
2016-02-17 13:44:11 +01:00
8f28c760dd
You can now AssaultDash in the air
2016-02-17 11:47:10 +01:00
b13362360a
Fixed RespawnModel of Pickups
2016-02-17 11:22:42 +01:00
Jace
0af9edc6e5
Editor is properly disabled when disabled in config
2016-02-17 10:53:20 +01:00
ec10ef3ffc
Merge remote-tracking branch 'origin/master' into HealthPickup
2016-02-17 10:32:35 +01:00
Jocke
Viktor Ljung
Teejoon
William Moberg
Jace
Tleety
verysecrethero