Commit graph

329 commits

Author SHA1 Message Date
Moritz Brückner e53d9446e7 Cleanup 2020-12-04 21:17:50 +01:00
E1e5en 59c31950c8 Added option for HTML5 Settings
- Disable browser context menu - disable the browser context menu for the canvas element on the page (index.html).
2020-12-02 20:54:14 +03:00
Lubos Lenco 67e2b0171b
Merge pull request #2030 from Naxela/master
Update lightmapper to version 0.4
2020-11-30 11:18:26 +01:00
QuantumCoderQC d71284560e Implemented a new node to add rigid bodies to objects at run-time 2020-11-29 01:16:59 +01:00
Alexander 837a313c7a Fix indentation errors 2020-11-28 23:58:28 +01:00
Alexander b24a76f30f Update lightmapper 2020-11-28 23:23:52 +01:00
E1e5en d084a8297e Windows Settings – Publish and action after
Windows Settings:
Visual Studio Version - select the studio version for which the project will be exported. Options: 2010, 2012, 2013, 2015, 2017, 2019. Default: 2019.
Update - checks the installed versions of Visual Studio on the PC and adds (installed) to the version in the list if available (for information). Example:
sample_vs_2
Action After Publishing - select an action after a successful publication. Options:
Nothing - do nothing. Default value;
Open In Visual Studio - open the project in the corresponding studio version;
Compile - compilation of the project;
Compile and Run - compile and run the project. Then the executable file will be copied to the windows-hl folder (where the resources are located).
Mode - compilation mode. Options: Debug, Release. Default: Debug.
Architecture - the architecture for which the application will be built. Options: x86, x64. Default: version of the user’s PC architecture.
Compile Log Parameter - setting the output of messages during compilation:
Summary - show the error and warning summary at the end. Default value;
No Summary - don \ 't show the error and warning summary at the end;
Warnings and Errors Only - show only warnings and errors;
Warnings Only - show only warnings;
Errors Only - show only errors.
More details can be found here - MSBuild command-line reference (I took only part of the settings).
Count CPU - specifies the maximum number of concurrent processes to use when building. More details can be found here - MSBuild command-line reference. The default is 1. Maximum value: the number of CPUs in the system (function multiprocessing.cpu_count()).
Open Build Directory - open the folder with the application after a successful build. If the Compile and Run option is selected, then the executable file will be copied to the windows-hl folder (where the resources are located) and this folder will open. Otherwise, the folder where the given Visual Studio file is going will open.
The user will also receive a message if the studio version selected for export and for opening in the studio or compilation is not on the PC. And a list of installed ones will be issued. Example:

Visual Studio 2017 (version 15) not found.
The following are installed on the PC:
- Visual Studio Community 2019 (version 16.8.30711.63)
To obtain information about the installed versions of Visual Studio, use the vswhere.exe utility (open source) included in Kha (located in the …\ArmorySDK\Kha\Kinc\Tools\kincmake\Data\windows).
2020-11-24 20:41:50 +03:00
Lubos Lenco 48952e04a8
Merge pull request #2017 from MoritzBrueckner/nodes-context-menu
Add node context menu entry for material parameters
2020-11-22 08:27:15 +01:00
Lubos Lenco 29297513cf
Merge pull request #2018 from MoritzBrueckner/driver-api
Add per-material UI support for driver API
2020-11-21 16:54:26 +01:00
E1e5en 99a4c400b8 Fix Android and HTML5 Settings
- Fixed a bug with updating the list of emulators if they are not there.
- Fixed a bug with enabling/disabling options when changing links to Android SDK.
- Fixed display of settings in the form of open panels. When collapsing panels appear incorrect display.
2020-11-18 08:24:04 +03:00
Moritz Brückner a1b121a2a7 Add per-material custom UI for drivers 2020-11-17 18:54:53 +01:00
Moritz Brückner e747190746 Whitespace cleanup 2020-11-16 19:55:15 +01:00
Moritz Brückner 07acf00b0c Add node context menu entry for material parameters 2020-11-16 19:54:52 +01:00
E1e5en 4b3aea0513
Merge branch 'master' into html5-settings 2020-11-14 15:12:20 +03:00
E1e5en 2bd08722a1 HTML5 Settings
Added Armory Exporter - HTML5 Settings panel:
- Copy Files To Specified Folder - copy files to the folder specified in the settings after publish. The name of the folder where the result will be copied is formed based on the name of the project and version. Sample, test-1.0.5.
- Run Browser After Copy - run browser after copy. The url is formed from the one specified in the settings and the directory with the project where it was copied. Sample, http: //localhost/test-1.0.5.

