 stiffly
|
a28748b35d
|
Merge remote-tracking branch 'origin/master' into Networking
|
2016-01-23 18:42:16 +01:00 |
|
 viktorljung
|
ef020a3770
|
Text fixed
|
2016-01-23 18:17:20 +01:00 |
|
|
viktorljung
|
160b7183b2
|
WIP
|
2016-01-23 18:07:07 +01:00 |
|
|
stiffly
|
ecdb5ed07d
|
Merge remote-tracking branch 'origin/master' into Networking
|
2016-01-23 17:51:06 +01:00 |
|
|
viktorljung
|
bd62b5873d
|
Revert "Merge pull request #43 from teamfisk/Forward+"
This reverts commit d59ab5aba2, reversing
changes made to bef95235d0.
|
2016-01-23 15:57:26 +01:00 |
|
 Tleety
|
f623232a2b
|
Removed a temp variable.
|
2016-01-23 14:52:29 +01:00 |
|
|
Tleety
|
6a18cb88af
|
Merge remote-tracking branch 'origin/master' into Forward+
# Conflicts:
# include/Engine/Rendering/Renderer.h
# src/Engine/Rendering/PickingPass.cpp
# src/Engine/Rendering/Renderer.cpp
|
2016-01-23 13:59:21 +01:00 |
|
|
Tleety
|
b499f4b020
|
Fixed some rendering bugs and some code refactoring
|
2016-01-23 12:17:38 +01:00 |
|
|
viktorljung
|
9a23d8887a
|
Merge remote-tracking branch 'origin/master' into TextRendering
# Conflicts:
# include/Engine/Rendering/RenderSystem.h
# src/Engine/Rendering/RenderSystem.cpp
|
2016-01-23 11:48:10 +01:00 |
|
 Jace
