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

969 Commits

Author SHA1 Message Date
Joachim Pettersson 2dfcd3ad95 Merge pull request #158 from teamfisk/SniperSprintBranch 
Looks good// William
 2016-03-03 18:25:38 +01:00
verysecrethero be331cb778 fixed 2016-03-03 18:05:10 +01:00
viktorljung a3494b92c8 Blending queues now working 2016-03-03 17:48:25 +01:00
verysecrethero a72dc94d5d Merge branch 'SniperSprintBranch' of github.com:teamfisk/TacticalZ into SniperSprintBranch 
# Conflicts:
#	include/Engine/Input/FirstPersonInputController.h
 2016-03-03 17:35:17 +01:00
verysecrethero c5f3bfc0cd Fixed the stuff in comments 2016-03-03 17:33:41 +01:00
Tleety 8b86c73ecc Merge remote-tracking branch 'origin/FixNetworkBugs' into ScoreBoard 2016-03-03 15:49:15 +01:00
Tleety c125f8c5f5 Merge branch 'master' into ScoreBoard 2016-03-03 15:18:46 +01:00
Tobias Dahl 73b8bff1f3 Revert "Shadows" 2016-03-03 14:24:43 +01:00
Tleety ed1d203c72 Merge branch 'master' into ScoreBoard 2016-03-03 14:07:44 +01:00
Tobias Dahl 1deb506fb2 Merge pull request #145 from teamfisk/Shadows 
Shadows
 2016-03-03 14:06:48 +01:00
viktorljung 8957b0b464 Merge remote-tracking branch 'origin/master' into Animations 2016-03-03 14:05:43 +01:00
Jocke ae3cab6cd1 Merge remote-tracking branch 'origin/master' into FixNetworkBugs 2016-03-03 13:31:43 +01:00
Jocke a9b19d9af1 Packet write now only warns when a a packet is huge 2016-03-03 13:29:45 +01:00
Tleety 96bc5db7bb Merge commit '0e8b97dbbade6bb39c6f2b8af6c1cfc43ce67cde' into ScoreBoard 
# Conflicts:
#	resources/Schema/Entities/Player.xml
#	src/Game/Game.cpp
 2016-03-03 13:22:28 +01:00
Jocke da81f21799 Merge remote-tracking branch 'origin/master' into SniperSprintBranch 
# Conflicts:
#	include/Engine/Input/FirstPersonInputController.h
 2016-03-03 12:16:09 +01:00
Tleety ff6e2167d4 Some new events and changes to ScoreSystem 2016-03-03 11:25:06 +01:00
FakeShemp a0f2f2bf5f Merge remote-tracking branch 'origin/master' into Shadows 2016-03-03 03:30:01 +01:00
FakeShemp 7ea26d10ee Rewritten. Works as a charm now. 2016-03-03 03:28:21 +01:00
FakeShemp 28e9ba1208 Merge branch 'master' into Shadows 
# Conflicts:
#	include/Engine/Rendering/DrawFinalPass.h
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/FrameBuffer.cpp
#	src/Engine/Rendering/Renderer.cpp
 2016-03-03 03:00:05 +01:00
viktorljung 362378536e Switching rooms 2016-03-03 01:39:12 +01:00
Jace 0e8b97dbba Made AmmunitionHUD into TextFieldReader which reads any component field on a parent and updates a Text component with the value! 2016-03-03 01:35:32 +01:00
Jace 6f8023b285 HACK: Added Activate button for spawners in editor. Right now it includes the event from Game, but SpawnerSystem should probably be moved to Engine. 2016-03-02 22:48:01 +01:00
Jace 9a668ed7d7 Now here's the real fix for the lag when loading entity files: CONSOLE SPAM 2016-03-02 20:16:03 +01:00
Jace 7624c6ee0a Updated all uses of EntityXMLFile to use the new EntityFile to load entities into a world. 2016-03-02 20:12:59 +01:00
Jace 069583e09f Created EntityFile which loads an EntityXMLFile into a temporary world to be merged with another world when you want to create a copy of the entity loaded from disk. This allows us to free EntityXMLFile once it's loaded into an EntityFile. 2016-03-02 19:52:11 +01:00
Jace 44b4a597d4 fixup! Created World::Merge which will merge a world into another one 2016-03-02 19:50:52 +01:00
Jace 0c0f2d7e50 fixup! Renamed EntityFile to EntityXMLFile to be able to separate file parsing from entity creation 2016-03-02 18:56:22 +01:00
Jace 26d6546d79 Renamed EntityFile to EntityXMLFile to be able to separate file parsing from entity creation 2016-03-02 18:53:40 +01:00
Jace 62c8196ad4 Created World::Merge which will merge a world into another one 2016-03-02 18:53:39 +01:00
Jocke 85ba5552e9 Merge remote-tracking branch 'origin/master' into FixNetworkBugs 2016-03-02 17:59:20 +01:00
William Moberg e6b3bbeb54 Merge remote-tracking branch 'origin/master' into Respawning 
# Conflicts:
#	resources/Schema/Types/Entity.xsd
 2016-03-02 17:50:59 +01:00
stiffly 267c007291 Removed unnecessary comments, variables and functions. 2016-03-02 17:39:27 +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 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
William Moberg 4ef76f6c45 Merge branch 'master' into Respawning 
# Conflicts:
#	resources/Schema/Types/Entity.xsd
 2016-03-02 16:51:24 +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
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
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
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
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
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