Added settings in Render: Armory:
- HTML5 Copy Path - path to copy project after successfully publish (directory on local web-server).
- Url To Web Server - url that runs the local server.
2020-11-13 21:45:31 +03:00
E1e5en 65dd6b701f Exporter Panel - Project Settings
1. Processing data entry into fields:
- Name - the field must not be empty. If the user tries to set an empty value, then this field specifies the name of the blend file (this is how it is implemented during assembly). The default is the name of the blend file.
- Package - the field must not be empty, it must not consist only of numbers and start with a number. The . symbol is replaced with _. The default is arm.
- Bundle - the field must be filled in according to the mask [string].[string]. Each part must not be empty, contain numbers, or start with a number. The default is org.armory3d. Previously, this field was blank, in which case the current default was used.
- Version.
Input in the Version field is processed and only allows input by masks:
- 0.0
- 0.0.0
- 0.0.0.0
In any case, the value is ignored and the previous value remains.

If the (Auto-increment Build Number) checkbox is checked and when performing the operation, Build and Publish will be automatically incremented by one after the version value.
Examples:
it was 1.0 - it is 1.1,
it was 1.9 - it is 1.10,
it was 1.0.1 - it is 1.0.2,
it was 0.1.1.2 - it is 0.1.1.3.

Defaults:
- Version - 1.0.0
- Auto-increment Build Number - enabled.

