diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index d102a7ab..1f572b95 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -7,12 +7,12 @@ assignees: '' --- - **ArmorPaint version:** diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index ccb4d258..58de0734 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -7,5 +7,5 @@ assignees: '' --- diff --git a/base/assets/licenses/license.md b/base/assets/licenses/license.md index 27b5c072..fc4dc684 100644 --- a/base/assets/licenses/license.md +++ b/base/assets/licenses/license.md @@ -6,4 +6,4 @@ The origin of this software must not be misrepresented; you must not claim that Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. This notice may not be removed or altered from any source distribution. -https://github.com/armory3d/armortools +https://github.com/armory3d/armorpaint diff --git a/base/docs/amake.md b/base/docs/amake.md index 91b9da41..917d1670 100644 --- a/base/docs/amake.md +++ b/base/docs/amake.md @@ -1,8 +1,8 @@ -[amake](https://github.com/armory3d/armortools/tree/main/base/tools/amake) is the armorpaint build tool (based on [kmake](https://github.com/Kode/kmake)). It consists of several parts: +[amake](https://github.com/armory3d/armorpaint/tree/main/base/tools/amake) is the armorpaint build tool (based on [kmake](https://github.com/Kode/kmake)). It consists of several parts: `aimage.c`: Converts common image formats like `.jpg` / `.png` / `.hdr` into a custom `.k` format, which is faster to load. `.k` is a simple format which contains an image header and lz4 compressed pixel data. It also handles processing the `icon.png` file into a custom OS defined format (`.ico` on Windows). -[`ashader.c`](https://github.com/armory3d/armortools/tree/main/base/docs/ashader): Converts a `.kong` shader source into a graphics api specific format. +[`ashader.c`](https://github.com/armory3d/armorpaint/tree/main/base/docs/ashader): Converts a `.kong` shader source into a graphics api specific format. `quickjs`: An embedded JavaScript engine, which is used to run the `make.js` file (see below). diff --git a/base/docs/brute_pathtracer.md b/base/docs/brute_pathtracer.md index d6a1a32a..8f6cf7f9 100644 --- a/base/docs/brute_pathtracer.md +++ b/base/docs/brute_pathtracer.md @@ -4,7 +4,7 @@ In ArmorPaint, it is used for rendering the path-traced viewport mode and for ra By default, the path-tracer supports 64 unique objects and up to 1024 instances. It has two modes - fast, which has most of the features disabled, and quality, which has features like translucency and emission enabled. -- https://github.com/armory3d/armortools/tree/main/base/shaders/raytrace/src -- https://github.com/armory3d/armortools/blob/main/base/sources/render_path_raytrace.c -- https://github.com/armory3d/armortools/blob/main/base/sources/render_path_raytrace_bake.c -- https://github.com/armory3d/armortools/blob/main/base/sources/iron_gpu.h +- https://github.com/armory3d/armorpaint/tree/main/base/shaders/raytrace/src +- https://github.com/armory3d/armorpaint/blob/main/base/sources/render_path_raytrace.c +- https://github.com/armory3d/armorpaint/blob/main/base/sources/render_path_raytrace_bake.c +- https://github.com/armory3d/armorpaint/blob/main/base/sources/iron_gpu.h diff --git a/base/sources/iron_lz4.c b/base/sources/iron_lz4.c index 4b649f9e..7f4cf513 100644 --- a/base/sources/iron_lz4.c +++ b/base/sources/iron_lz4.c @@ -1,6 +1,6 @@ // Based on https://github.com/gorhill/lz4-wasm by Raymond Hill -// armortools/base/assets/licenses/license_lz4-wasm.md +// armorpaint/base/assets/licenses/license_lz4-wasm.md #include "iron_lz4.h" #include "iron_gc.h" diff --git a/license.md b/license.md index 27b5c072..fc4dc684 100644 --- a/license.md +++ b/license.md @@ -6,4 +6,4 @@ The origin of this software must not be misrepresented; you must not claim that Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. This notice may not be removed or altered from any source distribution. -https://github.com/armory3d/armortools +https://github.com/armory3d/armorpaint diff --git a/paint/assets/licenses/license.md b/paint/assets/licenses/license.md index 27b5c072..fc4dc684 100644 --- a/paint/assets/licenses/license.md +++ b/paint/assets/licenses/license.md @@ -6,4 +6,4 @@ The origin of this software must not be misrepresented; you must not claim that Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. This notice may not be removed or altered from any source distribution. -https://github.com/armory3d/armortools +https://github.com/armory3d/armorpaint diff --git a/paint/readme.md b/paint/readme.md index 7f17e302..28669a11 100644 --- a/paint/readme.md +++ b/paint/readme.md @@ -7,11 +7,11 @@ armorpaint *Note 1: This repository is aimed at developers and may not be stable. Distributed binaries are [paid](https://armorpaint.org/download) to help with the project funding. All of the development is happening here in order to make it accessible to everyone. Thank you for support!* -*Note 2: If you are compiling git version of ArmorPaint, then you need to have a compiler ([Visual Studio with clang tools](https://visualstudio.microsoft.com/downloads/) - Windows, [clang + dependencies](https://github.com/armory3d/armortools/wiki/Linux-Dependencies) - Linux, [Xcode](https://developer.apple.com/xcode/resources/) - macOS / iOS, [Android Studio](https://developer.android.com/studio) - Android) and [git](https://git-scm.com/downloads) installed.* +*Note 2: If you are compiling git version of ArmorPaint, then you need to have a compiler ([Visual Studio with clang tools](https://visualstudio.microsoft.com/downloads/) - Windows, [clang + dependencies](https://github.com/armory3d/armorpaint/blob/main/base/docs/linux_deps.md) - Linux, [Xcode](https://developer.apple.com/xcode/resources/) - macOS / iOS, [Android Studio](https://developer.android.com/studio) - Android) and [git](https://git-scm.com/downloads) installed.* ```bash -git clone https://github.com/armory3d/armortools -cd armortools/paint +git clone https://github.com/armory3d/armorpaint +cd armorpaint/paint ``` **Windows (x64)** diff --git a/paint/sources/ui_menubar.c b/paint/sources/ui_menubar.c index c9c02a1b..b0d48b5d 100644 --- a/paint/sources/ui_menubar.c +++ b/paint/sources/ui_menubar.c @@ -235,7 +235,7 @@ void ui_menubar_draw_category_items_about_box() { #endif if (ui_icon_button(tr("Contributors"), ICON_LINK, UI_ALIGN_CENTER)) { - iron_load_url("https://github.com/armory3d/armortools/graphs/contributors"); + iron_load_url("https://github.com/armory3d/armorpaint/graphs/contributors"); } if (ui_icon_button(tr("OK"), ICON_CHECK, UI_ALIGN_CENTER)) { ui_box_hide(); @@ -817,14 +817,14 @@ void ui_menubar_draw_category_items() { iron_load_url(string("%s/notes", manifest_url)); } if (ui_menu_button(tr("Issue Tracker"), "", ICON_LINK)) { - iron_load_url("https://github.com/armory3d/armortools/issues"); + iron_load_url("https://github.com/armory3d/armorpaint/issues"); } if (ui_menu_button(tr("Report Bug"), "", ICON_LINK)) { #if defined(IRON_MACOS) || defined(IRON_IOS) // Limited url length - iron_load_url(string("https://github.com/armory3d/armortools/issues/new?labels=bug&template=bug_report.md&body=*%s%%20%s-%s,%%20%s", manifest_title, + iron_load_url(string("https://github.com/armory3d/armorpaint/issues/new?labels=bug&template=bug_report.md&body=*%s%%20%s-%s,%%20%s", manifest_title, manifest_version, config_get_sha(), iron_system_id())); #else - iron_load_url(string("https://github.com/armory3d/armortools/issues/new?labels=bug&template=bug_report.md&body=*%s%%20%s-%s,%%20%s*%%0A%%0A**Issue " + iron_load_url(string("https://github.com/armory3d/armorpaint/issues/new?labels=bug&template=bug_report.md&body=*%s%%20%s-%s,%%20%s*%%0A%%0A**Issue " "description:**%%0A%%0A**Steps to reproduce:**%%0A%%0A", manifest_title, manifest_version, config_get_sha(), iron_system_id())); #endif @@ -832,10 +832,10 @@ void ui_menubar_draw_category_items() { if (ui_menu_button(tr("Request Feature"), "", ICON_LINK)) { #if defined(IRON_MACOS) || defined(IRON_IOS) // Limited url length iron_load_url( - string("https://github.com/armory3d/armortools/issues/new?labels=feature%%20request&template=feature_request.md&body=*%s%%20%s-%s,%%20%s", + string("https://github.com/armory3d/armorpaint/issues/new?labels=feature%%20request&template=feature_request.md&body=*%s%%20%s-%s,%%20%s", manifest_title, manifest_version, config_get_sha(), iron_system_id())); #else - iron_load_url(string("https://github.com/armory3d/armortools/issues/" + iron_load_url(string("https://github.com/armory3d/armorpaint/issues/" "new?labels=feature%%20request&template=feature_request.md&body=*%s%%20%s-%s,%%20%s*%%0A%%0A**Feature description:**%%0A%%0A", manifest_title, manifest_version, config_get_sha(), iron_system_id())); #endif diff --git a/readme.md b/readme.md index 13526b32..2f3bc8c8 100644 --- a/readme.md +++ b/readme.md @@ -1,11 +1,11 @@ ![](https://armorpaint.org/img/git_root.jpg) -armortools +armorpaint ============== 3D content creation tools. -[armorpaint/](https://github.com/armory3d/armortools/tree/main/paint)
+[armorpaint/](https://github.com/armory3d/armorpaint/tree/main/paint)
**Generating a locale file** ```bash