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
e90f802d48
Merge remote-tracking branch 'origin/master' into Sound
2016-02-05 13:59:21 +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
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
71a86cab11
removed event that's not being used
2016-02-05 10:07:56 +01:00
b6e0332574
Fixed support for new animation structure, not done yet
2016-02-05 10:07:22 +01:00
c526a7af55
WIP stencil stuff
2016-02-04 17:58:36 +01:00
6a23a987b3
Started PickupSpawnSystem, added 2 events and a system
2016-02-04 17:43:45 +01:00
d50caa1763
Gain events tested. works as intended
2016-02-04 16:14:50 +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
7c582898f4
Working stencil buffer for the shield.
2016-02-04 14:33:39 +01:00
Jace
3a2b124cae
Replication flag in component definition. Component definitions should now inherit from Types/Component.xsd
2016-02-04 13:36:12 +01:00
Jace
02b69a86e7
Fixed DEBUG_IF
2016-02-04 13:36:11 +01:00
Jace
ff26e1235c
Merge pull request #77 from teamfisk/AMDCrashFix
...
AMD crash fix???????????
2016-02-04 12:05:05 +01:00
571c41589a
Merge remote-tracking branch 'origin/Importer' into Animations
2016-02-04 11:54:20 +01:00
35376178b1
WIP
2016-02-04 11:54:13 +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
774e17ffc9
Merge remote-tracking branch 'origin/master' into AssaultDash
2016-02-04 11:42:14 +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
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
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
6aec7555cc
WIP Waiting for importer
2016-02-04 11:13:33 +01:00
379d211832
some fixes with the stencil states and implemented stencil func/stencilop/stencilmask to renderstate
2016-02-04 11:13:26 +01:00
0a8ee1623f
Merge remote-tracking branch 'origin/master' into Sound
...
# Conflicts:
# assets
2016-02-04 10:47:30 +01:00
03a16b46b5
Dash component now has the dash-maxCoolDownVariable in it.
2016-02-04 10:28:28 +01:00
0bbaf1d576
Oops! Removed DebugCode...
2016-02-04 10:04:44 +01:00
bc01e147c2
Some state stuff, some draw stuff, some QA map stuff
2016-02-03 18:09:44 +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
2e3e59a1e2
Merge remote-tracking branch 'origin/master' into Sound
...
# Conflicts:
# resources/Schema/Entities/Player.xml
2016-02-03 16:52:33 +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
c2833b10c4
Hard coded (read retarded) improvements added to player walk logic
2016-02-03 15:55:32 +01:00
938caa6ba2
Now uses OnComponentAttached event. Can now queue sound on a source.
2016-02-03 15:48:25 +01:00
13161b4f57
Merge remote-tracking branch 'origin/master' into AssaultDash
2016-02-03 15:07:19 +01:00
5665c0f298
Models with Shield and shielded component now added to queues
2016-02-03 14:20:47 +01:00
7ffbd8455f
Added Queues for the models with shield and shielded components.
2016-02-03 13:53:57 +01:00
83713b3b6d
Renamde ShieldComponent since Component should not be in the name. Added Shielded component that will be put on objects that should be hidden behind shields.
2016-02-03 13:27:46 +01:00
7bae2d0873
Added a ShieldComponent and a test area in QA map for defender shield
2016-02-03 11:58:06 +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
2961f198b3
PlayerDeathSystem is now working well. Changed so the model is oriented correctly. Changed so camera is behind the player. Copied the current animation and froze it.
2016-02-03 11:48:22 +01:00
William Moberg
stiffly
Teejoon
viktorljung
Tleety
verysecrethero
Jace
antc13