Jocke
cb7beae28c
Only do physics and collision calculations on the clients side, and only for their own entity.
2016-03-03 11:39:00 +01:00
William Moberg
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
William Moberg
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
William Moberg
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
William Moberg
89d0d5753f
Fix for player teleporting to (0,0,0). Saves player previous position in CollisionSystem instead of Physics component so it won't be saved when editing Players.
2016-02-25 16:16:24 +01:00
William Moberg
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
viktorljung
afebf879a0
Merge fixes
2016-02-10 13:44:47 +01:00
William Moberg
6610bb974d
Only apply air friction if the ground is never hit during the frame.
2016-02-08 13:32:45 +01:00
William Moberg
4fe9e4f1c3
Debug cleanup and some bug fixes.
2016-02-05 14:38:08 +01:00
William Moberg
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
William Moberg
3cfbbbbf54
CollisionSystem now utilizes Octree for collision detection.
2016-02-01 16:13:48 +01:00
Jace
788407b709
Made CollisionSystem aware of entities
2016-01-27 15:42:50 +01:00
Jace
5fcd26cd3e
Made TriggerSystem make use of Octree
2016-01-27 13:35:16 +01:00
Jace
373bb33cf0
Player jumping taking air acceleration into account
2016-01-24 15:20:34 +01:00
Jace
a6548a72b3
Merge remote-tracking branch 'origin/master' into EditorUsefulness
...
# Conflicts:
# include/Engine/Collision/CollidableOctreeSystem.h
# include/Engine/Collision/CollisionSystem.h
# include/Engine/Collision/TriggerSystem.h
# include/Engine/Rendering/RenderSystem.h
# include/Game/Systems/PlayerSystem.h
# resources/Schema/Components/Physics.xsd
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/RenderSystem.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
# src/Game/Systems/HealthSystem.cpp
# src/Game/Systems/PlayerSystem.cpp
# src/Tests/OctTreeTestGameClass.cpp
2016-01-21 16:16:35 +01:00
William Moberg
713ebbe18c
Can add any objects that inherit from AABB into the Octree.
2016-01-19 14:50:46 +01:00
Jace
51979d7f0c
Changed System to take World through constructor and store it instead, cause it makes more sense.
2016-01-18 23:59:33 +01:00
William Moberg
0669d91767
CollisionSystem loops over Collidable components.
2016-01-18 13:29:10 +01:00
Jace
6ad1839def
Initial work on PlayerMovementSystem
2016-01-14 17:03:48 +01:00
Jace
d34470256b
EntityWrapper to uniquely identify entities and make using them a little easier
2016-01-14 15:43:19 +01:00
Jace
71d936f8d1
Start of a movement system with collisions against AABBs
2016-01-14 14:54:12 +01:00
Jace
d6ef527f25
Basic collisions using Octree. Seems buggy over octree boundaries.
2016-01-13 15:34:43 +01:00
William Moberg
fa8775a72e
Renamed vars and added some comments.
2016-01-07 10:28:18 +01:00
William Moberg
6d1cbd928e
Improved collision logic, still not perfect since it updates before PlayerSystem.
2015-12-16 16:34:27 +01:00
William Moberg
cf0ff9bfe5
Simple quickly made CollisionSystem.
2015-12-16 12:23:08 +01:00
William Moberg
e2417be8c7
Very simple CollisionSystem made, 'Z','Y' to toggle on/off.
2015-12-15 15:36:28 +01:00
William Moberg
59095c2ce5
Started on CollisionSystem and TriggerSystem. Moved collision code to Collision folder.
2015-12-14 17:08:00 +01:00