 FakeShemp
|
e25c9ee690
|
Merge remote-tracking branch 'origin/master' into Shadows
# Conflicts:
# include/Engine/Rendering/DrawFinalPass.h
# include/Engine/Rendering/Renderer.h
# resources/Shaders/ForwardPlus.vert.glsl
# resources/Shaders/ForwardPlusSkinned.vert.glsl
# src/Engine/Rendering/Renderer.cpp
|
2016-03-09 19:38:55 +01:00 |
|
 Tleety
|
95f68cc888
|
ConnectRequest event and some other shit
|
2016-03-08 22:24:32 +01:00 |
|
|
Tleety
|
01f29b6d4e
|
Blur behind buttons/sprites should now be working as intended.
|
2016-03-08 11:14:09 +01:00 |
|
|
Tobias Dahl
|
73b8bff1f3
|
Revert "Shadows"
|
2016-03-03 14:24:43 +01:00 |
|
|
Tobias Dahl
|
1deb506fb2
|
Merge pull request #145 from teamfisk/Shadows
Shadows
|
2016-03-03 14:06:48 +01:00 |
|
|
FakeShemp
|
a0f2f2bf5f
|
Merge remote-tracking branch 'origin/master' into Shadows
|
2016-03-03 03:30:01 +01:00 |
|
|
Tleety
|
6281e20000
|
Arrow should now track the CapturePoint specified in the Component.
|
2016-03-01 20:31:09 +01:00 |
|
|
FakeShemp
|
20468cba1b
|
Merge branch 'master' into Shadows
# Conflicts:
# assets
# include/Engine/Rendering/DrawFinalPass.h
# include/Engine/Rendering/Renderer.h
# resources/Shaders/ForwardPlus.frag.glsl
# resources/Shaders/ForwardPlus.vert.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/FrameBuffer.cpp
# src/Engine/Rendering/Renderer.cpp
|
2016-02-29 18:03:00 +01:00 |
|
|
FakeShemp
|
6dd7f1a657
|
Buggy transparent shadows.
Transparent textures might glow.
|
2016-02-28 18:00:23 +01:00 |
|
|
FakeShemp
|
14b0a64720
|
begin fixing transparent object's shadows
|
2016-02-27 18:42:51 +01:00 |
|
|
Tleety
|
e15a7b9485
|
You can now change resolution without any apparent bugs.
|
2016-02-18 18:00:26 +01:00 |
|
|
Tleety
|
3e7936ef00
|
You can now change resolution by pressing buttons.
|
2016-02-17 17:44:33 +01:00 |
|
|
Tleety
|
657125b469
|
Moved menu code into GUI
Button events are now sent when you click.
|
2016-02-17 13:44:11 +01:00 |
|
|
Tleety
|
8f84a5ddd6
|
Buttons are now clickable
|
2016-02-16 16:28:19 +01:00 |
|
|
Tleety
|
350effd8eb
|
New assets and some QA map stuff
|
2016-02-11 11:32:51 +01:00 |
|
|
Tleety
|
35e4935497
|
Some assets and HUD stuff
|
2016-02-11 10:01:11 +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 |
|
|
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 |
|
 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 |
|
 Teejoon
|
060e674a6f
|
Picking supports skinned meshes
|
2016-02-08 17:37:18 +01:00 |
|
|
Tleety
|
7c582898f4
|
Working stencil buffer for the shield.
|
2016-02-04 14:33:39 +01:00 |
|
|
Tleety
|
bc01e147c2
|
Some state stuff, some draw stuff, some QA map stuff
|
2016-02-03 18:09:44 +01:00 |
|
 Jace
|
bd2da7bc9f
|
Revert "Revert "Merge pull request #75 from teamfisk/NormalSpecularMapping""
This reverts commit b56824786c.
|
2016-02-03 16:30:00 +01:00 |
|
|
Jace
|
b56824786c
|
Revert "Merge pull request #75 from teamfisk/NormalSpecularMapping"
This reverts commit 192de80782, reversing
changes made to 24aac6a00d.
|
2016-02-03 16:16:06 +01:00 |
|
|
Tleety
|
5665c0f298
|
Models with Shield and shielded component now added to queues
|
2016-02-03 14:20:47 +01:00 |
|
|
Tleety
|
83713b3b6d
|
Renamde ShieldComponent since Component should not be in the name. Added Shielded component that will be put on objects that should be hidden behind shields.
|
2016-02-03 13:27:46 +01:00 |
|
|
Tleety
|
7bae2d0873
|
Added a ShieldComponent and a test area in QA map for defender shield
|
2016-02-03 11:58:06 +01:00 |
|
|
Tleety
|
51a588657e
|
QA map change
|
2016-02-03 10:11:53 +01:00 |
|
|
Tleety
|
a3b7bd7df5
|
Fix in picking pass, QA map fix. Blue and red ray change. Player weapon change.
|
2016-02-02 17:39:57 +01:00 |
|
|
Tleety
|
11025b5466
|
QA-map stuff
|
2016-02-02 17:19:58 +01:00 |
|
|
Tleety
|
eba36b8492
|
Some QA-map fixes
|
2016-02-02 17:12:14 +01:00 |
|
|
Tleety
|
12a181c1ff
|
Fixed a bug where normals scaled with model scale. Again.
|
2016-02-02 16:11:03 +01:00 |
|
|
Tleety
|
b131f56f5e
|
Made a quality assurance world that will need to be used before creating a pull request
|
2016-02-02 16:06:42 +01:00 |
|