53c520123a
Uncommented code.
2016-03-02 17:06:53 +01:00
1aefa1dec6
AutoAnimationBlend now working correctly for unique nodes
2016-03-02 17:06:51 +01:00
92d5ec70ba
Merge remote-tracking branch 'origin/master' into DashAbiltyEffect
2016-03-02 16:57:07 +01:00
a5c086e389
Dash effect now working over network, by sending events. Similar to jump effect.
2016-03-02 16:48:38 +01:00
8422742a9e
Merge remote-tracking branch 'origin/master' into Animations
...
# Conflicts:
# src/Engine/Rendering/DrawFinalPass.cpp
2016-03-02 13:50:08 +01:00
06d60f9884
Merge branch 'master' into Respawning
2016-03-02 13:47:03 +01:00
7b32d92170
Merge with master
2016-03-02 13:45:56 +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
c3f24f494d
fixup! AutoAnimationBlend on unique node working but scale is not working correctly
...
Commited some things that shouldn't have been commited
2016-03-02 13:34:47 +01:00
07ccb9c041
AutoAnimationBlend on unique node working but scale is not working correctly
2016-03-02 13:30:04 +01:00
46eaedb186
Merge remote-tracking branch 'origin/master' into Importer
...
Conflicts:
resources/Schema/Entities/Player.xml
src/Engine/Collision/CollisionSystem.cpp
src/Engine/Rendering/DrawFinalPass.cpp
2016-03-02 13:19:40 +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
5a6374f013
Fix the remainder of errors. Might have borked splatmap in the process.
2016-03-02 10:57:22 +01:00
0cf92e99ff
wip
2016-03-02 10:17:49 +01:00
ef66f3ebe5
Transparancy with shild fix
2016-03-01 23:14:23 +01:00
1ae2f3f5f3
Begin clean-up
2016-03-01 19:10:13 +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
a9762f44ca
Merge branch 'master' into Respawning
2016-03-01 17:34:23 +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
d3ffb9768b
Sets velocity to 0, does not make use of doppler effect atm
2016-03-01 14:48:07 +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
1961c16fe2
add weight slider
2016-03-01 13:27:52 +01:00
d32a483bb4
remove farclip override
2016-03-01 13:17:17 +01:00
e23ea78aeb
Merge remote-tracking branch 'origin/master' into Shadows
...
# Conflicts:
# resources/Shaders/ForwardPlus.frag.glsl
2016-03-01 13:04:11 +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
Jace
86df8f14f4
Merge pull request #143 from teamfisk/Transparency-fix
...
Transparency fix
2016-03-01 11:26:26 +01:00
21bf7f4df3
Glow should now legit be working through transparency.
2016-03-01 11:03:16 +01:00
4153a31e3a
Fix goof.
2016-02-29 19:47:24 +01:00
0908be1e02
Shadows are pretty much done.
2016-02-29 19:45:56 +01:00
2ed5fad699
The shadows are working
2016-02-29 19:17:16 +01:00
70374fa10e
It compiles, but no shadows
2016-02-29 18:20:32 +01:00
20468cba1b
Merge branch 'master' into Shadows
...
# Conflicts:
# assets
# include/Engine/Rendering/DrawFinalPass.h
# include/Engine/Rendering/Renderer.h
# resources/Shaders/ForwardPlus.frag.glsl
# resources/Shaders/ForwardPlus.vert.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/FrameBuffer.cpp
# src/Engine/Rendering/Renderer.cpp
2016-02-29 18:03:00 +01:00
d37f8cc350
Merge pull request #141 from teamfisk/BoxModelCollision
...
Collision jittering + disappearing weapon
2016-02-29 17:13:34 +01:00
2c56b03b2b
Merge remote-tracking branch 'origin/master' into Kill-streak-sounds
2016-02-29 16:41:46 +01:00
4fd578c764
Removed logic that's no longer needed.
2016-02-29 16:26:09 +01:00
5bc0483f49
Removed AnimationOffset and improved BlendTree
2016-02-29 15:51:37 +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
7749fc5474
Small fixing up
2016-02-28 19:46:50 +01:00
6dd7f1a657
Buggy transparent shadows.
...
Transparent textures might glow.
2016-02-28 18:00:23 +01:00
William Moberg
viktorljung
stiffly
Teejoon
Tobias Dahl
FakeShemp
Jocke
Jace