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
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
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
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
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
73a4336206
Try some stuff
2016-02-18 23:33:10 +01:00
f2ab02d860
More WIP
...
Switching between levels seem to work, but I borked all matrices
2016-02-18 22:38:50 +01:00
bf376f54b6
WIP
...
I think this is now finding the different segments of the cascade
2016-02-18 20:48:39 +01:00
e15a7b9485
You can now change resolution without any apparent bugs.
2016-02-18 18:00:26 +01:00
3c9c95cff4
Animation blending improved and Animation Override added
2016-02-18 16:34:18 +01:00
b81bb9eeea
Changed SprintAbility to take StrengthOfEffect. PlayerMovementSystem: if Sniper is sprinting he will now move faster.
2016-02-18 15:17:19 +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
Jace
5dd85d2748
Merge pull request #110 from teamfisk/PerformanceTiming
...
Performance timing
2016-02-18 10:33:24 +01:00
178402e964
cascade shadow wip
2016-02-18 10:08:29 +01:00
7cc58dc94c
Merge branch 'master' of https://github.com/teamfisk/TacticalZ into SeeTeamMates
2016-02-17 18:00:30 +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
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
950ecba1c0
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
2016-02-17 15:52:58 +01:00
fdc8f753cb
Implemented primitive server "heartbeat" logic, which sends server info from server to client without being connected.
2016-02-17 15:51:26 +01:00
debb1881bf
BoneAttachment working
2016-02-17 15:48:45 +01:00
db8bc612bd
AdditiveBlend now working, needs cleanup
2016-02-17 14:55:02 +01:00
23bb1a6405
Cannot respawn inside other players, unless all are blocked.
2016-02-17 14:54:59 +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
e7118ce8e5
WIP
2016-02-17 10:52:50 +01:00
b2a437731e
Small cleanup in the code
2016-02-16 17:58:27 +01:00
42b49f9dba
Added more timers to Rendering.
2016-02-16 17:51:39 +01:00
4b8f1d95a3
Added static class PerformanceTimer. Changed CMakeLists for engine to include boost timer. Added F2,F3 functions in editor. Added some timing, more to be added
2016-02-16 16:57:46 +01:00
8f84a5ddd6
Buttons are now clickable
2016-02-16 16:28:19 +01:00
17da9a8036
WIP
2016-02-16 15:56:58 +01:00
6bc7131290
Glow Intencity can now be changed in the model component.
2016-02-16 14:57:21 +01:00
2c3122bbdb
increased Network buffer size, fixed 2 crashes and re-added the ability to kill oneself with the use of a key bound to TakeDamage,Value.
2016-02-12 08:39:20 +01:00
Jace
bb66f95d43
Enabled server broadcasting PlayerDamage events to other players to make damage indicators work
2016-02-12 07:03:14 +01:00
d357e365cb
Merge remote-tracking branch 'origin/TCPConnections' into WeaponSystem
...
# Conflicts:
# include/Engine/Network/Server.h
# src/Engine/Network/Client.cpp
# src/Engine/Network/Server.cpp
2016-02-12 05:21:00 +01:00
7de76376cf
Merge remote-tracking branch 'origin/master' into TCPConnections
...
# Conflicts:
# src/Engine/Network/Client.cpp
# src/Engine/Network/Server.cpp
# src/Engine/Rendering/PickingPass.cpp
# src/Game/Systems/PlayerSpawnSystem.cpp
2016-02-12 05:16:30 +01:00
Jace
787eecce26
WIP
2016-02-12 04:03:22 +01:00
Teejoon
stiffly
William Moberg
Jace
Tleety
FakeShemp
viktorljung
verysecrethero
Jocke