 Tleety
|
cf2bf4e14d
|
Merge remote-tracking branch 'origin/master' into ResolutionChange
|
2016-02-19 13:17:31 +01:00 |
|
 Jace
|
2ac584bafb
|
Merge pull request #113 from teamfisk/Menu-Tobias
Menu tobias
|
2016-02-19 13:16:50 +01:00 |
|
|
Tleety
|
fc5d054cb2
|
Entity is now sent with the click events.
Fixed small things
|
2016-02-19 12:49:07 +01:00 |
|
|
Tleety
|
8c9f4bb84b
|
Resize should now be working correctly.
|
2016-02-19 11:42:52 +01:00 |
|
 FakeShemp
|
73a4336206
|
Try some stuff
|
2016-02-18 23:33:10 +01:00 |
|
|
FakeShemp
|
f2ab02d860
|
More WIP
Switching between levels seem to work, but I borked all matrices
|
2016-02-18 22:38:50 +01:00 |
|
|
FakeShemp
|
bf376f54b6
|
WIP
I think this is now finding the different segments of the cascade
|
2016-02-18 20:48:39 +01:00 |
|
|
Tleety
|
e15a7b9485
|
You can now change resolution without any apparent bugs.
|
2016-02-18 18:00:26 +01:00 |
|
 viktorljung
|
3c9c95cff4
|
Animation blending improved and Animation Override added
|
2016-02-18 16:34:18 +01:00 |
|
|
FakeShemp
|
178402e964
|
cascade shadow wip
|
2016-02-18 10:08:29 +01:00 |
|
|
viktorljung
|
debb1881bf
|
BoneAttachment working
|
2016-02-17 15:48:45 +01:00 |
|
|
viktorljung
|
db8bc612bd
|
AdditiveBlend now working, needs cleanup
|
2016-02-17 14:55:02 +01:00 |
|
|
viktorljung
|
e7118ce8e5
|
WIP
|
2016-02-17 10:52:50 +01:00 |
|
 verysecrethero
|
42b49f9dba
|
Added more timers to Rendering.
|
2016-02-16 17:51:39 +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
|
6bc7131290
|
Glow Intencity can now be changed in the model component.
|
2016-02-16 14:57:21 +01:00 |
|
|
viktorljung
|
648d864d6e
|
Merge remote-tracking branch 'origin/master' into Animations
|
2016-02-11 23:48:30 +01:00 |
|
|
Jace
|
b761439c84
|
Added config flag Debug.OutOfBodyExperience that allows you to spawn and view a player from a third person perspective, without the active camera being changed.
|
2016-02-11 23:45:30 +01:00 |
|
|
Tleety
|
6ba1e95da7
|
Fixed depth sorting for HUD elements.
|
2016-02-11 15:27:07 +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 |
|
|
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
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
FakeShemp
|
69db32337d
|
Shado wip
|
2016-02-10 15:16:58 +01:00 |
|
|
viktorljung
|
e9d36c48a6
|
Changed isSkined to IsSkinned and removed duplicated code in PickingPass
|
2016-02-10 14:36:25 +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 |
|
 Ayumiwii
|
6af167675d
|
Shadow WIP stage 2
- fix cel-shading
|
2016-02-10 11:48:44 +01:00 |
|
|
viktorljung
|
49e6252ee1
|
Merge remote-tracking branch 'origin/master' into Animations
# Conflicts:
# include/Engine/Rendering/DrawFinalPass.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/CollisionTestLevel.xml
# resources/Schema/Types/Entity.xsd
# src/Engine/Collision/Collision.cpp
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/RenderSystem.cpp
|
2016-02-10 11:33:45 +01:00 |
|
 William Moberg
|
0bbb627790
|
Merge branch 'master' into FrustumCulling
|
2016-02-10 11:04:31 +01:00 |
|
|
viktorljung
|
2c48c2680f
|
Cleanup
|
2016-02-10 11:04:28 +01:00 |
|
|
viktorljung
|
c09c2f4783
|
Merge remote-tracking branch 'origin/Importer' into Animations
# Conflicts:
# resources/Schema/Components.xsd
# resources/Schema/Entities/RenderingWorld.xml
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/PickingPass.cpp
# src/Engine/Rendering/Skeleton.cpp
|
2016-02-09 22:50:19 +01:00 |
|
|
viktorljung
|
7212217460
|
Added animation blending and offset animation component
|
2016-02-09 22:15:43 +01:00 |
|
|
William Moberg
|
7140b740b5
|
Models/Collideables/etc. won't need a AABB component anymore, if it has a Model component. In addition, they should take rotation into account, i.e it doesn't have to be axis-aligned.
|
2016-02-09 19:20:04 +01:00 |
|
|
William Moberg
|
239a8e7a6a
|
Frustum culling should be working.
|
2016-02-09 17:12:23 +01:00 |
|
|
Ayumiwii
|
ecd823cb9f
|
Shadow WIP stage 2
- Soft shadow
|
2016-02-09 16:15:11 +01:00 |
|
|
William Moberg
|
b30891aecd
|
WIP, debugging code added, still not working.
|
2016-02-09 15:00:30 +01:00 |
|
|
Ayumiwii
|
cb7f06573f
|
Shadows stage 2 WIP
|
2016-02-09 14:08:57 +01:00 |
|
|
Jace
|
d3bc48f5f7
|
Major networking refactoring to allow for snapshot filtering outside of netcode
|
2016-02-09 13:22:21 +01:00 |
|
|
William Moberg
|
b748deb1e1
|
WIP FrustumCulling, most code added but not working now.
|
2016-02-09 10:05:49 +01:00 |
|
|
Teejoon
|
060e674a6f
|
Picking supports skinned meshes
|
2016-02-08 17:37:18 +01:00 |
|