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

1654 Commits

Author SHA1 Message Date
Tobias Dahl 30e1c2c247 Merge pull request #178 from teamfisk/NetworkComponent 
Network component
 2016-03-09 10:04:40 +01:00
stiffly 4abe73eae7 Merge remote-tracking branch 'origin/master' into FriendlyHost/Join 2016-03-09 10:00:44 +01:00
stiffly e0de91cce3 WIP 2016-03-09 09:57:32 +01:00
Tleety 95f68cc888 ConnectRequest event and some other shit 2016-03-08 22:24:32 +01:00
Jace b7d93058b1 Added base work for dity bits in components 2016-03-08 21:11:59 +01:00
William Moberg 6c673db2f4 Merge branch 'TeamPickCamera' of github.com:teamfisk/TacticalZ into TeamPickCamera 2016-03-08 19:24:55 +01:00
William Moberg 7bc3c9f7b1 Don't force to spectator camera if player presses pickTeam/Class prematurely. Players team should be remembered after picked, spawn request is not erased anymore. 2016-03-08 18:26:17 +01:00
Tleety 3394d65055 Servers now show up in the server list. 2016-03-08 18:13:21 +01:00
William Moberg ab2b28264f Caching absolute positions, etc. Has not been tested yet. 2016-03-08 18:10:36 +01:00
verysecrethero 7ee4ea637b Merge remote-tracking branch 'origin/master' into TeamPickCamera 2016-03-08 17:30:22 +01:00
Tleety 280de0e984 Merge remote-tracking branch 'origin/FriendlyHost/Join' into Menu 
# Conflicts:
#	include/Game/Systems/MainMenuSystem.h
#	src/Engine/GUI/MainMenuSystem.cpp
 2016-03-08 17:03:50 +01:00
stiffly 17e2ebeaa7 Merge remote-tracking branch 'origin/master' into FriendlyHost/Join 
# Conflicts:
#	include/Engine/Network/Client.h
 2016-03-08 16:59:24 +01:00
Tleety ba9208085b WIP 2016-03-08 16:52:56 +01:00
verysecrethero 52d3cb3ebf GetPlayerAmmo is now a SetPlayerAmmo instead to fix some potential problems if the player has no weapon at all 2016-03-08 16:33:08 +01:00
Teejoon d51bea798a Merge remote-tracking branch 'origin/Render_Optimization' into RendererBugFixes 2016-03-08 16:20:23 +01:00
Teejoon 155d700a44 WIP 2016-03-08 16:19:56 +01:00
Tleety f8ab52c72c WIP 2016-03-08 16:15:54 +01:00
verysecrethero e43a7be7db DamageIndicatorSystem now works for singleplayer again. Friendly fire DamageIndicator is now black color. 2016-03-08 15:55:51 +01:00
Jace ecc8d998cf Added ComponentInfo::Field_t::Index 2016-03-08 15:46:14 +01:00
Jocke 3828616b60 Made it easier to maintain changes in packet header, prepared for reliable UDP packets. 2016-03-08 14:44:35 +01:00
viktorljung f934f972e8 Merge remote-tracking branch 'origin/Weapons' into Movement 
# Conflicts:
#	resources/Schema/Entities/PlayerDefenderBlue.xml
 2016-03-08 14:34:21 +01:00
viktorljung 8d1877321a Fixed BoneAttachment offset rotation 2016-03-08 14:32:50 +01:00
Tleety a0ca4df3be Some server list components and entities. 2016-03-08 13:29:21 +01:00
viktorljung f77a610519 Dash now looking good 2016-03-08 13:26:01 +01:00
William Moberg d7f09b1a8f Added clickable buttons to switch to class/team screens, as a better alternative to Comma/Period on the keyboard. 2016-03-08 11:59:15 +01:00
verysecrethero 0e0a486c01 AmmoPickupSystem should now be able to give ammo to all classtypes 2016-03-08 11:48:54 +01:00
Jocke 9cbc582be2 Kinda works like before 2016-03-08 11:29:47 +01:00
viktorljung 2ba245368b Improved movement animaitons 
Added a SetBlendWeight event that sets the weight for all nodes with a name.
 2016-03-08 11:21:40 +01:00
Teejoon 82a7ff2ec3 Merge remote-tracking branch 'origin/master' into RendererBugFixes 2016-03-08 11:18:25 +01:00
Tleety 01f29b6d4e Blur behind buttons/sprites should now be working as intended. 2016-03-08 11:14:09 +01:00
stiffly ec3ed1f46f Merge remote-tracking branch 'origin/master' into Kill-streak-sounds 
# Conflicts:
#	include/Game/Systems/Weapon/DefenderWeaponBehaviour.h
 2016-03-08 10:39:52 +01:00
William Moberg 3436ba6656 Merge pull request #177 from teamfisk/AmmoPickup 
Fixed some systems added twice in Game.cpp
 2016-03-08 09:46:36 +01:00
Tleety 6b7f598c4d WIP 2016-03-07 23:35:58 +01:00
Tleety 5c0d9070c7 WIP 2016-03-07 23:25:06 +01:00
Jace 7b0f887332 fixup! fixup! Disabled InputCommand processing while you fiddle with editor UI elements 2016-03-07 19:59:57 +01:00
FakeShemp e494f6a495 Merge branch 'master' into Shadows 2016-03-07 19:46:04 +01:00
FakeShemp 2049d630e9 Revert "Revert "Shadows"" 
This reverts commit 73b8bff1f3.
 2016-03-07 19:45:46 +01:00
Jace 3fda25b604 Working first person animations for AssaultWeapon and DefenderWeapon and reload effect for AssaultWeapon 2016-03-07 19:38:49 +01:00
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 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
Teejoon fd994ca93d Deleting texture thats getting rended too. 2016-03-07 17:52:47 +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 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
Jocke 68a88ed756 We are now using udp again 2016-03-07 16:07:54 +01:00