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

2076 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
antc13 e56f203f7c Removed unnecessary comment & added FloatingEffect to Schema/Types/Entity.xsd 2016-03-02 17:42:11 +01:00
stiffly 267c007291 Removed unnecessary comments, variables and functions. 2016-03-02 17:39:27 +01:00
Tleety 8b66d29adc Skeleton system for Boost icons 2016-03-02 17:32:45 +01:00
antc13 7d15313209 Added a FloatingEffectSystem to the game. Pickups now move up and down, if so desired. 2016-03-02 17:22:44 +01:00
Tleety a9a19193ad Component for Boost icons 2016-03-02 17:21:15 +01:00
verysecrethero f84d1ac4a1 Merge remote-tracking branch 'origin/master' into SniperSprintBranch 
# Conflicts:
#	include/Engine/Input/FirstPersonInputController.h
 2016-03-02 17:11:36 +01:00
viktorljung d8a0e69ff0 fixup! AutoAnimationBlend now working correctly for unique nodes, Commited debug code 2016-03-02 17:11:18 +01:00
William Moberg 53c520123a Uncommented code. 2016-03-02 17:06:53 +01:00
viktorljung 1aefa1dec6 AutoAnimationBlend now working correctly for unique nodes 2016-03-02 17:06:51 +01:00
Jocke 0a6653d079 Merge remote-tracking branch 'origin/master' into FixNetworkBugs 2016-03-02 17:06:24 +01:00
stiffly 92d5ec70ba Merge remote-tracking branch 'origin/master' into DashAbiltyEffect 2016-03-02 16:57:07 +01:00
stiffly 233a1d0990 The dash effect is now ignored on the local player, because it was annoying. Copies of yourself could be in your way. 2016-03-02 16:56:43 +01:00
William Moberg 4ef76f6c45 Merge branch 'master' into Respawning 
# Conflicts:
#	resources/Schema/Types/Entity.xsd
 2016-03-02 16:51:24 +01:00
Joachim Pettersson f8f4b4d939 Merge pull request #151 from teamfisk/CPArrow 
CapturePoint indicator HUD
 2016-03-02 16:48:52 +01:00
stiffly a5c086e389 Dash effect now working over network, by sending events. Similar to jump effect. 2016-03-02 16:48:38 +01:00
William Moberg 91dbbb9c11 Merge branch 'master' into Respawning 2016-03-02 16:47:55 +01:00
Tleety 78835f95d8 Removed comment 2016-03-02 16:47:30 +01:00
William Moberg dc10661e6b Respawn time now only displays numbers, centered below CPHUD. 2016-03-02 16:45:43 +01:00
Tobias Dahl 8a66b1e5c8 Merge pull request #119 from teamfisk/AssaultBoost 
BoostSystem
 2016-03-02 16:44:49 +01:00
verysecrethero 3c8df35be9 Merge remote-tracking branch 'origin/master' into AssaultBoost 
# Conflicts:
#	src/Game/Game.cpp
 2016-03-02 15:59:16 +01:00
Joachim Pettersson f761416e20 Merge pull request #152 from teamfisk/PickupBranch 
Added the already-at-maxammo/health-savetrigger for the PickupSystems
 2016-03-02 15:41:44 +01:00
Jocke 9161c11764 Changed m_ETriggerTouchVector for-loop so it wont break when an item triggers the condition. This is done to update all somePickup.DecreaseThisRespawnTimer's. 2016-03-02 15:31:42 +01:00
Tleety cdbc348cfa AbilityCooldownHUD should now correctly track cooldown for dash ability. 2016-03-02 14:46:37 +01:00
William Moberg 95078b6a4b Fix so client doesn't override the servers respawn time with its config file. Server or single player client can still override the component with the config RespawnTime. 2016-03-02 14:37:33 +01:00
Tleety 502a290d36 Merge branch 'master' into HUD-Timers 
# Conflicts:
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/PlayerRed.xml
#	resources/Schema/Types/Entity.xsd
 2016-03-02 14:22:13 +01:00
