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

1902 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jace 67ce6c5ae6 Added Speed and Delay fields to explosion effect. 2016-03-07 19:38:02 +01:00
Jace 1a403b9b88 TextFieldReader now loops through parents if the entity field was empty and the current entity didn't have a component of that type. 2016-03-07 17:55:00 +01:00
Jace f923872e51 fixup! Disabled InputCommand processing while you fiddle with editor UI elements 2016-03-07 17:54:01 +01:00
Jace abc447b937 Updated snapshot filter to ignore the new animation components 2016-03-07 17:53:47 +01:00
Jace 8bcb15a128 Disabled InputCommand processing while you fiddle with editor UI elements 2016-03-07 17:53:32 +01:00
Jace b000bb2597 Cleaned up old entities 2016-03-07 17:53:11 +01:00
Teejoon fd994ca93d Deleting texture thats getting rended too. 2016-03-07 17:52:47 +01:00
William Moberg fcf87104c3 Replaced test textures for class picking with more proper icons. 2016-03-07 17:50:03 +01:00
William Moberg 1516ed8e2d Removed debug logging. PlayerID in InputCommands from buttons is corrected. 2016-03-07 17:35:01 +01:00
stiffly 9e8df340b3 Merge remote-tracking branch 'origin/master' into NetworkComponent 
# Conflicts:
#	src/Engine/Network/Server.cpp
 2016-03-07 17:21:24 +01:00
verysecrethero 2cfbe0f785 Merge remote-tracking branch 'origin/master' into AmmoPickup 2016-03-07 17:17:51 +01:00
verysecrethero fc3a3a8f2e Fixed a crashbug in Ammo/HealthPickup which was actually caused by systems being added twice in Game.cpp. This is also a possible fix for DamageIndicator,Capturepoint,TextField,KillFeed 2016-03-07 17:16:18 +01:00
stiffly b629ed5e2b Updated some known xml entities that should be send in snapshots. 2016-03-07 17:15:56 +01:00
stiffly f00fb836fb Oops. 2016-03-07 17:10:13 +01:00
stiffly 13c3bcb290 Now only entities with NetworkComponent will be send in Snapshots. 2016-03-07 16:52:51 +01:00
Tleety 7de95d4cb5 Mainmenu entity 2016-03-07 16:34:56 +01:00
stiffly f585f9ada9 Created the NetworkComponent xml file 2016-03-07 16:11:19 +01:00
Tobias Dahl 3edc2f4819 Merge pull request #174 from teamfisk/CapturePointFixBranch 
CapturePoints now have red/blue/spectator model-children
 2016-03-07 15:25:22 +01:00
William Moberg 962521fa59 Merge branch 'master' into TeamPickCamera 
# Conflicts:
#	src/Game/Systems/PlayerDeathSystem.cpp
 2016-03-07 15:20:46 +01:00
Adam Byléhn 9c3fa25834 Merge pull request #176 from teamfisk/PlayerHUD 
Player hud
 2016-03-07 15:14:37 +01:00
William Moberg 282e0bf7c4 Only set spectator camera if player haven't spawned already. Don't spawn player if they switch to class pick screen. 2016-03-07 15:05:37 +01:00
verysecrethero 3eaad275ba New CapturePointAddition fixed to work on Network by Joachim 2016-03-07 14:50:31 +01:00
Tleety 47ece6a5bf Changed shield component to track Active, so it and sprint glow full if they are active. 
Changed how reflections are calculated with light.
 2016-03-07 14:42:50 +01:00
verysecrethero 64df3fd7ad CapturePoints now have red/blue/spectator model-children 2016-03-07 14:30:27 +01:00
Teejoon b38ebbe676 Shadows now working on NVIDIA cards too 2016-03-07 14:00:08 +01:00
Tleety 99d663d5a2 ShiftIcon should now track ability depending on what ability the player has and change icon accordingly. 2016-03-07 13:55:37 +01:00
Tleety 388fe7c259 Fixed some stuff on the player HUD 2016-03-07 11:28:10 +01:00
Tobias Dahl 46d7c8bea4 Merge pull request #172 from teamfisk/ScoreBoard 
Score board
 2016-03-07 11:09:17 +01:00
Tleety c7099de9e4 Merge remote-tracking branch 'origin/master' into ScoreBoard 
# Conflicts:
#	assets
 2016-03-07 10:58:55 +01:00
Tleety cb9dad5c67 Merge remote-tracking branch 'origin/master' into ScoreBoard 2016-03-07 10:49:57 +01:00
Tleety a8f2d0a8e6 Some assets, some fixes to the scoreboard 2016-03-07 10:48:46 +01:00
Jace b7a7f7fd5e ???? 2016-03-04 15:02:01 +01:00
Jace 434ff1e7eb ???? 2016-03-04 10:06:49 +01:00
William Moberg 0dfe00b406 Unlocks mouse when changing to SpectatorCamera and locking when respawning. 2016-03-04 09:49:27 +01:00
Jace e58b5ffd6f Merge remote-tracking branch 'origin/Movement' into Weapons 
# Conflicts:
#	resources/Schema/Entities/Player.xml
#	src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
 2016-03-04 09:43:34 +01:00
Jace 4557455e49 HUD stuff 2016-03-04 09:41:12 +01:00
viktorljung c1f5cf65a7 Movement animations 2016-03-04 09:39:16 +01:00
Jace a8ad85b004 Merge remote-tracking branch 'origin/IconsForPlaytest' into Weapons 2016-03-04 09:39:11 +01:00
Jace 3ac8a5c7ef Working map 2016-03-04 09:38:38 +01:00
Jace ebd4c58c41 "Fixed" weapon spawning over network 2016-03-04 09:23:18 +01:00
Jace 42cccfbac0 Merge branch 'Weapons' of github.com:teamfisk/TacticalZ into Weapons 
# Conflicts:
#	assets
#	src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
 2016-03-04 08:56:58 +01:00
Jocke e2674d915e Constrained weapon behavior to client side only 2016-03-04 08:55:55 +01:00
Jace 2b55450c18 Cray cray weapons 2016-03-04 08:54:59 +01:00
viktorljung 7ba0e4ea9d Run, Strafe and jump animations now playing 2016-03-04 08:35:02 +01:00
William Moberg 7a2f1ac9fd Merge branch 'Weapons' into TeamPickCamera 2016-03-04 08:34:27 +01:00
Jocke d78a7e20e2 Merge branch 'master' into Weapons 2016-03-04 08:29:33 +01:00
Jocke 5b80ba4398 Made 3 new healthHUDs 1 for each class. 2016-03-04 08:22:48 +01:00
William Moberg 03843774d7 Moved buttons and fixed so you can't spawn with no class. 2016-03-04 07:01:47 +01:00
William Moberg 2ecc53ecca Merge branch 'master' into TeamPickCamera 
# Conflicts:
#	src/Game/Game.cpp
 2016-03-04 05:58:49 +01:00
William Moberg 06614aa907 SpectatorCameraSystem handles the overwatch cameras. Set camera to a class pick screen when connecting. Cannot spawn until both team and class has been picked. 
Preparations for class aware PlayerSpawnSystem.
 2016-03-04 05:41:29 +01:00