Skip to content

Commit bdb96b6

Browse files
Merge branch 'develop'
2 parents dc66131 + dac85de commit bdb96b6

10 files changed

+267
-315
lines changed

CHANGELOG.md

+11-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,18 @@ File format follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66

77
See cloning and downloading instructions [here](https://www.ivoyager.dev/developers/).
88

9+
## [v0.0.20] - 2024-12-20
10+
11+
Developed using Godot 4.3.
12+
13+
### Changed
14+
* Updated custome godot.html shell using Godot 4.3's current master.
15+
* Updated plugin 'ivoyager_core' to v0.0.20.
16+
* Updated plugin 'ivoyager_table_importer' to v0.0.9.
17+
918
## [v0.0.19] - 2024-12-16
1019

11-
Developed Godot 4.3.
20+
Developed using Godot 4.3.
1221

1322
### Changed
1423
* Updated plugin 'ivoyager_core' to v0.0.19.
@@ -133,6 +142,7 @@ Requires non-Git-tracked **ivoyager_assets-0.0.10**; find in [ivoyager releases]
133142
* Updated submodule 'ivoyager' to v0.0.10.
134143

135144

145+
[v0.0.20]: https://github.com/ivoyager/planetarium/compare/v0.0.19...v0.0.20
136146
[v0.0.19]: https://github.com/ivoyager/planetarium/compare/v0.0.18...v0.0.19
137147
[v0.0.18]: https://github.com/ivoyager/planetarium/compare/v0.0.17...v0.0.18
138148
[v0.0.17]: https://github.com/ivoyager/planetarium/compare/v0.0.16...v0.0.17

planetarium/gui/menu_panel.gd

+5
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,8 @@ func _ready() -> void:
3535
mod.init_min_size(IVEnums.GUISize.GUI_SMALL, Vector2(75.0, 0.0))
3636
mod.init_min_size(IVEnums.GUISize.GUI_MEDIUM, Vector2(100.0, 0.0))
3737
mod.init_min_size(IVEnums.GUISize.GUI_LARGE, Vector2(125.0, 0.0))
38+
39+
prints('OS.has_feature("web")', OS.has_feature("web"))
40+
41+
if OS.has_feature("web"):
42+
%QuitButton.queue_free()

planetarium/gui/menu_panel.tscn

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ layout_mode = 2
4545
layout_mode = 2
4646

4747
[node name="QuitButton" parent="VBox/MarginContainer1/MenuVBox" instance=ExtResource("5_caym3")]
48+
unique_name_in_owner = true
4849
layout_mode = 2
4950
force_quit = true
5051

planetarium/preinitializer.gd

+5-3
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,12 @@ func _on_project_nodes_added() -> void:
105105
func _on_simulator_started() -> void:
106106
if OS.has_feature("web"):
107107
# progressive web app (PWA) updating
108-
if JavaScriptBridge.pwa_needs_update():
108+
var pwa_needs_update := JavaScriptBridge.pwa_needs_update()
109+
print("PWA nees update: ", pwa_needs_update)
110+
if pwa_needs_update:
109111
_on_pwa_update_available()
110-
else:
111-
JavaScriptBridge.pwa_update_available.connect(_on_pwa_update_available)
112+
return
113+
JavaScriptBridge.pwa_update_available.connect(_on_pwa_update_available)
112114

113115

114116
func _on_pwa_update_available() -> void:

planetarium/units.gd

+4-2
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,13 @@ extends Node
4040
# METER = 1e-5 as above but less. Self-shadowing artifact?
4141
# METER = 1e-7 lighting ok for all tested. (Harsh shadow border? Need to compare w/ below.)
4242
# METER = 1e-10 lighting ok for all tested.
43-
43+
#
44+
# Godot 4.3 update. Problems for HTML5 as above. However, Windows now appears
45+
# ok at 1e-10. Perhaps smaller value should be our base value (again)?
4446

4547
# SI base units
4648
const SECOND := 1.0
47-
const METER := 1.0 # 1e-7 works for HTML5 export, as of Godot 4.2.beta4
49+
const METER := 1e-7 # see notes above
4850
const KG := 1.0
4951
const AMPERE := 1.0
5052
const KELVIN := 1.0

project.godot

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ config_version=5
1111
[application]
1212

1313
config/name="I, Voyager - Planetarium"
14-
config/version="v0.0.19"
14+
config/version="v0.0.20"
1515
run/main_scene="res://addons/ivoyager_core/tree_nodes/universe.tscn"
1616
config/features=PackedStringArray("4.3")
1717
boot_splash/bg_color=Color(0, 0, 0, 1)

web/README.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Progressive Web App (PWA) Deployment
22

3+
Note: As of Godot 4.3, most PWA functionality seems to be broken. There is no caching or offline operation.
4+
35
Godot 3.4.1 introduced [PWA](https://web.dev/what-are-pwas/) functionality, but it's still a little rough to deploy as of Godot 4.2.1.
46

57
These files are referenced in export_presets.config and used to generate the HTML5 export:

0 commit comments

Comments
 (0)