Skip to content

Commit

Permalink
Preparing v0.8.9
Browse files Browse the repository at this point in the history
  • Loading branch information
markusmoenig committed Apr 20, 2024
1 parent c425c93 commit 4dc99da
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 10 deletions.
3 changes: 2 additions & 1 deletion Changelog.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
v 0.8.9 (WiP)
v 0.8.9
-------

- New procedural node system for 3D tile creation.
- Menu system and code insertion is now handled via the code menu.
- Basic 3D editing for changing shapes.
- 3D rendering (first person, top down, isometric, etc.) with character / item billboarding.
Expand Down
5 changes: 3 additions & 2 deletions Xcode/Eldiron/Eldiron macOS/Eldiron_macOS.entitlements
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
</array>
<key>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.files.user-selected.read-only</key>
<key>com.apple.security.files.user-selected.read-write</key>
<true/>
<key>com.apple.security.network.client</key>
<true/>

</dict>
</plist>
14 changes: 11 additions & 3 deletions Xcode/Eldiron/Eldiron.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
DD5FD13728FBD15C00853829 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DD5FD0FC28FBD15B00853829 /* Assets.xcassets */; };
DD86627B2978DE20003878C0 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD8662792978DE20003878C0 /* AudioToolbox.framework */; };
DD86627C2978DE20003878C0 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD86627A2978DE20003878C0 /* CoreAudio.framework */; };
DD8FB2B52BD396C7008D2A3C /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD8FB2B42BD396C7008D2A3C /* SystemConfiguration.framework */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand Down Expand Up @@ -96,6 +97,7 @@
DD8662772978DC85003878C0 /* librustapi_ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = librustapi_ios.a; sourceTree = "<group>"; };
DD8662792978DE20003878C0 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.2.sdk/System/Library/Frameworks/AudioToolbox.framework; sourceTree = DEVELOPER_DIR; };
DD86627A2978DE20003878C0 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.2.sdk/System/Library/Frameworks/CoreAudio.framework; sourceTree = DEVELOPER_DIR; };
DD8FB2B42BD396C7008D2A3C /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
DD976A99290E62C2007131BA /* librustapi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librustapi.a; path = "rust-api/target/release/librustapi.a"; sourceTree = "<group>"; };
DD976A9B290E65DA007131BA /* Bridge.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Bridge.h; sourceTree = "<group>"; };
DD976A9C290E6732007131BA /* librustapi.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = librustapi.dylib; path = "rust-api/target/release/librustapi.dylib"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -131,6 +133,7 @@
files = (
DD219B8729752B1100E978F5 /* CoreAudio.framework in Frameworks */,
DD219B832975298400E978F5 /* librustapi.a in Frameworks */,
DD8FB2B52BD396C7008D2A3C /* SystemConfiguration.framework in Frameworks */,
DD219B8529752AE300E978F5 /* AudioToolbox.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -216,6 +219,7 @@
DD976A98290E62C2007131BA /* Frameworks */ = {
isa = PBXGroup;
children = (
DD8FB2B42BD396C7008D2A3C /* SystemConfiguration.framework */,
DD8662792978DE20003878C0 /* AudioToolbox.framework */,
DD86627A2978DE20003878C0 /* CoreAudio.framework */,
DD8662772978DC85003878C0 /* librustapi_ios.a */,
Expand Down Expand Up @@ -299,7 +303,7 @@
attributes = {
BuildIndependentTargetsInParallel = 1;
LastSwiftUpdateCheck = 1400;
LastUpgradeCheck = 1520;
LastUpgradeCheck = 1530;
TargetAttributes = {
DD5FD10028FBD15B00853829 = {
CreatedOnToolsVersion = 14.0.1;
Expand Down Expand Up @@ -472,6 +476,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
Expand Down Expand Up @@ -532,6 +537,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
Expand Down Expand Up @@ -727,6 +733,7 @@
DD5FD14128FBD15C00853829 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = arm64;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = "Eldiron macOS/Eldiron_macOS.entitlements";
Expand Down Expand Up @@ -754,7 +761,7 @@
"$(PROJECT_DIR)",
);
MACOSX_DEPLOYMENT_TARGET = 12.3;
MARKETING_VERSION = 0.88;
MARKETING_VERSION = 0.89;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.moenig.eldiron;
PRODUCT_NAME = Eldiron;
Expand All @@ -768,6 +775,7 @@
DD5FD14228FBD15C00853829 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = arm64;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = "Eldiron macOS/Eldiron_macOS.entitlements";
Expand Down Expand Up @@ -795,7 +803,7 @@
"$(PROJECT_DIR)",
);
MACOSX_DEPLOYMENT_TARGET = 12.3;
MARKETING_VERSION = 0.88;
MARKETING_VERSION = 0.89;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.moenig.eldiron;
PRODUCT_NAME = Eldiron;
Expand Down
Binary file not shown.
Binary file modified Xcode/Eldiron/librustapi.a
Binary file not shown.
2 changes: 1 addition & 1 deletion creator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "creator"
version = "0.8.9"
edition = "2021"
authors = ["Markus Moenig"]
description = "A game creator for retro RPGs."
description = "A game creator for classical RPGs."

[[bin]]
name = "eldiron"
Expand Down
19 changes: 16 additions & 3 deletions creator/src/_lib.rs
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
// Lib file needed when compiled for Xcode to a static library

//use theframework::prelude::*;
// use theframework::*;

pub mod editor;
pub mod externals;
pub mod misc;
pub mod modelfxeditor;
pub mod panels;
pub mod regionfxeditor;
pub mod screeneditor;
pub mod self_update;
pub mod sidebar;
pub mod tileeditor;
pub mod tilefxeditor;
pub mod tilemapeditor;
pub mod tilepicker;

pub mod widgets;
pub mod undo;

use rust_embed::RustEmbed;
#[derive(RustEmbed)]
Expand All @@ -25,12 +30,20 @@ pub mod prelude {
pub use shared::prelude::*;
pub use theframework::prelude::*;

pub use crate::externals::*;
pub use crate::misc::*;
pub use crate::modelfxeditor::*;
pub use crate::panels::*;
pub use crate::regionfxeditor::*;
pub use crate::screeneditor::*;
pub use crate::sidebar::*;
pub use crate::tileeditor::*;
pub use crate::tilefxeditor::*;
pub use crate::tilemapeditor::*;
pub use crate::tilepicker::*;
pub use crate::undo::modelfx_undo::*;
pub use crate::undo::region_undo::*;
pub use crate::undo::*;

pub const KEY_ESCAPE: u32 = 0;
pub const KEY_RETURN: u32 = 1;
Expand Down

0 comments on commit 4dc99da

Please sign in to comment.