 viktorljung
|
6bfed76e06
|
Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement
|
2016-03-13 18:56:04 +01:00 |
|
|
viktorljung
|
389d27973f
|
Assault boost check
|
2016-03-13 18:55:45 +01:00 |
|
 Tleety
|
fc5ad2d380
|
Small fix
|
2016-03-13 17:33:12 +01:00 |
|
|
viktorljung
|
0d287ad5d1
|
Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement
# Conflicts:
# resources/Schema/Entities/RayAssaultBlue.xml
|
2016-03-13 16:45:57 +01:00 |
|
|
viktorljung
|
3cee4e4248
|
defender ray fixes
|
2016-03-13 16:42:07 +01:00 |
|
|
viktorljung
|
17007a2a41
|
fix fix
|
2016-03-13 16:28:39 +01:00 |
|
|
Tleety
|
041050ab2f
|
Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement
|
2016-03-13 16:15:26 +01:00 |
|
|
Tleety
|
9f752ad3e9
|
Fadesystem, entities, weapon muzzles should now look good. reload for secondary
|
2016-03-13 16:15:06 +01:00 |
|
|
viktorljung
|
04288e5243
|
Merge fixes
|
2016-03-13 16:14:13 +01:00 |
|
|
viktorljung
|
44f46cda8d
|
Merge remote-tracking branch 'origin/master' into Movement
# Conflicts:
# include/Game/Systems/Weapon/DefenderWeaponBehaviour.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/CP_Rocky2.xml
# resources/Schema/Entities/MuzzleFlashBlue.xml
# resources/Schema/Entities/MuzzleFlashFire.xml
# resources/Schema/Entities/MuzzleFlashRed.xml
# resources/Schema/Types/Entity.xsd
# resources/Shaders/Sprite.frag.glsl
# src/Game/Systems/AbilityCooldownHUDSystem.cpp
# src/Game/Systems/BoostIconsHUDSystem.cpp
# src/Game/Systems/PlayerMovementSystem.cpp
# src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
# src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp
# src/Game/Systems/Weapon/SidearmWeaponBehaviour.cpp
|
2016-03-13 15:17:15 +01:00 |
|
 Adam Byléhn
|
b73595eed0
|
Merge pull request #210 from teamfisk/RestartMap
Restart map
|
2016-03-13 15:10:01 +01:00 |
|
|
viktorljung
|
7d899a989c
|
Started working on boost HUD thingy
|
2016-03-13 15:09:50 +01:00 |
|
 Teejoon
|
f9e640ffc6
|
Added borders to capture points so that you can see if your inside of outside when not looking down
|
2016-03-13 14:59:57 +01:00 |
|
|
viktorljung
|
0f4f32188c
|
assault weapon now reloading correctly
|
2016-03-13 14:55:29 +01:00 |
|
 William Moberg
|
ac20e41a5d
|
Fixed merge conflicts. Scoreboard updates team when a team is picked. Fixed some code standard violations and misspellings.
|
2016-03-13 14:23:56 +01:00 |
|
|
viktorljung
|
0963f61976
|
Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement
|
2016-03-13 13:41:39 +01:00 |
|
|
viktorljung
|
bfb7a4139d
|
Tweaking
|
2016-03-13 13:41:28 +01:00 |
|
|
William Moberg
|
4f99f6ef74
|
Merge branch 'master' into RestartMap
# Conflicts:
# src/Game/Systems/CapturePointSystem.cpp
|
2016-03-13 13:37:51 +01:00 |
|
 antc13
|
d0a083a1e3
|
Fixed rotation/translation on some objects on CP_Rocky2.
|
2016-03-13 13:13:14 +01:00 |
|
|
antc13
|
d5f06fa8c2
|
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
|
2016-03-13 12:20:36 +01:00 |
|
|
antc13
|
8bb8ebbea3
|
Fixed Splatmap Export
|
2016-03-13 12:20:25 +01:00 |
|
|
viktorljung
|
60c6aa2486
|
Defender first person tracers done
|
2016-03-13 02:35:02 +01:00 |
|
|
Tleety
|
8d809f30f7
|
Muzzleflash now very nice
|
2016-03-13 02:25:11 +01:00 |
|
|
Tleety
|
bbe61f300c
|
Fade in/out should now work with models and sprites
|
2016-03-13 02:03:49 +01:00 |
|
 Jace
