 verysecrethero
|
1910ab705b
|
AndersTest misc small mergefixes
|
2015-12-15 13:48:14 +01:00 |
|
|
verysecrethero
|
f9508657f5
|
Merge remote-tracking branch 'origin/master' into AndersTest
# Conflicts:
# include/Engine/Core/InputController.h
# include/Game/Game.h
|
2015-12-15 11:32:47 +01:00 |
|
 Jace
|
51dd627ae3
|
Added Fonts to deploy.bat
|
2015-12-15 09:49:43 +01:00 |
|
|
Jace
|
c296c4eb3b
|
Fixed picking pass... again...
|
2015-12-15 09:49:38 +01:00 |
|
|
Jace
|
422e6f5264
|
Created a RenderState for ImGuiRenderPass
|
2015-12-14 20:26:04 +01:00 |
|
 Viktor Ljung
|
9cee8b5478
|
Merge pull request #16 from teamfisk/Editor
Added BlendEquation and BlendFunc to RenderState ...
|
2015-12-14 20:25:10 +01:00 |
|
|
Jace
|
522679b14c
|
Added BlendEquation and BlendFunc to RenderState, and cleaned it up A LOT
|
2015-12-14 20:23:29 +01:00 |
|
|
Viktor Ljung
|
25683e8a8a
|
Merge pull request #15 from teamfisk/Editor
Editor
|
2015-12-14 19:05:27 +01:00 |
|
|
Jace
|
cddd9026fb
|
Toggle editor with "ToggleEditor" command. Enable editor with "Debug.EnableEditor" config variable.
|
2015-12-14 16:12:52 +01:00 |
|
|
Jace
|
ea239b19bd
|
Fixed component type resolution order to prioritize custom types before native ones, since namespace information doesn't exist at that stage.
|
2015-12-14 16:12:20 +01:00 |
|
|
Jace
|
f8d927cd91
|
Don't render invisible model components
|
2015-12-14 16:11:37 +01:00 |
|
|
Jace
|
798c73132e
|
Fixed ScreenCoords::ToPixelData stack corruption
|
2015-12-14 16:11:08 +01:00 |
|
|
Jace
|
fb2cd0c6ae
|
Fixed float angle wrapping
|
2015-12-14 15:20:55 +01:00 |
|
|
Jace
|
bc6a211276
|
Removed RenderState log spam
|
2015-12-14 14:54:19 +01:00 |
|
|
Jace
|
7719274a37
|
Correct asset reference for fonts
|
2015-12-14 14:54:03 +01:00 |
|
|
Jace
|
797036c204
|
Fixed picking event
|
2015-12-14 14:24:11 +01:00 |
|
|
Jace
|
3a9577c9fb
|
fixup! Enabled rendering "transparency"
|
2015-12-14 14:08:37 +01:00 |
|
|
Jace
|
545869e342
|
Added scene graph UI to Editor
|
2015-12-14 13:58:28 +01:00 |
|
|
Jace
|
07c4744436
|
Added World DeleteEntity, HasComponent and GetEntityChildren
|
2015-12-14 13:58:27 +01:00 |
|
|
Jace
|
b8620eac26
|
Made debug camera detect UI focus properly
|
2015-12-14 13:58:27 +01:00 |
|
|
Jace
|
7bc492134d
|
Enabled rendering "transparency"
|
2015-12-14 13:58:24 +01:00 |
|
|
Jace
|
7c1182c28f
|
Fixed absolute positions once and for all (maybe?)
|
2015-12-14 13:57:56 +01:00 |
|
|
Jace
|
2f3843e595
|
Editor version 1
|
2015-12-14 13:57:55 +01:00 |
|
|
Jace
|
5f3c234819
|
Added DeleteComponent function to world
|
2015-12-14 13:57:54 +01:00 |
|
|
Jace
|
9a119f38bb
|
Added events processing to SystemPipeline
|
2015-12-14 13:57:54 +01:00 |
|
|
Jace
|
524af211e0
|
Made resource loading fail gracefully when a resource can't be loaded. Resources should now throw exceptions in their constuctor if the resource can't be loaded. This will result in ResourceManager::Load returning null.
|
2015-12-14 13:57:53 +01:00 |
|
|
Jace
|
91ace0d2a0
|
Fixed bug in ComponentPool::Delete. Wasn't taking EntityID into account when freeing memory.
|
2015-12-14 13:57:53 +01:00 |
|
|
Jace
|
2018ba27ae
|
Added KnowsEntity function to ComponentPool to query whether an entity has a component attached
|
2015-12-14 13:57:52 +01:00 |
|
|
Jace
|
b66cf47ff0
|
Revert "Clearing raw input events from event broker to encourage use of input commands instead"
This reverts commit 2e7e8d3546.
|
2015-12-14 13:57:52 +01:00 |
|
|
Jace
|
e5084e13ec
|
Added EditorSystem
|
2015-12-14 13:57:51 +01:00 |
|
|
Jace
|
8a6030bf57
|
Added support for "Impure" systems, which only update once per frame and contain their own logic for manipulating the world, instead of relying on a single list of components.
|
2015-12-14 13:57:51 +01:00 |
|
|
Jace
|
2e321e15a5
|
Cleaned up ImGuiRenderPass
|
2015-12-14 13:57:50 +01:00 |
|
|
Jace
|
c81a054601
|
Subscribed ImGui to MouseScroll event
|
2015-12-14 13:57:50 +01:00 |
|
|
Jace
|
af14d60493
|
Added MouseScroll event to input manager
|
2015-12-14 13:57:49 +01:00 |
|
|
Jace
|
0465fdb16d
|
Added ImGui for compilation
|
2015-12-14 13:57:49 +01:00 |
|
|
Jace
|
0c6ac1e060
|
Added ImGui to README
|
2015-12-14 13:57:48 +01:00 |
|
|
Jace
|
7db1feac17
|
Added basic ImGui implementation
|
2015-12-14 13:57:45 +01:00 |
|
|
Jace
|
653b4689b5
|
Added KeyboardChar event for keyboard text input
|
2015-12-14 13:56:24 +01:00 |
|
 Adam Byléhn