stiffly 1217b25d02 DashEffect will now spawn a player model behind the player that will fade out . 2016-03-02 14:15:20 +01:00
Tleety a2b938d8f6 Merge branch 'master' into CPArrow 
# Conflicts:
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Entities/PlayerRed.xml
 2016-03-02 13:58:44 +01:00
Tleety ab7fd89546 Should now correctly track if another player takes your last capture point 2016-03-02 13:56:35 +01:00
viktorljung 8422742a9e Merge remote-tracking branch 'origin/master' into Animations 
# Conflicts:
#	src/Engine/Rendering/DrawFinalPass.cpp
 2016-03-02 13:50:08 +01:00
William Moberg 06d60f9884 Merge branch 'master' into Respawning 2016-03-02 13:47:03 +01:00
William Moberg 629ebb871f SpectatorCamera shows capturepoint HUD and respawntimer. It no longer requires CapturePointGameMode component to work. 2016-03-02 13:45:49 +01:00
Tleety 6968e71e07 Arrow should now correctly track the next point no matter when you join the game 2016-03-02 13:36:24 +01:00
viktorljung c3f24f494d fixup! AutoAnimationBlend on unique node working but scale is not working correctly 
Commited some things that shouldn't have been commited
 2016-03-02 13:34:47 +01:00
viktorljung 07ccb9c041 AutoAnimationBlend on unique node working but scale is not working correctly 2016-03-02 13:30:04 +01:00
Tobias Dahl 2fb3bb2a39 Merge pull request #153 from teamfisk/RenderSetingsV2 
Shield and stuff
 2016-03-02 13:15:52 +01:00
Tleety 6540848392 WIP 2016-03-02 11:59:56 +01:00
Teejoon de9657700b Fixed draw final pass with shided objects having to many if-statments. 
Shields is working with transparancy

Player cameras should have nearclip fater away and far clip nearer.

Defaultconfig push
 2016-03-02 11:59:48 +01:00
verysecrethero 4652cd7861 Added the already-at-maxammo/health-save-trigger for the PickupSystems 2016-03-02 11:53:04 +01:00
antc13 e6f46b396e Merge branch 'master' of https://github.com/teamfisk/TacticalZ 2016-03-02 11:44:29 +01:00
stiffly b7fac7103d More reasonable distance to hear sounds by other players. Modeified by rolloff factor. 2016-03-02 11:26:06 +01:00
Jocke cfba8efd24 WritePrimitive would spam a warning when snapshots got bigger than 512 and it got resized. 2016-03-02 10:59:03 +01:00
FakeShemp 5a6374f013 Fix the remainder of errors. Might have borked splatmap in the process. 2016-03-02 10:57:22 +01:00
FakeShemp 0cf92e99ff wip 2016-03-02 10:17:49 +01:00
verysecrethero 03a35d0f5e Merge pull request #149 from teamfisk/FixNetworkBugs 
Seems OK
 2016-03-02 10:11:52 +01:00
Tobias Dahl e4e9af5d9c Merge pull request #148 from teamfisk/DashFixBranch 
Moved the Dash CoolDown (CoolDownTimer) to the component (DashAbility…
 2016-03-02 10:05:02 +01:00
Tleety 96768e66de Redplayer arrow fix 2016-03-02 09:57:41 +01:00
Teejoon ef66f3ebe5 Transparancy with shild fix 2016-03-01 23:14:23 +01:00
FakeShemp 3ba73b8206 Pulsate system implemented. 2016-03-01 23:05:27 +01:00
Tleety 799990f44d Next CP indicator should now be fully working. 2016-03-01 22:54:13 +01:00
Jace 39369aa3e5 Merge pull request #150 from teamfisk/EditorCameraSpeedFix 
Fixed editor camera speed changing when scrolling on UI elements
 2016-03-01 22:51:16 +01:00