 antc13
|
1d14094e90
|
NewMap Updated. Still WIP
|
2016-02-11 16:52:10 +01:00 |
|
 verysecrethero
|
3301f66ad1
|
Merge remote-tracking branch 'origin/master' into DamageIndicator
# Conflicts:
# resources/Shaders/Sprite.vert.glsl
|
2016-02-11 16:36:48 +01:00 |
|
 William Moberg
|
97b915f130
|
Merge branch 'master' into Respawning
# Conflicts:
# src/Game/Game.cpp
# src/Game/Systems/PlayerSpawnSystem.cpp
# src/Game/Systems/SoundSystem.cpp
|
2016-02-11 16:15:47 +01:00 |
|
|
verysecrethero
|
c9f815fd42
|
Merge remote-tracking branch 'origin/master' into CapturePointTake
# Conflicts:
# src/Game/Systems/CapturePointSystem.cpp
|
2016-02-11 16:09:05 +01:00 |
|
|
William Moberg
|
8eea0c8395
|
WIP respawning.
|
2016-02-11 16:08:19 +01:00 |
|
|
verysecrethero
|
38a3e88999
|
Merge pull request #87 from teamfisk/DoubleJumpEffect
Spawned DoubleJumpHexagon as the player doublejumps
|
2016-02-11 16:00:09 +01:00 |
|
|
verysecrethero
|
4e23e7bf30
|
misc changes do the DoubleJumpHexagon.xml
|
2016-02-11 15:58:58 +01:00 |
|
 Tleety
|
6ba1e95da7
|
Fixed depth sorting for HUD elements.
|
2016-02-11 15:27:07 +01:00 |
|
|
verysecrethero
|
a8ab49f202
|
Merge remote-tracking branch 'origin/master' into DoubleJumpEffect
# Conflicts:
# include/Game/Systems/PlayerMovementSystem.h
|
2016-02-11 15:19:01 +01:00 |
|
|
Tleety
|
f0ae365401
|
Merge remote-tracking branch 'origin/master' into Menu
# Conflicts:
# src/Engine/Rendering/Texture.cpp
# src/Game/Game.cpp
|
2016-02-11 14:43:30 +01:00 |
|
 viktorljung
|
7d4a4ed7cf
|
Merge remote-tracking branch 'origin/master' into Animations
# Conflicts:
# src/Engine/Rendering/Skeleton.cpp
|
2016-02-11 14:38:23 +01:00 |
|
|
viktorljung
|
97de31be65
|
Fixed BoneAttachment component
|
2016-02-11 13:36:27 +01:00 |
|
 Jace
|
95289f47d6
|
Merge branch 'master' into WeaponSystem
|
2016-02-11 12:58:09 +01:00 |
|
|
Jace
|
ccf4cae74b
|
Merge remote-tracking branch 'origin/Animations'
|
2016-02-11 12:54:42 +01:00 |
|
|
antc13
|
2f640d224c
|
New Map with Meshes WIP
|
2016-02-11 12:23:20 +01:00 |
|
|
verysecrethero
|
f11bd24d53
|
Added CapturePointMaxTimer in CapturePointComponent. Removed next-capturepoint Color. Modified captureTimer to +-captureTimeToTakeOver after a capture.
|
2016-02-11 11:46:34 +01:00 |
|
|
Jace
|
81943516a9
|
Protected inheritance, not even once.
|
2016-02-11 11:36:39 +01:00 |
|
|
Tleety
|
350effd8eb
|
New assets and some QA map stuff
|
2016-02-11 11:32:51 +01:00 |
|
|
viktorljung
|
607150189c
|
Different animations can now be played on multiple meshes, AnimationOffset seems to make the lighting buggy
|
2016-02-11 10:51:11 +01:00 |
|
|
Tleety
|
35e4935497
|
Some assets and HUD stuff
|
2016-02-11 10:01:11 +01:00 |
|
|
Jace
|
0394eacb6b
|
Merge remote-tracking branch 'origin/Animations' into WeaponSystem
|
2016-02-11 00:18:36 +01:00 |
|
|
Jace
|
9d9c6bdf1e
|
Third person animations and shoot effects base work
|
2016-02-11 00:08:50 +01:00 |
|
|
antc13
|
92e7d3ecf7
|
Merge remote-tracking branch 'origin/master' into Importer
# Conflicts:
# assets
|
2016-02-11 00:08:17 +01:00 |
|
|
antc13
|
4b8f4981a3
|
New Map with Meshes, WIP.
|
2016-02-11 00:05:27 +01:00 |
|
|
Tleety
|
447f41dbff
|
HUD for capture points now update with Capture point data.
|
2016-02-10 23:59:13 +01:00 |
|
|
viktorljung
|
dded296cde
|
Animation looping fix
|
2016-02-10 23:19:44 +01:00 |
|
 Viktor Ljung