For all fields, special characters ([] / \ ;,> <& *:% = + @! # ^ () |? ^) Are also replaced with _.

2. Fixed display of Android Settings panel.
2020-11-13 20:36:27 +03:00
E1e5en ab3d64d651 Android Settings More
Panel Armory Exporter - Android Settings - Build APK:
1. Rename APK To Project Name
Renames the APK file from app-debug.apk to [project-name]-[version] .apk. Example, for the project example_ball.blend, the result will be the name example-ball-1.0.apk.
2. Copy APK To Specified Folder
Copies the final file to the folder specified in Preferences.

Preferences Render: Armory:
1. Copy APK To Folder
The path to the folder where the final APK file will be copied.
2. Open Directory After Copy
Open this folder after copying.

Console messages:
Rename APK to example-ball-1.0.5.apk
Copy APK to C:\IDE\Test

Use-case:
These settings will allow you to have unique names for files, as well as copy them to the required folder for uploading to the device or to the cloud.
2020-11-12 22:09:55 +03:00
E1e5en 9fbd29b143 Checking Blender version for Armory
- Added compare function to utils.py module
- Added check of Blender version and display of a message about incorrectness during Play, Build, Publish operations
2020-11-01 21:10:44 +03:00
E1e5en 5451b3e7e2 Added settings for building APK
Added a panel with settings:
- Building APK After Publish - to start the build after the project has been successfully published (False by default). Disabled if SDK path is not specified;
- Emulator - list of installed emulators in Android Studio (AVD Manager). At the start of Blender, the list is always empty, to fill and update it, you must click the Refresh button. To start the emulator, if you wish, you need to press the "Start" button (the list of emulators is obtained with the emulator -list-avds command, the launch is performed with the emulator -avd [name] command). The "Start" button is disabled if the name of the emulator is not selected from the list;
- Run Emulator After Building APK - launch the emulator after successfully building the APK file. Disabled if no APK build is installed or no emulator name selected.

To perform these operations, you need to specify the ANDROID_SDK_ROOT environment variable, if it is not specified in the OS, then the "Android SDK Path" setting is read and set as the environment variable os.environ ['ANDROID_SDK_ROOT'] to perform operations.
If no value is specified, then the user receives a corresponding message to the console. If the specified value is incorrect, then the user will receive messages from the corresponding programs.
2020-10-22 19:19:03 +03:00
Lubos Lenco e9c351c7e0
Merge pull request #1936 from E1e5en/add-android-settings
Add Android Settings + LN Set Vibrate
2020-10-18 11:59:35 +02:00
E1e5en 1a34e202a7 Add Android Settings + LN Set Vibrate
1. For the new settings to fully function, you need to update the submodules so that this Pull Request (https://github.com/Kode/kincmake/pull/100) gets into armsdk. Extended settings via khafile.js.

2. Added Android Settings panel:
- invisible until the target platform android-hl is added to the list;
- inactive until the target platform android-hl is selected in the list.
Options:
- Orientation;
- Compile Version SDK - from 26 to 30, default 29;
- Minimal Version SDK - from 14 to 30, default 14;
- Target Version SDK - from 26 to 30, default 29;
- Permissions - a list of permissions. If I will duplicate entries in the list, then only unique entries will be included during export. By default, the list is empty;
- Android ABI Filters - a list of platforms to build for (arm64-v8a, armeabi-v7a, x86, x86_64). If I will duplicate entries in the list, then only unique entries will be included during export. By default, the list is empty. If the list is empty, then all platforms will be used (as before).

3. The enum (names of permissions) and the function have been added to the utils.py modules, which adds the specified value to the list of permissions. Feature added for ease of use from different locations (different logical nodes).

4. List of permissions:
- ACCESS_COARSE_LOCATION - Allows an app to access approximate location;
- ACCESS_NETWORK_STATE - Allows applications to access information about networks;
- ACCESS_FINE_LOCATION - Allows an app to access precise location;
- ACCESS_WIFI_STATE - Allows applications to access information about Wi-Fi network;
- BLUETOOTH - Allows applications to connect to paired bluetooth devices;
- BLUETOOTH_ADMIN - Allows applications to discover and pair bluetooth devices;
- CAMERA - Required to be able to access the camera device;
- EXPAND_STATUS_BAR - Allows an application to expand or collapse the status bar;
- FOREGROUND_SERVICE - Allows a regular application to use Service.startForeground;
- GET_ACCOUNTS - Allows access to the list of accounts in the Accounts Service;
- INTERNET - Allows applications to open network sockets';
- READ_EXTERNAL_STORAGE - Allows an application to read from external storage;
- VIBRATE - Allows access to the vibrator;
- WRITE_EXTERNAL_STORAGE - Allows an application to write to external storage.

5. Added logical node Set Vibrate:
Category: Native
Pulses the vibration hardware on the device for time in milliseconds, if such hardware exists.
Input parameters:
- Milliseconds - time in milliseconds (data type Int, default value 100).
When adding the logical node Set Vibrate, the permission is automatically added to the list, even if the target android-hl has not been added to the export list (using a function from utils.py).
2020-10-17 16:47:54 +03:00
Moritz Brückner 203da296ad Make arm.utils.folder() work with every folder 2020-10-17 15:08:56 +02:00
Lubos Lenco 20c8be3d0d
Merge pull request #1924 from MoritzBrueckner/world-nodes
World nodes support and nodes parsing refactor
2020-10-11 20:23:53 +02:00
Moritz Brückner 8f7e99530c Show node panels only when applicable 2020-10-11 00:24:11 +02:00
E1e5en 305878db42 Add Debug Console settings
1. Adding the ability to customize display, scale (size), shortcuts to the DebugConsole class.
2. Adding a function to utils.py to get Debug Console settings from Render: Armory.
3. Added Debug Console settings to the Armory Project interface:
- Enable (default value - False);
- Position (Left, Center, Right, default value - Right);
- Scale Console (from 0.3 to 10);
- Visible.
4. Added transfer of Debug Console settings to exporter.py.
5. Added logical nodes to control DebugConsole while the application is running.
2020-10-10 13:10:34 +03:00
niacdoial bdc33cb419 added node versioning information to all node classes 2020-09-13 11:27:58 +02:00
niacdoial 3a2952ced8 Added node versioning
- changed the way custom node sockets are handled at several places
 - updated the `replaceAll` and `replace` functions used to perform node replacements
 - renamed and improved the NodeReplacement [new name] class, which represents a replacement task
 - added an arm_version property to all logic nodes, as well as a `get_replacement_node` method (to be overridden for each node)
 - added an option to declare a node as obselete in add_node()  (useful in order to have the node defined, but out of the menu)
 - added classes for UI popups linked to node updates, as well as an operator dedicated to said node update

Thanks to MoritzBrueckner for part of the ground work!
2020-09-12 18:15:53 +02:00
Alexander ea5219e67d Fix for OpenCV installation 2020-09-01 18:06:35 +02:00
Lubos Lenco 1bf56ba960
Merge pull request #1827 from armory3d/lightmapper
Lightmapper
2020-09-01 10:41:49 +02:00
Alexander 607f4e7b33 Update to 0.3.2.0 2020-08-30 18:34:59 +02:00
Alexander 495d485f39 Add lightmapping props to object, register lightmapper 2020-08-24 22:12:31 +02:00
Alexander 5d914b3bf5 Merge lightmapper 0.3.1.2 2020-08-23 23:13:26 +02:00
Moritz Brückner baddcfaacc Add missing draw_view3d_object_menu 2020-08-10 14:42:42 +02:00
Moritz Brückner eeb1d9e3ab Add CopyTraitsFromActive operator 2020-08-10 00:23:26 +02:00
Moritz Brückner d0e9369947 Revert water/fog UI and remove now unused properties 2020-07-01 20:57:01 +02:00
Moritz Brückner 569d139e4e Replace some wrd defs by individual word defs 2020-06-22 22:03:02 +02:00
tong bba3b924c0 Allow to set custom play scene 2020-05-23 12:18:07 +02:00
Moritz Brückner da07e72127 Add icon for "Open Editor" operator 2020-04-12 20:04:28 +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 fe367518cc
Merge branch 'master' into console-output 2020-03-07 00:04:30 +01:00
Moritz Brückner 1da4b02cef Count compilation warnings and show them in the UI and console 2020-03-06 23:49:14 +01:00
Alexander 60f72e7e0e Merge in PPM
Redone and ready to be merged with Armory
2020-03-04 17:45:19 +01:00
Moritz Brückner 086810849e De-clutter console output (new "Verbose Output" switch) 2020-03-04 00:14:14 +01:00
Lubos Lenco 75ca3aa44b
Merge pull request #1592 from philipmduarte/autobake
Action autobaking
2020-03-02 19:20:24 +01:00
Philip Michel Duarte 8921afd155 autobake done 2020-03-02 11:03:42 -03:00
Moritz Brückner 7b9fb161fe Deactivate "Debug Console" checkbox when Zui is not enabled 2020-03-02 00:00:56 +01:00
Zeeshan Abid 426eb912d4 open folder button support 2019-09-24 16:23:49 +01:00
Moritz Brückner 22dd37cc67 Add Sublime Text as a supported text editor
Todo: build configuration
2019-09-11 21:04:09 +02:00
luboslenco 4d5309a07a Fix terrain material creation 2019-08-23 16:12:30 +02:00
Lubos Lenco ad114a95f8
Merge pull request #1338 from N8n5h/nav-update
update for navmesh generation
2019-08-10 12:57:22 +02:00
Alexander 000ec17e3d Chromatic aberration 2019-08-08 20:02:42 +02:00
Alexander f521828edc Lens dirt masking 2019-08-08 18:56:56 +02:00
user d21ff3e9d8 update 2019-08-07 12:02:36 -03:00
luboslenco ff3ca27aa9 Separate format lib 2019-08-04 15:31:25 +02:00
luboslenco 2da0e03d17 Micro shadowing 2019-05-21 21:53:57 +02:00
luboslenco 2303bada3a Add single-data-file exporter option 2019-05-14 11:43:41 +02:00
luboslenco 2eec77d434 Update labels 2019-05-07 09:54:10 +02:00
luboslenco d05641b4a3 Auto-exposure speed 2019-05-01 10:52:42 +02:00
luboslenco e402442754 Water refract 2019-04-29 16:21:44 +02:00
luboslenco d8bd7f6972 Link clouds props 2019-04-26 09:58:20 +02:00
unknown 5240249982 Use voxelao instead of voxelgi, gi will be reworked into raytracing 2019-04-06 18:52:21 +02:00
unknown ad88b97d63 Code cleanup 2019-04-06 15:38:25 +02:00
unknown 4ecec19ad3 Force gpu skinning 2019-04-06 14:13:38 +02:00
luboslenco f02de4b16b Ensure material exists 2019-04-02 18:53:53 +02:00
Urjasvi bb1a1c4904 updating addon fixes 2019-03-30 12:18:55 +05:30
Urjasvi 318e875013 update addon to latest blender api changes 2019-03-29 19:25:42 +05:30
luboslenco c29e8fdbd0 Shadows cleanup 2019-03-23 10:56:30 +01:00
Lubos Lenco c22a610a41
Merge pull request #1188 from katharostech/feature_material-panels-improvements
Move Armory Tilesheet Panel and Update Material Blending Panel
2019-02-22 12:32:52 +01:00
Zicklag 4ea480d2c1 Move Armory Tilesheet Panel and Update Material Blending Panel
The Armory TileSheet Panel was moved to the Blender material tab.

Resolves #1126
2019-02-21 13:05:35 -06:00
luboslenco 1e5b11d0a3 Expose vignette strength 2019-02-21 14:20:18 +01:00
luboslenco e0e4bf303f Send operators to Krom 2019-02-10 11:47:42 +01:00
luboslenco a1da8b0824 Expose cone aperture 2019-02-09 15:34:16 +01:00
luboslenco cd7a25db37 Correct displace amount 2019-02-04 21:47:46 +01:00
luboslenco e17d06225c Expose voxel shadow 2019-01-27 19:12:00 +01:00
luboslenco ba2b582d6c Check scene on publish 2019-01-25 08:07:35 +01:00
luboslenco 74c887a1b7 Use PointerProperty for exporter scene 2019-01-24 15:09:49 +01:00
luboslenco 9ba53d172d Transluc + sss fixes 2019-01-24 12:47:51 +01:00
luboslenco c81d4949ca No need for material tilesheet flag 2019-01-22 12:38:47 +01:00
luboslenco 9c023ecec2 Prevent navmesh duplicates 2019-01-22 09:51:40 +01:00
luboslenco b2378933d1 Remove NavMesh button 2019-01-22 09:48:22 +01:00
luboslenco b6e5506612 Warn on special path 2019-01-21 16:57:38 +01:00
luboslenco bc953c70be Link sector texture 2019-01-20 18:32:52 +01:00
luboslenco 3e645a95b4 Merge terrain stream 2019-01-17 21:34:38 +01:00
luboslenco d64441b7d3 Update voxelgi 2019-01-10 21:54:36 +01:00
luboslenco 2eab2c1adb Shadow fixes 2019-01-09 21:25:09 +01:00
luboslenco 571853eb86 Fix lod generation 2019-01-08 22:49:21 +01:00
Zicklag cfc1bc54aa Fix Armory Bake Python Error
From forum topic:
http://forums.armory3d.org/t/cnt-bake-traceback-error-comes-always/2451?u=zicklag
2019-01-07 13:22:25 -06:00
Lubos Lenco 43e5badff3
Merge pull request #1060 from katharostech/issue_logic-tree-selector
Fix Node Trait Selection Issue
2019-01-04 15:18:03 +01:00
unknown aeeb7512a9 Project panels 2018-12-24 16:26:43 +01:00
Zicklag 3ab888c0a5 Fix Node Trait Selection Issue
fixes #1059
2018-12-21 16:48:02 -06:00
luboslenco c9ef079452 New cache 2018-12-19 20:10:34 +01:00
luboslenco e79ff975e9 Logic node search 2018-12-19 15:47:58 +01:00
luboslenco a531b52b9f UI style 2018-12-19 13:33:17 +01:00
luboslenco a9d4e9c2ef Begin b28 era 2018-12-18 23:48:38 +01:00
luboslenco 5d42c3ddf0 Fast exporter 2018-12-18 16:46:36 +01:00
luboslenco 9c9fd0881e Uniform fixes 2018-12-15 19:03:11 +01:00
luboslenco d8f78638bd Begin shadow index 2018-12-10 23:29:04 +01:00
luboslenco 00d7bba7c8 Deferred modes 2018-12-10 09:46:46 +01:00
luboslenco 023668221e Update shadowmap props 2018-12-10 00:02:40 +01:00
luboslenco 835792f7fc Shader fixes 2018-12-07 13:48:40 +01:00