BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
282 Commits 116 Branches 0 Tags
2f6d4fcd0b4d3a9526fbe5ff7582caa83048996e
Commit Graph

282 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
verysecrethero 2f6d4fcd0b Adjusted some of the corefiles back to the original in preparation for the Pull Request 2015-12-18 14:49:35 +01:00
verysecrethero e0cc25dbac Fixed the OctTreeTestGameClass.cpp so it draws the OctTree nicely again 2015-12-18 14:22:57 +01:00
verysecrethero b1ae96f737 Merge remote-tracking branch 'origin/master' into AndersTest 
# Conflicts:
#	include/Game/Game.h
#	src/Engine/Core/OctTree.cpp
#	src/Game/Game.cpp
#	src/Tests/CMakeLists.txt
#	src/Tests/OctTreeTest.cpp
#	src/Tests/WorldTest.cpp
 2015-12-18 11:57:21 +01:00
Jace 7dcd75fccc Merge pull request #18 from teamfisk/OctTree 
CollisionSystem, TriggerSystem and Octree
 2015-12-18 11:42:44 +01:00
verysecrethero 1e5e24a036 The tests seems to work under boost 1.59 but test explorer window is broken in 1.60. also changed ResourceManagerTest.cpp 2015-12-18 11:37:02 +01:00
verysecrethero 13f7fb2561 Stashed test fixes for boost 1.6 2015-12-18 10:01:05 +01:00
verysecrethero 8beddca89a Merge remote-tracking branch 'origin/master' into AndersTest 2015-12-17 17:48:28 +01:00
William Moberg 5e0fe975f3 Small error handling check. 2015-12-17 17:48:00 +01:00
William Moberg a26c8f2a24 Merge branch 'master' into OctTree 2015-12-17 17:30:44 +01:00
William Moberg 0f59b863ee Renamed IF_DEBUG_IS to DEBUG_IF, slightly different behavior and added some safety checking for auto creating AABBs from models. 2015-12-17 17:08:47 +01:00
Adam Byléhn d0927373a3 Merge pull request #20 from teamfisk/Editor 
More usable editor
 2015-12-17 16:51:59 +01:00
William Moberg 46ae2d39af Merge branch 'master' into OctTree 
# Conflicts:
#	src/Game/Game.cpp
 2015-12-17 16:44:01 +01:00
Jace e9128efd13 Translation widget planes 2015-12-17 15:30:43 +01:00
Jace 00f6056f7c Uniform scaling when dragging scaling widget origin 2015-12-17 15:30:43 +01:00
Jace a655f0bae5 Drag-and-drop asset picking and base work for showing component field tooltips in the editor 2015-12-17 15:30:43 +01:00
Jace cf6dde6c09 Boost dependency updated to version 1.60! 2015-12-17 15:30:43 +01:00
Jace c1b9404e52 Created a FileDropped event for when a file is dropped onto the client by the OS 2015-12-17 15:30:43 +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 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
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