|
6723e71fee
|
Merge pull request #14 from teamfisk/Input
Input
|
2015-12-14 13:55:11 +01:00 |
|
|
Jace
|
d16cbe84f0
|
Merge remote-tracking branch 'origin/master' into Input
# Conflicts:
# src/Engine/Rendering/Renderer.cpp
|
2015-12-14 13:40:22 +01:00 |
|
|
Jace
|
95ce024bb6
|
Merge pull request #13 from teamfisk/RendererDecoupling
Renderer decoupling
|
2015-12-14 13:39:20 +01:00 |
|
|
Jace
|
a7ed455766
|
Merge branch 'master' into Input
|
2015-12-14 13:19:38 +01:00 |
|
 Tleety
|
d182e6c453
|
Merge remote-tracking branch 'origin/master' into RendererDecoupling
# Conflicts:
# src/Game/Game.cpp
|
2015-12-14 13:16:56 +01:00 |
|
|
Jace
|
e76a6b74a3
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
# Conflicts:
# src/Game/Game.cpp
|
2015-12-14 11:41:59 +01:00 |
|
|
Jace
|
e82911cb8b
|
Renderer FOV setting in Config.ini
|
2015-12-14 11:39:13 +01:00 |
|
|
verysecrethero
|
bf08ffe392
|
Added InputManagerTest
|
2015-12-14 11:02:23 +01:00 |
|
|
verysecrethero
|
5f5cab1171
|
Added Tests for ResourceManager
|
2015-12-14 10:55:49 +01:00 |
|
|
Jace
|
30474b70df
|
MouseInputHandler
|
2015-12-12 13:42:46 +01:00 |
|
|
Jace
|
03e226ffea
|
Refactored InputProxy to gracefully handle cases where multiple origins send the same command
|
2015-12-12 13:42:35 +01:00 |
|
|
Jace
|
2e7e8d3546
|
Clearing raw input events from event broker to encourage use of input commands instead
|
2015-12-12 13:42:35 +01:00 |
|