Bump version to v0.7.5

markusmoenig · Mar 18, 2023 · 7fa9d72 · 7fa9d72
1 parent e4c145a
commit 7fa9d72
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Readme.md b/Readme.md
@@ -2,7 +2,7 @@
 
 Classic RPG Creation
 
-[![MIT license](https://img.shields.io/badge/License-MIT-blue.svg)](https://lbesson.mit-license.org/) [![version](https://img.shields.io/badge/version-0.7.0-red.svg)](https://shields.io/) [![macOS](https://svgshare.com/i/ZjP.svg)](https://svgshare.com/i/ZjP.svg) [![Windows](https://svgshare.com/i/ZhY.svg)](https://svgshare.com/i/ZhY.svg) [![Linux](https://svgshare.com/i/Zhy.svg)](https://svgshare.com/i/Zhy.svg) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/ZrNj6baSZU) [![Patreon](https://badgen.net/badge/icon/patreon?icon=patreon&label)](https://patreon.com/eldiron) [![Twitter](https://badgen.net/badge/icon/twitter?icon=twitter&label)](https://twitter.com/EldironRPG)
+[![MIT license](https://img.shields.io/badge/License-MIT-blue.svg)](https://lbesson.mit-license.org/) [![version](https://img.shields.io/badge/version-0.7.5-red.svg)](https://shields.io/) [![macOS](https://svgshare.com/i/ZjP.svg)](https://svgshare.com/i/ZjP.svg) [![Windows](https://svgshare.com/i/ZhY.svg)](https://svgshare.com/i/ZhY.svg) [![Linux](https://svgshare.com/i/Zhy.svg)](https://svgshare.com/i/Zhy.svg) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/ZrNj6baSZU) [![Patreon](https://badgen.net/badge/icon/patreon?icon=patreon&label)](https://patreon.com/eldiron) [![Twitter](https://badgen.net/badge/icon/twitter?icon=twitter&label)](https://twitter.com/EldironRPG)
 
 
 <!---

diff --git a/core_render/Cargo.toml b/core_render/Cargo.toml
@@ -27,10 +27,10 @@ audio-engine = { git = "https://github.com/Rodrigodd/audio-engine" }
 rustc-hash = "1.1.0"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-raycaster = { path = "../../raycaster/raycaster", features = ["single_threaded"] }
+raycaster = { path = "../../raycaster/raycaster", version = "0.3.1", features = ["single_threaded"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-raycaster = { path = "../../raycaster/raycaster" }
+raycaster = { path = "../../raycaster/raycaster", version = "0.3.1" }
 
 [features]
 default = []

diff --git a/core_server/src/server/region_instance.rs b/core_server/src/server/region_instance.rs
@@ -271,7 +271,7 @@ impl RegionInstance<'_> {
 
             pixel_based_movement            : true,
 
-            tick_count                      : 0,
+            tick_count                      : 5 * 60 * 4, // 5am
             dealt_damage_success            : false,
 
             respawn_instance                : FxHashMap::default(),

diff --git a/core_shared/src/date.rs b/core_shared/src/date.rs
@@ -23,7 +23,7 @@ impl Date {
     }
 
     pub fn from_ticks(&mut self, ticks: usize) {
-        let minutes = ticks;// / 4;
+        let minutes = ticks / 4;
         self.hours = (minutes / 60) as i32;
         self.minutes = (minutes % 60) as i32;
 

diff --git a/core_shared/src/dir.rs b/core_shared/src/dir.rs
@@ -9,7 +9,9 @@ pub fn get_resource_dir() -> std::path::PathBuf {
     //     curr_exe.pop();
     //     curr_exe.pop();
 
-    //     curr_exe = curr_exe.join("Resources");//.join("_up_");
+    //     curr_exe = curr_exe.join("Resources").join("_up_");
+
+    //     println!("{:?}", curr_exe);
     //     return curr_exe;
     // }
 

diff --git a/creator_lib/Cargo.toml b/creator_lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "creator_lib"
-version = "0.7.0"
+version = "0.7.5"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/creator_lib/src/editor.rs b/creator_lib/src/editor.rs
@@ -127,9 +127,9 @@ impl Editor<'_> {
     }
 
     ///
-    pub fn init(&mut self, resource_path: String, project_path: String) {
+    pub fn init(&mut self, _resource_path: String, project_path: String) {
 
-        let path = PathBuf::from(resource_path);
+        let path = get_resource_dir();//PathBuf::from(resource_path);
         let project_path = PathBuf::from(project_path);
 
         self.context.init(path.clone(), project_path.clone());

diff --git a/creator_lib/src/widget/context.rs b/creator_lib/src/widget/context.rs
@@ -389,7 +389,7 @@ impl ScreenContext<'_> {
 
     pub fn init(&mut self, resource_path: PathBuf, project_path: PathBuf) {
 
-        //println!("Loading resources from {:?}", resource_path);
+        println!("Loading resources from {:?}", resource_path);
 
         fn load_icon(file_name: &PathBuf) -> Option<(Vec<u8>, u32, u32)> {
 

diff --git a/game/regions/Eldiron City/level1.json b/game/regions/Eldiron City/level1.json
diff --git a/game/regions/Estartes/level1.json b/game/regions/Estartes/level1.json
diff --git a/game/regions/Fortress/level1.json b/game/regions/Fortress/level1.json