maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
2713 commits 4 branches 46 tags 65 MiB
Commit graph

2713 commits

This branch
This branch
All branches
Author SHA1 Message Date
Moritz Brückner a4dba65a7a "Fix" vector node 2020-04-12 17:32:52 +02:00
Lubos Lenco 290493a4f7
Merge pull request #1649 from MoritzBrueckner/mapping-node 
Refactor and fix mapping node
 2020-04-12 11:34:10 +02:00
Lubos Lenco f446c0a009
Merge pull request #1650 from MoritzBrueckner/array-loop 
Fix ArrayLoopNode socket (dynamic value) + add "Index" output
 2020-04-12 11:33:19 +02:00
Lubos Lenco 6abaacd907
Merge pull request #1651 from QuantumCoderQC/master 
Added set checkbox and OnCanvasElement Node
 2020-04-12 11:30:36 +02:00
Lubos Lenco 26aa9956a2
Merge pull request #1652 from RLP9GHR60I/iss1256 
Add "Has contact (Array)" node
 2020-04-12 11:29:17 +02:00
Daniel B. Bruno 4a3d3a58d6 Add "Has contact (Array)" node 
This node was requested on issue #1256.
 2020-04-11 17:57:21 -03:00
Moritz Brückner f5c624895a Cherry Pick "Add "fake user" setting for traits" 
# Resolved Conflicts:
#	blender/arm/exporter.py
 2020-04-11 21:01:39 +02:00
QuantumCoderQC dda2396313 Added set checkbox and OnCanvasElement Node 2020-04-11 18:33:53 +02:00
Moritz Brückner a9d2a10d0b Fix ArrayLoopNode socket (dynamic value) + add "Index" output 2020-04-11 17:49:17 +02:00
Moritz Brückner 6a16cebadf Refactor mapping node 2020-04-11 16:44:06 +02:00
Lubos Lenco 0ac46b3bb5
Merge pull request #1648 from MoritzBrueckner/proxy-traits 
Proxy: Add option to keep local trait properties when syncing
 2020-04-11 16:21:15 +02:00
Lubos Lenco 736ec92592
Merge pull request #1647 from MoritzBrueckner/lod 
Fix lod deletion
 2020-04-11 16:19:08 +02:00
Lubos Lenco 82cee159f4
Merge pull request #1646 from MoritzBrueckner/trait-fake-user 
Add "Fake User" setting for traits + reorder trait UI
 2020-04-11 16:17:43 +02:00
Moritz Brückner c3eac025b3 Small improvements + fix for multiple traits per object 2020-04-11 14:22:22 +02:00
Moritz Brückner df30e9b681 Set arm_proxy_sync_trait_props to False by default 2020-04-10 23:10:01 +02:00
Moritz Brückner b1572e316e Proxy: Add option to keep local trait properties when syncing 2020-04-10 23:06:37 +02:00
Moritz Brückner af8a7615b3 Fix lod deletion 2020-04-10 21:46:28 +02:00
Moritz Brückner c9b89e6036 Reorder trait UI 2020-04-10 20:44:35 +02:00
Moritz Brückner 403e52109c Add "fake user" setting for traits 2020-04-10 20:43:59 +02:00
Moritz Brückner eefcefbf91 Static initialization for some variables 2020-04-10 19:38:28 +02:00
Moritz Brückner 3882c56fc4 Replace "==/!= None" with "is/is not None" 2020-04-10 19:25:34 +02:00
Moritz Brückner b5b8c4f993 Fix last commit 2020-04-10 19:22:56 +02:00
Moritz Brückner 3593092c59 Remove "== True" and replace "== False" with "not" 2020-04-10 19:21:52 +02:00
Lubos Lenco f3fabd7d7c
Merge pull request #1645 from Sandy10000/master 
fix https://github.com/armory3d/armory/issues/1576
 2020-04-10 15:54:59 +02:00
Sandy 7541ca86a2
fix https://github.com/armory3d/armory/issues/1576 2020-04-10 21:22:04 +09:00
Moritz Brückner d4974d1340 Change methods to staticmethods or classmethods if possible 
+ some small style improvements
 2020-04-10 01:56:12 +02:00
Moritz Brückner 3d1f65071c Fix type hint (again) 2020-04-10 01:26:54 +02:00
Moritz Brückner 7e5342ef8d Replace Python 3.5 annotations with Python 3.6 annotations 2020-04-10 01:20:08 +02:00
Moritz Brückner 754cb501ca snake_case for ArmoryExporter member variables 
Also removed some unused variables
 2020-04-10 01:18:10 +02:00
Moritz Brückner caee1a87a2 Small performance improvement 2020-04-10 01:09:34 +02:00
Moritz Brückner 0e4c9f9f18 Improve docstring 2020-04-10 01:03:41 +02:00
Moritz Brückner 5859b11c2e Fix type annotation 2020-04-10 00:57:54 +02:00
Moritz Brückner f5b37f99aa Transform exporter into class (one instance per scene) 
This has two big advantages:
- One place for variable initialization (and less warnings from pylint etc.)
- No errors due to forgotten cleanups because every scene export now has its own class instance
 2020-04-10 00:56:16 +02:00
Moritz Brückner d7e6ec1a79 Fix write_matrix() 2020-04-10 00:48:49 +02:00
Moritz Brückner 6e3f3dca98 More type annotations 2020-04-10 00:30:16 +02:00
Moritz Brückner a18c87c392 Make write_matrix static 2020-04-10 00:23:03 +02:00
Moritz Brückner 37e4bc9f85 Some smaller style improvements 2020-04-09 23:53:03 +02:00
Moritz Brückner 4a2ed852b5 Rename struct_identifier + change it to tuple to make it clear it is a constant 2020-04-09 23:52:29 +02:00
Moritz Brückner 6daf501eeb Move get_bobject_type() into NodeTyp enum 2020-04-09 23:51:33 +02:00
Moritz Brückner 0a23241735 Remove unused constants 2020-04-09 23:50:36 +02:00
Moritz Brückner 8d23458f92 Fix process_bone() 2020-04-09 23:42:52 +02:00
Moritz Brückner eae4747bce Replace NodeType[...] with enum 2020-04-09 23:40:18 +02:00
Moritz Brückner f836e9a1a4 export_object(): pep8 cleanup 2020-04-09 23:25:26 +02:00
Moritz Brückner 6deedd7b35 Add type annotations to export_object() 2020-04-09 23:19:07 +02:00
Lubos Lenco 3edccefddf
Merge pull request #1639 from Sandy10000/master 
Mark return value for CanvasGetPosition nodes
 2020-04-09 15:31:13 +02:00
Lubos Lenco 177f1f59a7
Merge pull request #1642 from MoritzBrueckner/fix-camera 
Fix camera export when multiple scenes are exported
 2020-04-09 15:30:45 +02:00
Lubos Lenco 66bfce79a1
Merge pull request #1643 from MoritzBrueckner/fix-asset-export 
Better asset name conflict detection + use log.warn() for warnings
 2020-04-09 15:30:15 +02:00
Lubos Lenco b5c0154062
Merge pull request #1644 from MoritzBrueckner/debug-console 
Fix debug console
 2020-04-09 15:29:56 +02:00
Moritz Brückner 08b690adf8 DebugConsole: Fix outliner look 2020-04-09 00:21:35 +02:00
Moritz Brückner f242e0316e Fix debug console for scenes with no world 2020-04-09 00:20:54 +02:00