68332102ea
Can now blend non unique nodes
2016-03-03 21:20:55 +01:00
a3494b92c8
Blending queues now working
2016-03-03 17:48:25 +01:00
8957b0b464
Merge remote-tracking branch 'origin/master' into Animations
2016-03-03 14:05:43 +01:00
362378536e
Switching rooms
2016-03-03 01:39:12 +01:00
Jace
7624c6ee0a
Updated all uses of EntityXMLFile to use the new EntityFile to load entities into a world.
2016-03-02 20:12:59 +01:00
Jace
3ef15dcb81
EntityFile now releases EntityXMLFile after processing.
2016-03-02 20:01:18 +01:00
Jace
069583e09f
Created EntityFile which loads an EntityXMLFile into a temporary world to be merged with another world when you want to create a copy of the entity loaded from disk. This allows us to free EntityXMLFile once it's loaded into an EntityFile.
2016-03-02 19:52:11 +01:00
Jace
44b4a597d4
fixup! Created World::Merge which will merge a world into another one
2016-03-02 19:50:52 +01:00
Jace
618e96da90
"Fixed" this crash in debug. The attachment vector is sometimes empty! @Tleety
2016-03-02 19:49:54 +01:00
Jace
26d6546d79
Renamed EntityFile to EntityXMLFile to be able to separate file parsing from entity creation
2016-03-02 18:53:40 +01:00
Jace
62c8196ad4
Created World::Merge which will merge a world into another one
2016-03-02 18:53:39 +01:00
e6b3bbeb54
Merge remote-tracking branch 'origin/master' into Respawning
...
# Conflicts:
# resources/Schema/Types/Entity.xsd
2016-03-02 17:50:59 +01:00
e9bbb5ed2a
Fixed BlendTree crash when animation nodes are null
2016-03-02 17:42:55 +01:00
267c007291
Removed unnecessary comments, variables and functions.
2016-03-02 17:39:27 +01:00
d8a0e69ff0
fixup! AutoAnimationBlend now working correctly for unique nodes, Commited debug code
2016-03-02 17:11:18 +01:00
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
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
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
ef66f3ebe5
Transparancy with shild fix
2016-03-01 23:14:23 +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
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
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
d37f8cc350
Merge pull request #141 from teamfisk/BoxModelCollision
...
Collision jittering + disappearing weapon
2016-02-29 17:13:34 +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
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
viktorljung
Jace
William Moberg
stiffly
Tobias Dahl
Teejoon
Jocke