43719f8304
Added texture tiling to shaders (exkluding ExplosinEffects)
2016-02-07 15:27:26 +01:00
92ab22e779
Splatmapping now working.
...
Rendering pipleline now support 3 different types of Material:
Basic: a material with a single color on every property (diffuse, specular, ect).
SingleTextures: a material with a single texture in all or any property. Have a single color on the rest.
SplatMapping: has a SplatMap and 0 to 5 different textures to every property. Properties with o texture uses a single color insted.
All materials with a texture has a UVRepeat, telling how many time to till in U and in V.
modelJobs now uses ShadeID, ModelID and TextureID for the Hash insted of only Texture
MayaExported exports 3 differnt types of material, the same as the piplen now supports.
2016-02-07 13:39:13 +01:00
ceab837e27
Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer
...
Conflicts:
include/Engine/Rendering/RawModelCustom.h
src/Engine/Rendering/RawModelCustom.cpp
src/Engine/Rendering/Skeleton.cpp
2016-02-05 13:59:01 +01:00
d1a309be10
Now supports reading of 3 different types of materials
2016-02-05 13:51:47 +01:00
c272857819
Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer
...
Conflicts:
src/Engine/Rendering/RawModelCustom.cpp
tools/MayaExporter/MayaExporter/Skeleton.cpp
2016-02-04 15:05:00 +01:00
336b058c9f
WIP, commit to be able to pull stuff down
2016-02-04 14:58:46 +01:00
Jace
ff26e1235c
Merge pull request #77 from teamfisk/AMDCrashFix
...
AMD crash fix???????????
2016-02-04 12:05:05 +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
84499665d0
Changed vertices to skinnedVertices in RawModelCustom.cpp
2016-02-04 11:53:17 +01:00
Jace
c87e4d4fd6
Added mutex to resource manager cache reading to avoid a potential race condition. We hope this is the actual bug we saw.
2016-02-04 11:53:11 +01:00
d4292d4b43
Merge pull request #63 from teamfisk/AssaultDash
...
Added AssaultDash
2016-02-04 11:50:00 +01:00
035c79564b
Changed Dash name to DashAbility. Fixed dash bug where you could do two different keys to dash.
2016-02-04 11:41:21 +01:00
afa4f425a8
Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer
2016-02-04 11:26:23 +01:00
356cf72b0f
Changed the structure of the Animation Data in both Exporter & Importer.
2016-02-04 11:25:31 +01:00
03a16b46b5
Dash component now has the dash-maxCoolDownVariable in it.
2016-02-04 10:28:28 +01:00
1bd4aa91ff
Oops! Readded "Sprint" command. Removed some unnecessary variables in FirstPersonInputController. Fixed bug where you couldnt dash right away as the game started.
2016-02-03 17:45:37 +01:00
7b5a2a5388
Dashing now works great both with shift and doubletap. Added Dash Component. Changed default Player.xml to have a Dash Component. Disabled Sprint. You can now disable DoubleTapToDash in Input.Ini. Added command "SpecialAbility".
2016-02-03 17:30:46 +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
13161b4f57
Merge remote-tracking branch 'origin/master' into AssaultDash
2016-02-03 15:07:19 +01:00
9d3171540d
AssaultDashCheck is now in FirstPersonInputController instead. TODO: config option, shift button, forward/backward dash
2016-02-03 11:54:14 +01:00
2391a0dbe9
Merge remote-tracking branch 'origin/master' into AssaultDash
2016-02-03 11:51:26 +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
Jace
192de80782
Merge pull request #75 from teamfisk/NormalSpecularMapping
...
Normal specular mapping
2016-02-03 10:34:22 +01:00
51a588657e
QA map change
2016-02-03 10:11:53 +01:00
73ab9bb4c6
Merge remote-tracking branch 'origin/master' into AssaultDash
...
# Conflicts:
# src/Game/Systems/PlayerMovementSystem.cpp
2016-02-03 09:52:54 +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
da49dc35ee
Added stuff to .gitignore file
2016-02-02 17:31:19 +01:00
d99bf60510
Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer
2016-02-02 17:22:06 +01:00
9cb41fcebe
Fixed the exported animation matrices
2016-02-02 17:21:51 +01:00
11025b5466
QA-map stuff
2016-02-02 17:19:58 +01:00
4357759715
Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer
2016-02-02 17:18:54 +01:00
bb4a65a1db
Non-skined mesh WIP
2016-02-02 17:18:42 +01:00
eba36b8492
Some QA-map fixes
2016-02-02 17:12:14 +01:00
55854f5c0d
Merge remote-tracking branch 'origin/master' into NormalSpecularMapping
2016-02-02 16:30:57 +01:00
12a181c1ff
Fixed a bug where normals scaled with model scale. Again.
2016-02-02 16:11:03 +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
Jace
24aac6a00d
Merge pull request #62 from teamfisk/DoubleJump
...
You can now DoubleJump!
2016-02-02 15:31:03 +01:00
45a92b362f
DoubleJumping now in InputController instead.
2016-02-02 15:10:11 +01:00
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
e8186a7062
Changed the way we're exporting animations.
2016-02-02 14:47:22 +01:00
2085d9ec9e
Merge remote-tracking branch 'origin/master' into DoubleJump
2016-02-02 14:22:00 +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
28d412f5c7
Some small changes to test world and assets
2016-02-02 13:24:18 +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
9c2e459e0c
Deatheffect color now correctly calculated
2016-02-02 10:58:00 +01:00
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
Teejoon
Jace
antc13
verysecrethero
Tleety
Jocke