|
c3cc5ae70b
|
Merge pull request #92 from teamfisk/Importer
Importer
|
2016-02-10 22:51:46 +01:00 |
|
|
Tleety
|
64a2354b24
|
WIP with CapturePointHUDSystem
|
2016-02-10 22:22:09 +01:00 |
|
|
Tleety
|
f5de267f25
|
Merge fixes and CapturePointHUD component skeleton added.
|
2016-02-10 20:58:10 +01:00 |
|
 FakeShemp
|
36043010af
|
wip for shadows
they work, but will be shit until we get cascaded.
|
2016-02-10 20:51:33 +01:00 |
|
|
Jace
|
6396925b68
|
Merge remote-tracking branch 'origin/Animations' into WeaponSystem
|
2016-02-10 20:47:33 +01:00 |
|
|
verysecrethero
|
a53ab7f745
|
A few fixes for DashAbility. Default DoubleTapToDash is now set to false.
|
2016-02-10 20:46:16 +01:00 |
|
|
viktorljung
|
224e95f34a
|
Fixed BoneAttachment component and optimized animation code a bit
|
2016-02-10 20:45:24 +01:00 |
|
|
Tleety
|
2cae4e3fb2
|
Merge remote-tracking branch 'origin/master' into Menu
# Conflicts:
# include/Engine/Rendering/DrawFinalPass.h
# include/Engine/Rendering/RenderQueue.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/QualityAssurance.xml
# resources/Schema/Entities/RenderingWorld.xml
# resources/Shaders/Sprite.vert.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/Model.cpp
# src/Engine/Rendering/RenderSystem.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
|
2016-02-10 19:52:42 +01:00 |
|
|
Jace
|
0825b10c75
|
Merge remote-tracking branch 'origin/master' into WeaponSystem
# Conflicts:
# src/Game/Systems/SoundSystem.cpp
|
2016-02-10 19:24:35 +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 |
|
 Teejoon
|
fa781d5c88
|
Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer
|
2016-02-10 17:16:14 +01:00 |
|
|
Teejoon
|
97780395cf
|
... Now mipmaps and Splatmaps i comming :)
|
2016-02-10 17:15:54 +01:00 |
|
|
Jace
|
2c0f66d9c7
|
Merge remote-tracking branch 'origin/master' into WeaponSystem
# Conflicts:
# include/Engine/Collision/FillFrustumOctreeSystem.h
# include/Engine/Core/Octree.h
# include/Engine/Rendering/RenderSystem.h
# include/Game/Game.h
# resources/DefaultInput.ini
# resources/Schema/Components.xsd
# resources/Schema/Entities/Player.xml
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/RenderSystem.cpp
# src/Game/Game.cpp
# src/Game/Systems/PlayerMovementSystem.cpp
|
2016-02-10 17:02:00 +01:00 |
|
|
FakeShemp
|
cb77c1ff97
|
Working pcf, not optimized
|
2016-02-10 16:16:41 +01:00 |
|
|
antc13
|
646806b50e
|
New Map with meshes WIP
|
2016-02-10 15:40:59 +01:00 |
|
|
FakeShemp
|
69db32337d
|
Shado wip
|
2016-02-10 15:16:58 +01:00 |
|
|
William Moberg
|
b2d35c80f7
|
Merge branch 'master' into FrustumCulling
# Conflicts:
# src/Engine/Collision/Collision.cpp
|
2016-02-10 15:08:40 +01:00 |
|
|
Tleety
|
04c23be136
|
Merge remote-tracking branch 'origin/master' into Menu
|
2016-02-10 15:01:51 +01:00 |
|
|
Jace
|
d931660c56
|
WIP
|
2016-02-10 14:43:32 +01:00 |
|
|
verysecrethero
|
2f53ed140f
|
Merge remote-tracking branch 'origin/master' into AssaultBoost
# Conflicts:
# resources/Schema/Components.xsd
|
2016-02-10 14:16:55 +01:00 |
|
|
viktorljung
|
08328a781c
|
Merge remote-tracking branch 'origin/master' into Animations
# Conflicts:
# assets
# include/Engine/Rendering/Model.h
# src/Engine/Collision/Collision.cpp
|
2016-02-10 14:13:08 +01:00 |
|
|
viktorljung
|
afebf879a0
|
Merge fixes
|
2016-02-10 13:44:47 +01:00 |
|
|
William Moberg
|
86f4ff0b3c
|
Added an annotation for Trigger and Collideable components.
|
2016-02-10 12:38:36 +01:00 |
|
|
verysecrethero
|
b6b96c5f11
|
Added DoubleJumpHexagon entity. Spawned DoubleJumpHexagon as the player doublejumps. Fixed DoubleJumping bug where you couldnt doublejump on rocks (where velocity wasnt 0.0)
|
2016-02-10 11:51:58 +01:00 |
|