|
db0e67b9bd
|
Added EntityWrapper::IsChildOf and made snapshot interpolation and rendering exceptions for player less hacky
|
2016-01-23 11:44:16 +01:00 |
|
|
viktorljung
|
445248af55
|
Changed name and made a TextPassState
|
2016-01-23 11:38:31 +01:00 |
|
|
Jace
|
31e7340daf
|
Ignoring interpolation and rendering for local player entities!
|
2016-01-23 00:40:37 +01:00 |
|
|
Jace
|
90867b094a
|
Merge remote-tracking branch 'origin/TextRendering' into Networking
# Conflicts:
# include/Engine/Rendering/RenderSystem.h
# src/Engine/Rendering/RenderSystem.cpp
|
2016-01-22 22:08:56 +01:00 |
|
|
Jace
|
ca2aab449e
|
Basic movement and camera management between players and editor
|
2016-01-22 16:12:51 +01:00 |
|
|
Tleety
|
7498cebf5e
|
Merge remote-tracking branch 'origin/master' into Forward+
# Conflicts:
# src/Engine/Rendering/DrawFinalPassState.cpp
# src/Engine/Rendering/PickingPass.cpp
# src/Engine/Rendering/Renderer.cpp
|
2016-01-22 15:57:38 +01:00 |
|
|
Tleety
|
2b8debbfff
|
Added MipMap texture generation
|
2016-01-22 15:55:32 +01:00 |
|
|
Jace
|
75dcdcec41
|
Fixed inconsistent editor input controls. Left mouse = select and move. Right mouse = camera.
|
2016-01-21 17:00:47 +01:00 |
|
|
Jace
|
a6548a72b3
|
Merge remote-tracking branch 'origin/master' into EditorUsefulness
# Conflicts:
# include/Engine/Collision/CollidableOctreeSystem.h
# include/Engine/Collision/CollisionSystem.h
# include/Engine/Collision/TriggerSystem.h
# include/Engine/Rendering/RenderSystem.h
# include/Game/Systems/PlayerSystem.h
# resources/Schema/Components/Physics.xsd
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/RenderSystem.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
# src/Game/Systems/HealthSystem.cpp
# src/Game/Systems/PlayerSystem.cpp
# src/Tests/OctTreeTestGameClass.cpp
|
2016-01-21 16:16:35 +01:00 |
|
|
Tleety
|
afe43c5f44
|
Shader will now handle Glowmaps. However the load code is not there yet.
|
2016-01-21 14:53:47 +01:00 |
|
|
Tleety
|
983f90504d
|
Bloom effect added, will have to see if it needs improving. Also added HDR colors and gamma correction.
|
2016-01-21 12:02:28 +01:00 |
|
|
Jace
|
4aa9100c69
|
Camera::WorldToScreen helper function
|
2016-01-21 10:29:36 +01:00 |
|
|
viktorljung
|
f3bfe388af
|
Clean up
|
2016-01-21 10:16:03 +01:00 |
|
|
Tleety
|
78a1037983
|
WIP
DrawScreenQuad implemented and working.
Started work on HDR coloring.
|
2016-01-20 13:34:56 +01:00 |
|
|
viktorljung
|
ce27b224df
|
Merge remote-tracking branch 'origin/master' into TextRendering
# Conflicts:
# include/Engine/Rendering/RenderQueue.h
# include/Engine/Rendering/RenderSystem.h
# include/Engine/Rendering/Renderer.h
# src/Engine/Rendering/RenderSystem.cpp
|
2016-01-19 17:27:09 +01:00 |
|
|
viktorljung
|
f0763bc2a3
|
Font loading crash fixed
|
2016-01-19 17:18:18 +01:00 |
|
|
Tleety
|
a8ffb24040
|
latest commit fix
|
2016-01-19 16:08:09 +01:00 |
|
|
Tleety
|
893ef38237
|
Removed world from renderer and moved depth-calculation code to modeljob
|
2016-01-19 15:41:17 +01:00 |
|
|
Tleety
|
982837052a
|
DirectionalLight now correctly getting directions
|
2016-01-19 14:44:17 +01:00 |
|
|
Tleety
|
4cafb2fc4c
|
Merge remote-tracking branch 'origin/master' into Forward+
|
2016-01-19 12:33:08 +01:00 |
|
|
Tleety
|
46e17b7e0d
|
Working directional light
|
2016-01-19 12:32:34 +01:00 |
|
|
viktorljung
|
dbe56280a6
|
Resolution fixed and Centered text
|
2016-01-19 11:45:34 +01:00 |
|
|
Jace
|
51979d7f0c
|
Changed System to take World through constructor and store it instead, cause it makes more sense.
|
2016-01-18 23:59:33 +01:00 |
|
|
Tleety
|
4b29d48f27
|
WIP
|
2016-01-18 17:57:45 +01:00 |
|
|
viktorljung
|
2a93e2ae7f
|
Merge remote-tracking branch 'origin/master' into TextRendering
# Conflicts:
# include/Engine/Rendering/RenderQueue.h
# include/Engine/Rendering/RenderSystem.h
# include/Game/Game.h
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/RenderSystem.cpp
|
2016-01-18 17:44:26 +01:00 |
|
|
viktorljung
|
92553f1e93
|
text size can now be entered in the filepath with a comma separator, like this "filepath,16"
|
2016-01-18 17:17:12 +01:00 |
|
|
Tleety
|
601ce85c05
|
WIP
|
2016-01-18 16:50:41 +01:00 |
|
|
Tleety
|
01a164847c
|
Directional light now fully added to all lists.
|
2016-01-18 15:15:33 +01:00 |
|
|
Tleety
|
794635b6a1
|
Added DirectionalLights to renderqueue jobs
|
2016-01-18 14:58:19 +01:00 |
|
|
Tleety
|
0a3b6f4da1
|
Added DirectionalLightJob
|
2016-01-18 14:57:55 +01:00 |
|
|
Tleety
|
4092f6b4d4
|
New Lightstruct working.
|
2016-01-18 14:20:28 +01:00 |
|
|
Jace
|
4786986abd
|
Rendering pipeline fixes across the board and base work on refactored editor
|
2016-01-17 06:29:25 +01:00 |
|
|
Jace
|
e34856468a
|
Removed DrawScenePass, since it doesn't seem to be used
|
2016-01-17 06:27:45 +01:00 |
|
|
Jace
|
ce8dcd3022
|
Merge pull request #33 from teamfisk/Forward+
Forward+
|
2016-01-15 16:20:53 +01:00 |
|
|
Tleety
|
3de853ac8b
|
Frustum culling now works correctly for all resolutions
|
2016-01-15 15:38:14 +01:00 |
|
|
viktorljung
|
7faed50507
|
Merge remote-tracking branch 'origin/master' into TextRendering
|
2016-01-15 13:24:24 +01:00 |
|
|
viktorljung
|
6fbb962b5e
|
Merge branch 'Rendering' into TextRendering
# Conflicts:
# include/Engine/Rendering/RenderQueue.h
# include/Engine/Rendering/RenderQueueFactory.h
# include/Engine/Rendering/Renderer.h
# include/Engine/Rendering/ShaderProgram.h
# include/Game/Game.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/Test.xml
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/RenderQueueFactory.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
|
2016-01-15 13:23:42 +01:00 |
|
 William Moberg
|
76f90ab031
|
The main thread is not mutex blocked while child threads load anymore.
|
2016-01-15 11:29:46 +01:00 |
|
|
Tleety
|
14bc850fab
|
Merge remote-tracking branch 'origin/master' into Forward+
|
2016-01-15 11:02:27 +01:00 |
|
|
Tleety
|
ecf524eb4e
|
Merge remote-tracking branch 'origin/master' into Forward+
# Conflicts:
# include/Engine/Rendering/PickingPass.h
# include/Engine/Rendering/Renderer.h
# resources/Schema/Entities/Test.xml
# src/Engine/Rendering/DrawScenePass.cpp
# src/Engine/Rendering/PickingPass.cpp
# src/Engine/Rendering/RenderQueueFactory.cpp
# src/Engine/Rendering/Renderer.cpp
|
2016-01-15 11:01:58 +01:00 |
|
|
William Moberg
|
4cf6dcfc14
|
Merge branch 'master' into AsyncResourceLoad
# Conflicts:
# include/Engine/Rendering/RawModel.h
# src/Engine/Rendering/RenderQueueFactory.cpp
|
2016-01-15 10:10:57 +01:00 |
|