b9d6d59c62
Merge branch 'BoxModelCollision' into FrustumCulling
...
# Conflicts:
# src/Game/Game.cpp
2016-02-09 15:03:13 +01:00
b30891aecd
WIP, debugging code added, still not working.
2016-02-09 15:00:30 +01:00
b748deb1e1
WIP FrustumCulling, most code added but not working now.
2016-02-09 10:05:49 +01:00
93c6f3c0a3
AABBs are auto attached when adding Trigger/Collideable/etc, also added AttachComponent method to ComponentWrapper.
2016-02-08 14:34:37 +01:00
11cf85cc73
Renamed CollidableOctreeSystem to FillOctreeSystem.
2016-02-08 14:17:19 +01:00
6610bb974d
Only apply air friction if the ground is never hit during the frame.
2016-02-08 13:32:45 +01:00
e3a44d37d2
Merge branch 'master' into BoxModelCollision
...
# Conflicts:
# src/Game/Systems/PlayerMovementSystem.cpp
2016-02-05 14:59:14 +01:00
428dca003d
Tiny bug fix.
2016-02-05 14:40:50 +01:00
4fe9e4f1c3
Debug cleanup and some bug fixes.
2016-02-05 14:38:08 +01:00
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
Jace
6990e473b3
Adding a clear here makes AMD drivers NOT crash for some reason. We're fixing the symptom but not the underlying cause.
2016-02-04 11:53:35 +01:00
Jace
bd2da7bc9f
Revert "Revert "Merge pull request #75 from teamfisk/NormalSpecularMapping""
...
This reverts commit b56824786c
2016-02-03 16:30:00 +01:00
Jace
b56824786c
Revert "Merge pull request #75 from teamfisk/NormalSpecularMapping"
...
This reverts commit 192de8078224aac6a00d
2016-02-03 16:16:06 +01:00
Jace
2cbeef4c69
Merge pull request #74 from teamfisk/Warnings-Jocke
...
Fixed warnings associated with Network
2016-02-03 10:37:10 +01:00
73716c28e2
pickpass fix
2016-02-02 17:40:22 +01:00
a3b7bd7df5
Fix in picking pass, QA map fix. Blue and red ray change. Player weapon change.
2016-02-02 17:39:57 +01:00
214dad2afc
Removed commented code.
2016-02-02 17:25:59 +01:00
affcc5305b
Collision affects velocity correctly, no wierd ice cream sliding along walls.
2016-02-02 17:19:59 +01:00
55854f5c0d
Merge remote-tracking branch 'origin/master' into NormalSpecularMapping
2016-02-02 16:30:57 +01:00
b131f56f5e
Made a quality assurance world that will need to be used before creating a pull request
2016-02-02 16:06:42 +01:00
6a3f585fb9
Fixed warnings associated with Network.cpp, Client.cpp, Server.cpp and Packet.cpp.
...
BOOST_ASIO_ERROR_CATEGORY_NOEXCEPT': macro redefinition was fixed by https://svn.boost.org/trac/boost/ticket/11539
2016-02-02 13:26:15 +01:00
7b4826cb44
Merge remote-tracking branch 'origin/master' into NormalSpecularMapping
2016-02-02 13:24:31 +01:00
Jace
0e5f6da9a9
Merge pull request #73 from teamfisk/CapturePointFixBranch
...
Several changes/fixes based on the latest broken refactoring in master
2016-02-02 13:22:03 +01:00
42b52a6766
Several changes/fixes based on the latest broken refactoring.
...
Fixed Simon's mistake in CapturePointLogic. William fixed so TriggerSystem works again with CapturePoints.
2016-02-02 11:37:22 +01:00
796e3eac79
Merge branch 'master' into BoxModelCollision
2016-02-02 10:16:48 +01:00
8299b99e2f
Test world changes and some other small fixes
2016-02-01 19:08:46 +01:00
c708f1582c
Merge remote-tracking branch 'origin/master' into NormalSpecularMapping
2016-02-01 18:30:30 +01:00
782c1a388a
Comment
2016-02-01 18:23:40 +01:00
a188a3f7fa
Removed widget pointlight since it is now redundant
2016-02-01 18:22:36 +01:00
ed7d00c1d8
Bug where widgets did not get their ambient light now fixed.
2016-02-01 18:19:38 +01:00
30b1dab764
More efficient collision resolution case + comments.
2016-02-01 18:06:28 +01:00
Jace
9090be8acf
Merge branch 'Warnings-Simon'
2016-02-01 17:53:55 +01:00
Jace
a3d4eb65d5
Fixes #66 warnings
2016-02-01 17:53:01 +01:00
5474a18753
#68 Fixed warning in SoundSystem.cpp
2016-02-01 17:15:51 +01:00
5a45f778e6
Fixed so players don't teleport to (NaN, NaN, NaN) on spawning.
2016-02-01 17:01:58 +01:00
53cae25eb2
WIP on widget fuckery
2016-02-01 16:56:55 +01:00
30ad238697
Merge branch 'master' into BoxModelCollision
2016-02-01 16:17:10 +01:00
3cfbbbbf54
CollisionSystem now utilizes Octree for collision detection.
2016-02-01 16:13:48 +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
5bfcffc142
Fixed widget movement calculations going weird when world origin wasn't on screen
2016-02-01 11:56:21 +01:00
7054822be2
SceneLight component now working
2016-02-01 11:12:03 +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
d3b1053f21
Fixes #59
2016-02-01 10:29:59 +01:00
Jace
13f020ddf5
Fixed #49 being able to parent an entity to itself, which resulted in infinite infinite loops everywhere! D:
2016-01-27 18:37:43 +01:00
8bcafc1151
WIP
2016-01-27 18:07:05 +01:00
Jace
65da634c71
File dropping into resource paths in the editor
2016-01-27 17:51:47 +01:00
William Moberg
Jace
Tleety
Jocke
verysecrethero
stiffly