BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,238 Commits 116 Branches 0 Tags
CapturePointColorFix
Commit Graph

1238 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Teejoon bbbebe077b Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer 
Conflicts:
	tools/MayaExporter/MayaExporter/Skeleton.cpp
 2016-02-01 18:06:35 +01:00
William Moberg 30b1dab764 More efficient collision resolution case + comments. 2016-02-01 18:06:28 +01:00
Teejoon 4d19158600 No longer need to key frame joins for exporting. Also don't save animations between exports 2016-02-01 18:04:16 +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
stiffly 5474a18753 #68 Fixed warning in SoundSystem.cpp 2016-02-01 17:15:51 +01:00
stiffly 4dcf5a8fa0 #68 fixed warning. 2016-02-01 17:05:15 +01:00
stiffly 4ccda5ee43 WIP 2016-02-01 17:03:41 +01:00
William Moberg 5a45f778e6 Fixed so players don't teleport to (NaN, NaN, NaN) on spawning. 2016-02-01 17:01:58 +01:00
Tleety 53cae25eb2 WIP on widget fuckery 2016-02-01 16:56:55 +01:00
Jace 0a43f8104e Added _CRT_SECURE_NO_WARNINGS definition compiling with MSVC 2016-02-01 16:31:01 +01:00
William Moberg 30ad238697 Merge branch 'master' into BoxModelCollision 2016-02-01 16:17:10 +01:00
William Moberg 3cfbbbbf54 CollisionSystem now utilizes Octree for collision detection. 2016-02-01 16:13:48 +01:00
Adam Byléhn 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
stiffly c5462b0363 Merge remote-tracking branch 'origin/master' into Sound 2016-02-01 14:35:47 +01:00
stiffly 25b3c02d29 Adding sounds for: jump, walk, shoot 2016-02-01 14:35:23 +01:00
William Moberg 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
William Moberg 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
Tleety 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
viktorljung 6ba87d2942 Fixed, Crash when trying to animate a model that doesn't contain animations 2016-02-01 10:42:23 +01:00
Jace d3b1053f21 Fixes #59 2016-02-01 10:29:59 +01:00
viktorljung 51075aefc8 Model that has animations is now visible when it does not play an animation (T-pose) 2016-02-01 10:24:50 +01:00
verysecrethero 7987d4b27c Added AssaultDash and all its logic, including a doubletapkey. Doubletapkey could be made more generic. 2016-01-29 12:06:14 +01:00
verysecrethero 0c97ce7a4a You can now DoubleJump! 2016-01-29 10:12:49 +01:00
verysecrethero df05f1909b Completed the code to trigger the 3rd person camera on death. Cleaned up PlayerDeathSystem. Fixed HealthSystemTest. Removed the test for PlayerDeathSystem 2016-01-28 11:43:38 +01:00
antc13 2efbedd4b4 Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer 2016-01-27 18:46:03 +01:00
antc13 8834d5f7a0 Fixed Animation Export 2016-01-27 18:37:56 +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
Tleety 8bcafc1151 WIP 2016-01-27 18:07:05 +01:00
verysecrethero 7497ff39d2 Simon added Copy method to ComponentWrapper. Its being used in PlayerDeathSystem to copy model,animation,transform. TODO: 3rd person camera, cleanup, tests 2016-01-27 18:00:31 +01:00
Jace 65da634c71 File dropping into resource paths in the editor 2016-01-27 17:51:47 +01:00
viktorljung c9b982bc89 Added BoneAttachment to Entity.xsd 2016-01-27 17:31:57 +01:00
viktorljung 2ec5023752 Changed Animation and BoneAttachment "Name" field to "AnimationName" and "BoneName" 2016-01-27 17:27:34 +01:00
Tleety 97cbc55223 Some debug features for color corrections and glow strength fix. 2016-01-27 17:21:00 +01:00
viktorljung 405002777c Merge remote-tracking branch 'origin/EditorUsefulness' into Animations 
# Conflicts:
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/FastWorld.xml
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Game/Game.cpp
 2016-01-27 17:16:49 +01:00
viktorljung 8fc8d56ee1 Added BoneAttachment component 2016-01-27 17:14:16 +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
Tleety a63ecb8133 Some wierd shader faults and merge error fixe 2016-01-27 15:54:36 +01:00
stiffly 950f3f3cf7 Fixed last commit. Removed the wrong thing. 2016-01-27 15:43:40 +01:00
Jace 788407b709 Made CollisionSystem aware of entities 2016-01-27 15:42:50 +01:00
Tleety 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
stiffly 246f56c823 Removed brainless logic. 2016-01-27 15:40:01 +01:00