d61e605093
Can walk up "stair-steps". Cleanup WIP.
...
Better performance in RectanglevsTriangle check.
Added IsOnGround flag and VerticalStepHeight in Physics.
Lotsa commented code saved for historical reasons, remove later.
2016-02-05 10:56:34 +01:00
796e3eac79
Merge branch 'master' into BoxModelCollision
2016-02-02 10:16:48 +01:00
Jace
a3d4eb65d5
Fixes #66 warnings
2016-02-01 17:53:01 +01:00
5a45f778e6
Fixed so players don't teleport to (NaN, NaN, NaN) on spawning.
2016-02-01 17:01:58 +01:00
30ad238697
Merge branch 'master' into BoxModelCollision
2016-02-01 16:17:10 +01:00
Jace
be3cfef65f
Merge remote-tracking branch 'origin/master' into EditorUsefulness
...
# Conflicts:
# src/Engine/Rendering/DrawFinalPass.cpp
2016-02-01 16:00:46 +01:00
Jace
65f5bc673f
Functional translation widget in global and local space
2016-02-01 15:47:56 +01:00
d7b02e79c8
Merge branch 'master' into BoxModelCollision
...
# Conflicts:
# include/Engine/Collision/CollisionSystem.h
# src/Engine/Collision/CollisionSystem.cpp
2016-02-01 13:48:05 +01:00
Jace
a22bc00d46
*cough*
2016-02-01 13:37:51 +01:00
76274c326e
Fixed going through flat large triangles. Velocity affected by collision.
2016-02-01 13:34:39 +01:00
Jace
ee92200300
Improved editor pause logic. Editor now pauses when it's enabled and makes sure UI is up to date with the current state.
2016-02-01 10:45:37 +01:00
Jace
65da634c71
File dropping into resource paths in the editor
2016-01-27 17:51:47 +01:00
Jace
4b7613a659
Sorted editor component dropdown and made it always be fully expanded to show as many components as possible
2016-01-27 17:07:48 +01:00
Jace
7408da401b
Merge pull request #56 from teamfisk/NormalSpecularMapping
...
Transparency fix and support for Normal and Specular maps
2016-01-27 16:44:10 +01:00
Jace
788407b709
Made CollisionSystem aware of entities
2016-01-27 15:42:50 +01:00
0e70dc6fa3
Merge remote-tracking branch 'origin/master' into NormalSpecularMapping
...
# Conflicts:
# include/Engine/Rendering/RenderSystem.h
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/RenderSystem.cpp
2016-01-27 15:41:31 +01:00
44302bb0f3
Specular support. Some edits to EditorTestWorld.xml aswell as some debugmodes for textures in the model component
2016-01-27 15:38:54 +01:00
Jace
181017313d
Made entity parser give more useful errors and fixed the errors that were while I was at it
2016-01-27 15:16:59 +01:00
a954cbbf50
Normal map support
2016-01-27 13:52:27 +01:00
Jace
dec2234019
Merge branch 'Cleanup'
...
# Conflicts:
# src/Engine/Rendering/RenderSystem.cpp
2016-01-27 13:44:15 +01:00
Jace
0334ec3fa7
Merge remote-tracking branch 'origin/Animations'
...
# Conflicts:
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Game/Systems/WeaponSystem.cpp
2016-01-27 13:36:49 +01:00
Jace
5fcd26cd3e
Made TriggerSystem make use of Octree
2016-01-27 13:35:16 +01:00
8102f3a2ea
Working transparency in most common cases.
...
Transparency check is automatically set if the alpha color value is under 1
2016-01-27 12:59:44 +01:00
cbb17d22d4
WIP
2016-01-27 12:10:00 +01:00
Jace
8bed5194d8
"Proper" handling of conditional rendering of entities parented to camera or entities that should be hidden from the active local player perspective
2016-01-27 11:36:24 +01:00
90f05442aa
Merge branch 'master' into BoxModelCollision
...
# Conflicts:
# include/Engine/Core/Octree.h
# resources/Schema/Entities/CollisionTestLevel.xml
# src/Engine/Collision/CollisionSystem.cpp
# src/Engine/Core/Octree.cpp
2016-01-27 10:52:27 +01:00
Jace
7e12d00874
Merge branch 'master' into CoolDeathAnimation
...
# Conflicts:
# include/Engine/Rendering/ModelJob.h
# resources/Shaders/ForwardPlus.frag.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/RenderSystem.cpp
2016-01-27 10:43:23 +01:00
6ea490e215
Tried a horrible recursive method, extreme framedrop.
2016-01-27 10:34:26 +01:00
Jace
505a6c7396
Hiding first person models properly
2016-01-25 14:32:48 +01:00
Jace
8866dd6054
Merge remote-tracking branch 'origin/Networking' into ShootRays
2016-01-25 11:57:44 +01:00
Jace
b6fd18baed
Hacked in serverside effects
2016-01-25 11:56:40 +01:00
Jace
4245264029
Weapon RayZ
...
Weapon RayZ
2016-01-25 11:26:33 +01:00
d12246833e
Some further small fizes to resolution //Tobias
2016-01-25 01:26:41 +01:00
44baa47bba
Merge remote-tracking branch 'origin/master' into CoolDeathAnimation
...
# Conflicts:
# include/Engine/Common.h
# include/Engine/Rendering/DrawFinalPass.h
# include/Engine/Rendering/DrawScenePass.h
# include/Engine/Rendering/RenderQueue.h
# include/Engine/Rendering/Renderer.h
# resources/Shaders/ForwardPlus.frag.glsl
# resources/Shaders/ForwardPlus.vert.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/DrawScenePass.cpp
# src/Engine/Rendering/RenderSystem.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
2016-01-25 01:21:15 +01:00
Jace
b95c1fdfa4
Merge remote-tracking branch 'origin/Menu'
...
# Conflicts:
# include/Engine/Rendering/ModelJob.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/Player.xml
# resources/Schema/Entities/RenderingWorld.xml
# src/Game/Game.cpp
2016-01-25 00:25:03 +01:00
6aeb281249
Resolution fix in render stages //Tobias
2016-01-25 00:07:17 +01:00
Jace
d6cc1eaac4
Merge remote-tracking branch 'origin/Animations'
2016-01-24 23:06:59 +01:00
Jace
d0de169613
Instagib!
2016-01-24 23:05:52 +01:00
Jace
b6ba8a5bd7
Network snapshot buffer size increased, needs to be looked over later
2016-01-24 23:05:26 +01:00
f8b9606cdf
Picking animation fix
2016-01-24 22:59:53 +01:00
84fddf02e2
Merge remote-tracking branch 'origin/master' into Animations
2016-01-24 22:42:12 +01:00
d03b3fb071
Merge remote-tracking branch 'origin/master' into Menu
...
# Conflicts:
# resources/Schema/Entities/Player.xml
2016-01-24 22:23:53 +01:00
06f64f8fbf
Added a player name to the PlayerSpawned event. When a player has spawned the server sends the name to the client which publishes the event.
2016-01-24 22:00:38 +01:00
Jace
0c56a05144
Merge branch 'master' of github.com:teamfisk/TacticalZ
...
# Conflicts:
# resources/Schema/Entities/Player.xml
# src/Engine/Network/Server.cpp
2016-01-24 21:21:51 +01:00
Jace
382eff169f
Server refactoring to remove player dependency and lots of fixes.
2016-01-24 21:20:43 +01:00
a304b00038
fixed crashes
2016-01-24 21:12:41 +01:00
ada1bac2a7
Merge remote-tracking branch 'origin/master' into Menu
...
# Conflicts:
# include/Engine/Rendering/RenderSystem.h
# resources/Schema/Entities/RenderingWorld.xml
# resources/Shaders/ForwardPlus.frag.glsl
# src/Engine/Rendering/RenderSystem.cpp
2016-01-24 20:48:17 +01:00
Jace
0fb1dbcae1
Client now has authority over its own absolute position and orientation until we have reliable input messaging
2016-01-24 19:00:50 +01:00
Jace
b4081b3e45
Merge remote-tracking branch 'origin/Networking'
...
# Conflicts:
# src/Engine/Network/Client.cpp
# src/Game/Systems/WeaponSystem.cpp
2016-01-24 18:36:37 +01:00
8cf9caf7aa
AnimationSystem working
2016-01-24 18:31:23 +01:00
William Moberg
Jace
Tleety
viktorljung
stiffly