 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 |
|
 Teejoon
|
5f11d1e066
|
fix
|
2016-03-13 16:38:50 +01:00 |
|
 Adam Byléhn
|
672d6f884d
|
Merge pull request #215 from teamfisk/RestartMap
Added pop up for client when server timeouts.
|
2016-03-13 16:33:51 +01:00 |
|
|
viktorljung
|
17007a2a41
|
fix fix
|
2016-03-13 16:28:39 +01:00 |
|
 Jocke
|
5ea0f04b20
|
Added pop up for client when server timeouts.
|
2016-03-13 16:21:55 +01:00 |
|
 FakeShemp
|
9b5e4c10fd
|
Shadow will actually shut itself off and delete itself now
|
2016-03-13 16:19:17 +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 |
|
|
stiffly
|
fb400bb743
|
Merge remote-tracking branch 'origin/master' into PerfectSoundForRelease
|
2016-03-13 15:37:14 +01:00 |
|
|
stiffly
|
aa2475dfd6
|
Stops bgm when the game is reset.
|
2016-03-13 15:36:56 +01:00 |
|
 Jace
|
36c4837813
|
Merge pull request #213 from teamfisk/Dirtybit
Linker warnings fix
|
2016-03-13 15:29:45 +01:00 |
|
|
Teejoon
|
741ed01930
|
Merge remote-tracking branch 'origin/master' into MSAA
|
2016-03-13 15:28:00 +01:00 |
|
 William Moberg
|
2fa3637018
|
Transform.cpp was deleted since stuff was moved to TransformSystem, takes care of linker warnings.
|
2016-03-13 15:26:35 +01:00 |
|
 antc13
|
52e5e2527a
|
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
|
2016-03-13 15:21:44 +01:00 |
|
|
antc13
|
36253a8afd
|
Made minor changes to light positions on CP_Rocky2. Replaced a model & changed glow value on some walls.
|
2016-03-13 15:21:29 +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 |
|
|
stiffly
|
5c343cb254
|
Merge remote-tracking branch 'origin/master' into PerfectSoundForRelease
|
2016-03-13 15:10:52 +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
|
bb3a8dba6a
|
Merge branch 'master' into MSAA
|
2016-03-13 15:06:02 +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 |
|
|
stiffly
|
f2c7a9f27a
|
Merge remote-tracking branch 'origin/master' into PerfectSoundForRelease
|
2016-03-13 14:56:00 +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 |
|
|
Teejoon
|
ec7ab417e6
|
Added so that mipmaps can have diferant formats. Bloom also uses RGB8 on all texture now
|
2016-03-13 01:47:37 +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 |
|
|
stiffly
|
20d46f63c8
|
The main menu music would not start again when you returned to the main menu.
|
2016-03-13 00:16:55 +01:00 |
|
|
Jace
|
f6113b9d9c
|
EEntityDeleted now provides an EntityWrapper instead of just an ID
|
2016-03-13 00:16:07 +01:00 |
|
|
Teejoon
|
2e89227061
|
Merge remote-tracking branch 'origin/master' into MSAA
|
2016-03-13 00:09:07 +01:00 |
|
|
Teejoon
|
958850903a
|
Moved ViewSpacePosition calculation from fragmenst shader to vertexshader
|
2016-03-13 00:08:49 +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 |
|