 Jace
|
a715f7fe86
|
Merge branch 'master' into Movement
# Conflicts:
# include/Engine/Network/Client.h
# resources/DefaultConfig.ini
# resources/Schema/Entities/OverwatchCamera.xml
# resources/Schema/Types/Entity.xsd
|
2016-03-13 22:22:36 +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 |
|
 Teejoon
|
bb3a8dba6a
|
Merge branch 'master' into MSAA
|
2016-03-13 15:06:02 +01:00 |
|
 Tleety
|
f6a8534c15
|
New assets, FadeOutComponent, Some MuzzleFlash entities, Changes to ray. Muzzleflash rotation
|
2016-03-13 01:23:51 +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 |
|
|
Teejoon
|
5146d21173
|
MSAA is now working
|
2016-03-12 22:22:53 +01:00 |
|
|
Tleety
|
7e6288c597
|
Some merge fixes and some sprite fixes.
|
2016-03-10 15:36:33 +01:00 |
|
|
Tleety
|
4322a5d8da
|
Some fixes for sprites
|
2016-03-10 15:21:11 +01:00 |
|
|
Tleety
|
592edf7dba
|
Sprites can now be rendered with the texture ratio in mind
|
2016-03-09 23:31:54 +01:00 |
|
|
Tleety
|
087facc22e
|
Textures are now able to keep their scale even though the sprite is scaled.
|
2016-03-09 22:22:32 +01:00 |
|
|
Tleety
|
1104166039
|
TextureSprite Resource that use GL_NEAREST for sampling aswell as some StartMenu changes
|
2016-03-09 17:24:21 +01:00 |
|
|
Tleety
|
5c0d9070c7
|
WIP
|
2016-03-07 23:25:06 +01:00 |
|
|
Teejoon
|
6fab971734
|
Merge branch 'master' of https://github.com/teamfisk/TacticalZ into SeeTeamMates
Conflicts:
include/Engine/Rendering/SpriteJob.h
resources/Schema/Components.xsd
resources/Schema/Entities/Player.xml
resources/Schema/Entities/PlayerRed.xml
|
2016-02-22 16:43:18 +01:00 |
|
|
Tleety
|
8f84a5ddd6
|
Buttons are now clickable
|
2016-02-16 16:28:19 +01:00 |
|
|
Teejoon
|
17da9a8036
|
WIP
|
2016-02-16 15:56:58 +01:00 |
|
|
Tleety
|
6ba1e95da7
|
Fixed depth sorting for HUD elements.
|
2016-02-11 15:27:07 +01:00 |
|
|
Tleety
|
f5de267f25
|
Merge fixes and CapturePointHUD component skeleton added.
|
2016-02-10 20:58:10 +01:00 |
|
|
Tleety
|
53265bbc90
|
PNG is now a resource.
You can now load textures threaded.
PNG will now throw exceptions when errors happend
SpriteComponent is now working without billboarding.
|
2016-02-10 17:50:17 +01:00 |
|
|
viktorljung
|
8034b42c87
|
spriteComponent WIP
|
2016-02-05 16:43:57 +01:00 |
|