BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
900 Commits 116 Branches 0 Tags
2733efdc0df673f59d5a6bd5cb51f84ed233c799
Commit Graph

900 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
viktorljung 2733efdc0d Merge remote-tracking branch 'origin/Importer' into Animations 
# Conflicts:
#	include/Engine/Rendering/Skeleton.h
#	src/Engine/Rendering/RawModelCustom.cpp
#	src/Engine/Rendering/Skeleton.cpp
 2016-02-04 11:32:44 +01:00
antc13 afa4f425a8 Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer 2016-02-04 11:26:23 +01:00
antc13 356cf72b0f Changed the structure of the Animation Data in both Exporter & Importer. 2016-02-04 11:25:31 +01:00
viktorljung 6aec7555cc WIP Waiting for importer 2016-02-04 11:13:33 +01:00
Teejoon da49dc35ee Added stuff to .gitignore file 2016-02-02 17:31:19 +01:00
antc13 d99bf60510 Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer 2016-02-02 17:22:06 +01:00
antc13 9cb41fcebe Fixed the exported animation matrices 2016-02-02 17:21:51 +01:00
Teejoon 4357759715 Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer 2016-02-02 17:18:54 +01:00
Teejoon bb4a65a1db Non-skined mesh WIP 2016-02-02 17:18:42 +01:00
viktorljung 89bc063ef0 Merge remote-tracking branch 'origin/Importer' into Animations 
# Conflicts:
#	src/Engine/Rendering/DrawFinalPass.cpp
 2016-02-02 15:01:34 +01:00
viktorljung dba2fbdc0c WIP 2016-02-02 14:52:31 +01:00
antc13 69bb17aa90 Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer 
# Conflicts:
#	tools/MayaExporter/MayaExporter/Skeleton.cpp
 2016-02-02 14:50:01 +01:00
antc13 e8186a7062 Changed the way we're exporting animations. 2016-02-02 14:47:22 +01:00
Teejoon 9573958a86 Fixed Git's shitty merge in Skeleton.cpp and The Exporter now Exports meshes with and without skins 2016-02-02 10:19:00 +01:00
antc13 210e11e659 Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer 2016-02-01 18:08:22 +01:00
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
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
viktorljung 6ba87d2942 Fixed, Crash when trying to animate a model that doesn't contain animations 2016-02-01 10:42:23 +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
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
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
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
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
Tleety 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
Tleety 5c9616d4af Fixed asset name 2016-01-27 13:55:23 +01:00
Tleety 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
Tleety 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
Tleety 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
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
antc13 57a5cb58e1 Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer 2016-01-27 09:37:14 +01:00
antc13 c5b1afb0d4 Exporter Fix 2016-01-27 09:37:01 +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