06d60f9884
Merge branch 'master' into Respawning
2016-03-02 13:47:03 +01:00
629ebb871f
SpectatorCamera shows capturepoint HUD and respawntimer. It no longer requires CapturePointGameMode component to work.
2016-03-02 13:45:49 +01:00
2fb3bb2a39
Merge pull request #153 from teamfisk/RenderSetingsV2
...
Shield and stuff
2016-03-02 13:15:52 +01:00
de9657700b
Fixed draw final pass with shided objects having to many if-statments.
...
Shields is working with transparancy
Player cameras should have nearclip fater away and far clip nearer.
Defaultconfig push
2016-03-02 11:59:48 +01:00
03a35d0f5e
Merge pull request #149 from teamfisk/FixNetworkBugs
...
Seems OK
2016-03-02 10:11:52 +01:00
e4e9af5d9c
Merge pull request #148 from teamfisk/DashFixBranch
...
Moved the Dash CoolDown (CoolDownTimer) to the component (DashAbility…
2016-03-02 10:05:02 +01:00
ef66f3ebe5
Transparancy with shild fix
2016-03-01 23:14:23 +01:00
Jace
39369aa3e5
Merge pull request #150 from teamfisk/EditorCameraSpeedFix
...
Fixed editor camera speed changing when scrolling on UI elements
2016-03-01 22:51:16 +01:00
Jace
6eb0b83d6b
Fixed editor camera speed changing when scrolling on UI elements
2016-03-01 22:47:43 +01:00
9747a201b7
Merge pull request #147 from teamfisk/CapturePointFixBranch
...
ECaptured: added NextCapturePoint entitywrapper. Changed CapturePoint…
2016-03-01 20:33:10 +01:00
f147929aa9
Moved the Dash CoolDown (CoolDownTimer) to the component (DashAbility). Fixed 2 warnings
2016-03-01 17:57:18 +01:00
aadfdfdd90
AmmoPickups and HealthPickups will only spawn on the server. When a ammo pickup is taken the Server will send an Event to that
...
Client and it will update its ammo.
2016-03-01 17:55:00 +01:00
5a8261453e
Eliminated some SAXParsing errors from our console output.
2016-03-01 17:40:42 +01:00
bba002dea9
Removed DebugCode
2016-03-01 17:37:30 +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
a9762f44ca
Merge branch 'master' into Respawning
2016-03-01 17:34:23 +01:00
3d4427dd20
Added entity SpectatorCamera that shows respawntime, will activate when explosion effect is deleted.
2016-03-01 17:32:14 +01:00
5c6a652316
Fixed so unregistered components are ignored instead of crashing the game.
2016-03-01 15:53:59 +01:00
6d68486c05
Merge remote-tracking branch 'origin/master' into FixNetworkBugs
2016-03-01 15:07:06 +01:00
Jace
c60e1ba7e4
Merge pull request #144 from teamfisk/RenderSetingsV2
...
Render settings
2016-03-01 13:49:38 +01:00
63d205f56a
Merge pull request #146 from teamfisk/EditorKeyboardFix
...
Fixed editor keyboard shortcuts getting mixed up with GUI input actions
2016-03-01 13:46:01 +01:00
Jace
36f6ade87a
Fixed editor keyboard shortcuts getting mixed up with GUI input actions
2016-03-01 13:38:51 +01:00
724d7b1586
Merge remote-tracking branch 'origin/master' into RenderSetingsV2
...
Conflicts:
src/Engine/Rendering/DrawFinalPass.cpp
2016-03-01 12:56:00 +01:00
8cda614de4
Added transparent object that disappeared from the merge
2016-03-01 12:54:01 +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
dfa224b4dd
Merge pull request #142 from teamfisk/Respawning
...
Added CapturePointGameMode component with RespawnTime
2016-03-01 11:28:56 +01:00
Jace
86df8f14f4
Merge pull request #143 from teamfisk/Transparency-fix
...
Transparency fix
2016-03-01 11:26:26 +01:00
eaea645068
Reflectance should now work as an inverse of the specular alpha value.
2016-03-01 11:19:44 +01:00
21bf7f4df3
Glow should now legit be working through transparency.
2016-03-01 11:03:16 +01:00
e2b7e5400d
Check so CapturePointGameMode pool exists and has a size.
2016-03-01 10:20:52 +01:00
658eace093
Added component CapturePointGameMode that contains respawntime.
2016-02-29 18:20:14 +01:00
c106768939
Merge pull request #135 from teamfisk/JumpHeightAdjustment
...
Player jump speed can be adjusted
2016-02-29 17:37:25 +01:00
c7dad79e72
Merge branch 'master' into JumpHeightAdjustment
...
# Conflicts:
# resources/Schema/Components.xsd
# resources/Schema/Entities/Player.xml
# resources/Schema/Entities/PlayerRed.xml
# src/Game/Systems/PlayerMovementSystem.cpp
2016-02-29 17:28:40 +01:00
d37f8cc350
Merge pull request #141 from teamfisk/BoxModelCollision
...
Collision jittering + disappearing weapon
2016-02-29 17:13:34 +01:00
3c35c0a956
Frustum culling octree updates after collisions, no more disappearing weapons.
2016-02-29 15:50:26 +01:00
d47a806c64
Made a easy hack to solve jittering when standing still. Jittering should still be present when moving, but at least it is less prominent when moving.
2016-02-29 15:49:23 +01:00
8e21c5a5e4
Reverts last WIP since it probably added code without improving anything.
...
Revert "WIP, should take shortest resolution even if forced upwards because of slopes, not solving the jittering problem though. + debug code."
This reverts commit db5170c699
2016-02-29 15:38:36 +01:00
df7ace6626
We only uses one depth buffer now
2016-02-29 11:44:29 +01:00
bef79d116b
Merge remote-tracking branch 'origin/master' into FixNetworkBugs
2016-02-29 10:15:16 +01:00
db5170c699
WIP, should take shortest resolution even if forced upwards because of slopes, not solving the jittering problem though. + debug code.
2016-02-29 09:37:51 +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
afddd276a4
Merge remote-tracking branch 'origin/master' into FixNetworkBugs
2016-02-26 16:54:09 +01:00
a48e1b567a
Removed comments
2016-02-26 16:49:25 +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
Jace
0c60b637c3
Who's merging without compiling?
2016-02-26 12:52:10 +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
William Moberg
Tobias Dahl
Teejoon
verysecrethero
Jace
Jocke