|
4bd2e7995a
|
fixup! Cheeki breeki
|
2016-03-13 01:32:29 +01:00 |
|
|
Jace
|
799fd31844
|
Merge pull request #212 from teamfisk/Dirtybit
Dirtybit
|
2016-03-13 01:26:54 +01:00 |
|
|
Jace
|
45bfc374de
|
Cheeki breeki
|
2016-03-13 01:25:13 +01:00 |
|
|
Tleety
|
13f44c2086
|
Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement
|
2016-03-13 01:24:01 +01:00 |
|
|
Tleety
|
f6a8534c15
|
New assets, FadeOutComponent, Some MuzzleFlash entities, Changes to ray. Muzzleflash rotation
|
2016-03-13 01:23:51 +01:00 |
|
|
Jace
|
95f9065037
|
Merge branch 'master' into Dirtybit
# Conflicts:
# include/Engine/Sound/SoundManager.h
|
2016-03-13 01:07:17 +01:00 |
|
|
Jace
|
993e56ec59
|
Disabled final model matrix caching for now, since it doesn't seem to work in all cases. (CP_Rocky2 pickup platforms and ceiling doens't get updated for some reason?!?)
|
2016-03-13 00:57:54 +01:00 |
|
|
Jace
|
a1fda82d3a
|
Turned the Transform namespace into TransformSystem so it would be able to subscribe to EntityDeleted and clean up after itself
|
2016-03-13 00:57:00 +01:00 |
|
|
Jace
|
f6113b9d9c
|
EEntityDeleted now provides an EntityWrapper instead of just an ID
|
2016-03-13 00:16:07 +01:00 |
|
|
Jace
|
7ea90bede7
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-03-12 23:49:44 +01:00 |
|
|
Jace
|
2bfbd72189
|
EntityWrapper::Clone should no longer cause freezes
|
2016-03-12 23:44:28 +01:00 |
|
|
Jace
|
1e7f6941ba
|
Merge pull request #208 from teamfisk/Kill-streak-sounds
Various sound improvements/additions
|
2016-03-12 23:06:57 +01:00 |
|
|
William Moberg
|
8c90c39680
|
Merge pull request #209 from teamfisk/MemoryOptimization
Fixed texture freeing, memory usage way down.
|
2016-03-12 21:59:51 +01:00 |
|
 Jocke
|
b7d88808e2
|
Redid timers.
|
2016-03-12 21:38:46 +01:00 |
|
|
Jocke
|
f8f536802f
|
Time for ending the game is now in CapturePointGameMode component. The timer i counted down to 0 and then the map is "Reset".
|
2016-03-12 20:28:48 +01:00 |
|
|
William Moberg
|
91bad517d3
|
AbsolutePosition should be calculating correctly now, third time.
|
2016-03-12 19:59:37 +01:00 |
|
|
Jocke
|
60df30fa59
|
Scoreboard is now works.
|
2016-03-12 19:36:12 +01:00 |
|
|
viktorljung
|
c0fc36845f
|
Defender ability HUD fixed
|
2016-03-12 18:43:04 +01:00 |
|
|
viktorljung
|
51b8846b3a
|
Ammo sharing done
|
2016-03-12 18:29:49 +01:00 |
|
|
Jace
|
ba93ebbe88
|
Go away crap maps.
|
2016-03-12 18:21:36 +01:00 |
|
|
William Moberg
|
a3b3351e55
|
Merge branch 'master' into Dirtybit
# Conflicts:
# include/Engine/Rendering/ExplosionEffectJob.h
# src/Game/Systems/ExplosionEffectSystem.cpp
|
2016-03-12 17:59:50 +01:00 |
|
|
Jace
|
ce0d3b9fbe
|
Fixed texture freeing. Destructor was never called because base destructors weren't virtual.
|
2016-03-12 17:53:34 +01:00 |
|
|
William Moberg
|
674604d0df
|
Merge branch 'Dirtybit' of github.com:teamfisk/TacticalZ into Dirtybit
|
2016-03-12 17:51:55 +01:00 |
|
|
stiffly
|
8e9ddc7b9d
|
playerJump is only done for local player.
|
2016-03-12 17:51:06 +01:00 |
|
|
William Moberg
|
36b84f7cc3
|
Fixed so calculating absolute positions, etc. works. Sets the field of all children to dirty if a transform field is altered. Will also set Position to dirty if Scale or Orientation is altered.
Moved some methods in ComponentWrapper to a .cpp.
|
2016-03-12 17:51:03 +01:00 |
|
|
Jocke
|
c544f349fd
|
The logic for removing the world is working but when we send the map again the clients memory usage goes crazy.
|
2016-03-12 17:49:50 +01:00 |
|