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

1835 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
stiffly 71a86cab11 removed event that's not being used 2016-02-05 10:07:56 +01:00
viktorljung b6e0332574 Fixed support for new animation structure, not done yet 2016-02-05 10:07:22 +01:00
Tleety c526a7af55 WIP stencil stuff 2016-02-04 17:58:36 +01:00
verysecrethero 6a23a987b3 Started PickupSpawnSystem, added 2 events and a system 2016-02-04 17:43:45 +01:00
verysecrethero 047e71a4e1 Added BoostAssault,BoostDefender components. Added their effects in HealthSystem,PlayerMovementSystem 2016-02-04 16:18:54 +01:00
stiffly d50caa1763 Gain events tested. works as intended 2016-02-04 16:14:50 +01:00
Jocke 9232b24a7b WIP Reliable message 2016-02-04 15:49:04 +01:00
Teejoon 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
Teejoon 336b058c9f WIP, commit to be able to pull stuff down 2016-02-04 14:58:46 +01:00
Tleety 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
viktorljung 571c41589a Merge remote-tracking branch 'origin/Importer' into Animations 2016-02-04 11:54:20 +01:00
viktorljung 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
antc13 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
verysecrethero d4292d4b43 Merge pull request #63 from teamfisk/AssaultDash 
Added AssaultDash
 2016-02-04 11:50:00 +01:00
verysecrethero 774e17ffc9 Merge remote-tracking branch 'origin/master' into AssaultDash 2016-02-04 11:42:14 +01:00
verysecrethero 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
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
Tleety 379d211832 some fixes with the stencil states and implemented stencil func/stencilop/stencilmask to renderstate 2016-02-04 11:13:26 +01:00
stiffly 0a8ee1623f Merge remote-tracking branch 'origin/master' into Sound 
# Conflicts:
#	assets
 2016-02-04 10:47:30 +01:00
verysecrethero 03a16b46b5 Dash component now has the dash-maxCoolDownVariable in it. 2016-02-04 10:28:28 +01:00
verysecrethero 0bbaf1d576 Oops! Removed DebugCode... 2016-02-04 10:04:44 +01:00
Tleety bc01e147c2 Some state stuff, some draw stuff, some QA map stuff 2016-02-03 18:09:44 +01:00
verysecrethero 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
verysecrethero 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
stiffly 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 192de80782, reversing
changes made to 24aac6a00d.
 2016-02-03 16:16:06 +01:00
stiffly c2833b10c4 Hard coded (read retarded) improvements added to player walk logic 2016-02-03 15:55:32 +01:00
stiffly 938caa6ba2 Now uses OnComponentAttached event. Can now queue sound on a source. 2016-02-03 15:48:25 +01:00
verysecrethero 13161b4f57 Merge remote-tracking branch 'origin/master' into AssaultDash 2016-02-03 15:07:19 +01:00
Tleety 5665c0f298 Models with Shield and shielded component now added to queues 2016-02-03 14:20:47 +01:00
Tleety 7ffbd8455f Added Queues for the models with shield and shielded components. 2016-02-03 13:53:57 +01:00
Tleety 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
Tleety 7bae2d0873 Added a ShieldComponent and a test area in QA map for defender shield 2016-02-03 11:58:06 +01:00
verysecrethero 9d3171540d AssaultDashCheck is now in FirstPersonInputController instead. TODO: config option, shift button, forward/backward dash 2016-02-03 11:54:14 +01:00
verysecrethero 2391a0dbe9 Merge remote-tracking branch 'origin/master' into AssaultDash 2016-02-03 11:51:26 +01:00
verysecrethero 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
Tleety 455e59a04f Made the TEMPORARY capture point boxes transparent. 2016-02-03 11:39:18 +01:00
verysecrethero 39653a1e4c Merge remote-tracking branch 'origin/master' into 3rdPersonDeathCam 2016-02-03 10:38:21 +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
Jocke 7bf4f5c30e Merge remote-tracking branch 'origin/master' into TCPConnections 2016-02-03 10:29:36 +01:00