 William Moberg
|
46ae2d39af
|
Merge branch 'master' into OctTree
# Conflicts:
# src/Game/Game.cpp
|
2015-12-17 16:44:01 +01:00 |
|
 Jace
|
8000654005
|
Model loading now fetches material opacity value properly
|
2015-12-17 15:28:05 +01:00 |
|
|
William Moberg
|
3e2ffdb85b
|
Fixed comment on Trigger events.
|
2015-12-17 13:48:35 +01:00 |
|
|
William Moberg
|
5160a45b44
|
Made Ray into a class with checks so the direction will always be normalized.
|
2015-12-17 13:41:34 +01:00 |
|
|
William Moberg
|
03d5f0dd67
|
Added an macro IF_DEBUG_IS(x) that executes if run in debug mode, AABB has a check so max and min corners are set properly in debug mode.
|
2015-12-17 13:31:54 +01:00 |
|
 Tobias Dahl
|
1a9b765d47
|
Merge pull request #17 from teamfisk/Editor
Kinda usable editor
|
2015-12-17 10:59:08 +01:00 |
|
|
Jace
|
c8460e0a6c
|
It's no use
|
2015-12-17 10:55:54 +01:00 |
|
|
Jace
|
b87f559291
|
Updated default configs with editor stuff
|
2015-12-17 10:46:49 +01:00 |
|
|
Jace
|
d4f5856304
|
Component attributes no longer get set on the wrong entity when switching selection while editing a field
|
2015-12-17 10:44:34 +01:00 |
|
|
Jace
|
a914a7f924
|
Switched to deps/master branch
|
2015-12-16 17:22:35 +01:00 |
|
|
Jace
|
dbbbb7b4e7
|
Working rotations and translations relative to global and local space for children
|
2015-12-16 17:20:56 +01:00 |
|
|
William Moberg
|
a23d69af9a
|
Removed old relics from OctTree testing in OctTree.
|
2015-12-16 17:08:55 +01:00 |
|
|
William Moberg
|
6d1cbd928e
|
Improved collision logic, still not perfect since it updates before PlayerSystem.
|
2015-12-16 16:34:27 +01:00 |
|
|
William Moberg
|
cf0ff9bfe5
|
Simple quickly made CollisionSystem.
|
2015-12-16 12:23:08 +01:00 |
|
|
William Moberg
|
d10df6ae09
|
TriggerSystem implemented and working.
|
2015-12-16 12:22:15 +01:00 |
|
|
William Moberg
|
99b76d7ae1
|
Fixed returning address to temporary in functions. AABB also constructible from glm::vec4s.
|
2015-12-16 12:19:43 +01:00 |
|
|
Jace
|
661532e355
|
Slightly more usable entity tree
|
2015-12-16 12:05:55 +01:00 |
|
|
Jace
|
bd6adcc157
|
Added SetParent to World
|
2015-12-16 12:05:37 +01:00 |
|
|
Jace
|
322aedaf72
|
Basic transformation widgets
|
2015-12-16 09:47:38 +01:00 |
|
|
William Moberg
|
04a01104b5
|
Merge branch 'master' into OctTree
# Conflicts:
# src/Engine/CMakeLists.txt
# src/Game/Game.cpp
|
2015-12-15 17:11:11 +01:00 |
|
|
William Moberg
|
ed82a0939a
|
Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree
|
2015-12-15 15:37:14 +01:00 |
|
|
William Moberg
|
e2417be8c7
|
Very simple CollisionSystem made, 'Z','Y' to toggle on/off.
|
2015-12-15 15:36:28 +01:00 |
|
|
William Moberg
|
170610bcb1
|
Added a TriggerSystem, seems to work as intended.
|
2015-12-15 14:49:52 +01:00 |
|
 verysecrethero
|
454ed0032b
|
Refactored some RayVsModel tests
|
2015-12-15 14:01:49 +01:00 |
|
|
verysecrethero
|
1229a99af4
|
Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree
|
2015-12-15 11:07:51 +01:00 |
|
|
verysecrethero
|
8e431c8edd
|
RayVsModel && RayVsAABB tests added and working. Also adjusted RayVsModel,RayVsAABB with deltas when values are very close to each other (floatingprecision problems)
|
2015-12-15 11:07:09 +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 |
|
|
verysecrethero
|
948f6d5de7
|
RayVsModel & RayVsAABB comparison continued
|
2015-12-14 17:53:11 +01:00 |
|
|
William Moberg
|
ae7d4b9097
|
Put Collision folder in CMakeLists.txt and altered paths.
|
2015-12-14 17:35:39 +01:00 |
|
|
William Moberg
|
e6fa9df3a5
|
Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree
|
2015-12-14 17:08:51 +01:00 |
|
|
William Moberg
|
59095c2ce5
|
Started on CollisionSystem and TriggerSystem. Moved collision code to Collision folder.
|
2015-12-14 17:08:00 +01:00 |
|
|
verysecrethero
|
7f8e78c8cd
|
RayVsModel tests in progress
|
2015-12-14 17:04:35 +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 |
|