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
c4fb604617
Merge branch 'BoxModelCollision' of github.com:teamfisk/TacticalZ into BoxModelCollision
2016-02-02 17:36:50 +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
Jace
563fd4082e
Updated movement test for model collisions
2016-02-02 12:10:39 +01:00
796e3eac79
Merge branch 'master' into BoxModelCollision
2016-02-02 10:16:48 +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
Jace
9b2a4be707
Merge pull request #71 from teamfisk/Warnings-Adam
...
Warnings adam
2016-02-01 17:52:18 +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
Jace
0a43f8104e
Added _CRT_SECURE_NO_WARNINGS definition compiling with MSVC
2016-02-01 16:31:01 +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
ca8b7cbee8
Merge pull request #65 from teamfisk/EditorUsefulness
...
Editor usefulness
2016-02-01 16:13:37 +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
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
Jace
65da634c71
File dropping into resource paths in the editor
2016-01-27 17:51:47 +01:00
Jace
c519ba2536
Component fields in the editor are now sorted in the order they're defined
2016-01-27 17:12:07 +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
a63ecb8133
Some wierd shader faults and merge error fixe
2016-01-27 15:54:36 +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
Jace
6615fe9438
Enabled multithreaded build for MSVC
2016-01-27 15:09:34 +01:00
Jace
113448dbf0
Added DEBUG preprocessor definition in Debug and RelWithDebInfo mode
2016-01-27 15:09:23 +01:00
5c9616d4af
Fixed asset name
2016-01-27 13:55:23 +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
eb42217885
Merge pull request #38 from teamfisk/CoolDeathAnimation
...
Cool death animation
2016-01-27 10:51:22 +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
William Moberg
Jace
stiffly
Tleety