Merge pull request #233 from Insality/develop

Merge Druid 0.11 to Master

Author: Insality

.github/FUNDING.yml

@@ -0,0 +1,5 @@
+# These are supported funding model platforms
+
+github: insality # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+ko_fi: insality # Replace with a single Ko-fi username
+custom: ['https://www.buymeacoffee.com/insality']

.luacheckrc

@@ -2,7 +2,7 @@ std = "max"
 files['.luacheckrc'].global = false
 unused_args = false
 
-max_code_line_length = 90
+max_code_line_length = 120
 max_comment_line_length = false
 
 globals = {
@@ -45,8 +45,12 @@ globals = {
   "debug",
   "timer",
   "window",
-  "buffer", 
+  "buffer",
   "resource",
   "defos",
   "html5",
+  "describe",
+  "before",
+  "after",
+  "it",
 }

README.md

@@ -1,12 +1,13 @@
 project='Druid'
-title='Defold Druid UI Library'
-description='Documentation for Druid Library'
+title='Defold Druid UI Framework'
+description='Documentation for Druid Framework'
 file={"./druid",
 	exclude = {
 		"./druid/styles/",
 		"./druid/system/middleclass.lua",
 		"./druid/templates/",
 		"./druid/annotations.lua",
+		"./druid/custom/rich_text/module",
 	}
 }
 package='druid'

config.ld

@@ -9,3 +9,10 @@ date,sha,version,build_size,build_time,platform,mode,is_cache_using,commits_coun
 2022-08-29T18:46:47Z,13003e472169cbd261e703eca7b133adf64a24f7,0.9.592,2316,40,js-web,release,true,592
 2022-09-09T17:55:42Z,072507cc9e715541bdee7636d2e5eeeb3c22a57d,0.10.603,2340,43,js-web,release,true,603
 2022-09-09T18:00:07Z,072507cc9e715541bdee7636d2e5eeeb3c22a57d,0.10.603,2340,5,js-web,release,true,603
+2023-07-05T20:19:22Z,d0062c2a78e618871ebb4c8ee66b1509b763f069,0.10.671,3292,12,x86_64-linux,headless,true,671
+2023-07-13T18:37:07Z,1cbe57376397a8352bbafcc67de0b6f95ae37b35,0.10.682,2496,53,js-web,release,true,682
+2023-07-13T19:31:47Z,ea185622702e6691275187741b1e2ee0c7f079ec,0.11.686,2452,51,js-web,release,true,686
+2023-07-15T12:56:18Z,556e1a9bae620e2df290b10287fa8d0f64d47293,0.11.690,2468,51,js-web,release,true,690
+2023-08-05T16:02:55Z,628723386eb3875f7190d079a2e7c510d044a311,0.11.692,2456,40,js-web,release,true,692
+2023-08-05T16:31:19Z,37fff52aa59feb20f761ef4d340d9f677743d54b,0.11.693,2456,43,js-web,release,true,693
+2023-08-05T16:41:25Z,d7dd4a86b81d73d345ad7e136de9c2c488bc4d8b,0.11.694,2452,43,js-web,release,true,694

deployer_build_stats.csv

@@ -1 +1 @@
-{"content":[{"name":"game.projectc","size":3797,"pieces":[{"name":"game.projectc0","offset":0}]},{"name":"game.arci","size":19808,"pieces":[{"name":"game.arci0","offset":0}]},{"name":"game.arcd","size":449757,"pieces":[{"name":"game.arcd0","offset":0}]},{"name":"game.dmanifest","size":20704,"pieces":[{"name":"game.dmanifest0","offset":0}]},{"name":"game.public.der","size":162,"pieces":[{"name":"game.public.der0","offset":0}]}]}
+{"content":[{"name":"game.projectc","size":4114,"pieces":[{"name":"game.projectc0","offset":0}]},{"name":"game.arci","size":23008,"pieces":[{"name":"game.arci0","offset":0}]},{"name":"game.arcd","size":607568,"pieces":[{"name":"game.arcd0","offset":0}]},{"name":"game.dmanifest","size":24253,"pieces":[{"name":"game.dmanifest0","offset":0}]},{"name":"game.public.der","size":162,"pieces":[{"name":"game.public.der0","offset":0}]}]}

docs/druid/archive/archive_files.json

@@ -1,21 +1,22 @@
 [project]
 title = druid
-version = 0.10.603
+version = 0.11.694
 write_log = 0
 compress_archive = 1
 publisher = Insality
 developer = Insality
-commit_sha = 072507cc9e715541bdee7636d2e5eeeb3c22a57d
-build_date = 2022-09-09T18:00:07Z
+commit_sha = d7dd4a86b81d73d345ad7e136de9c2c488bc4d8b
+build_date = 2023-08-05T16:41:25Z
 title_as_file_name = druid
 
 [display]
 width = 600
 height = 900
-high_dpi = 0
+high_dpi = 1
 samples = 0
 fullscreen = 0
 update_frequency = 0
+swap_interval = 1
 vsync = 1
 display_profiles = /example/custom.display_profilesc
 dynamic_orientation = 1
@@ -29,6 +30,8 @@ clear_color_alpha = 0
 
 [physics]
 type = 2D
+max_collision_object_count = 128
+use_fixed_timestep = 0
 gravity_y = -10
 debug = 0
 debug_alpha = 0.9
@@ -45,6 +48,7 @@ ray_cast_limit_2d = 64
 ray_cast_limit_3d = 128
 trigger_overlap_capacity = 16
 velocity_threshold = 1
+max_fixed_timesteps = 2
 
 [bootstrap]
 main_collection = /example/example.collectionc
@@ -53,11 +57,11 @@ render = /builtins/render/default.renderc
 [graphics]
 default_texture_min_filter = linear
 default_texture_mag_filter = linear
-max_draw_calls = 1024
+max_draw_calls = 128
 max_characters = 8192
 max_debug_vertices = 10000
 texture_profiles = /example/custom.texture_profiles
-verify_graphics_calls = 1
+verify_graphics_calls = 0
 memory_size = 512
 
 [shader]
@@ -84,85 +88,95 @@ game_binding = /input/game.input_bindingc
 use_accelerometer = 0
 
 [sprite]
-max_count = 128
+max_count = 16
 subpixels = 1
 
 [model]
-max_count = 128
+max_count = 0
+split_meshes = 0
 
 [mesh]
-max_count = 128
+max_count = 0
 
 [gui]
 max_count = 64
 max_particlefx_count = 64
 max_particle_count = 1024
 
 [collection]
-max_instances = 1024
+max_instances = 128
 max_input_stack_entries = 16
 
 [collection_proxy]
 max_count = 8
 
 [collectionfactory]
-max_count = 128
+max_count = 64
 
 [factory]
-max_count = 128
+max_count = 16
 
 [ios]
 launch_screen = /builtins/manifests/ios/LaunchScreen.storyboardc
 pre_renderered_icons = 0
 bundle_identifier = example.unnamed
+bundle_name = 
 infoplist = /builtins/manifests/ios/Info.plist
 default_language = en
 localizations = en
 
 [android]
-version_code = 603
-minimum_sdk_version = 16
-target_sdk_version = 30
+version_code = 694
+minimum_sdk_version = 19
+target_sdk_version = 33
 package = com.insality.druid
+gcm_sender_id = 
 manifest = /builtins/manifests/android/AndroidManifest.xml
 iap_provider = GooglePlay
 input_method = HiddenInputField
 immersive_mode = 0
 display_cutout = 1
 debuggable = 0
+proguard = 
 
 [osx]
+app_icon = 
 infoplist = /builtins/manifests/osx/Info.plist
 bundle_identifier = example.unnamed
+bundle_name = 
 bundle_version = 1
 default_language = en
 localizations = en
 
 [windows]
+app_icon = 
 
 [html5]
 custom_heap_size = 0
 heap_size = 64
 htmlfile = /builtins/manifests/web/engine_template.html
 cssfile = /example/light_theme.css
+splash_image = /media/druid_logo.png
 archive_location_prefix = archive
+archive_location_suffix = 
+engine_arguments = --verify-graphics-calls=false
+wasm_streaming = 0
 show_fullscreen_button = 0
 show_made_with_defold = 0
 show_console_banner = 1
 scale_mode = fit
-engine_arguments = --verify-graphics-calls=false
-splash_image = /media/druid_logo.png
 
 [particle_fx]
-max_count = 64
-max_emitter_count = 64
-max_particle_count = 1024
+max_count = 0
+max_emitter_count = 0
+max_particle_count = 0
 
 [iap]
 auto_finish_transactions = 1
 
 [network]
 http_timeout = 0
+ssl_certificates = 
 http_thread_count = 4
 http_cache_enabled = 1
 
@@ -173,22 +187,24 @@ include_dirs = druid
 shared_state = 1
 
 [label]
-max_count = 64
+max_count = 0
 subpixels = 1
 
 [profiler]
 track_cpu = 0
+sleep_between_server_updates = 0
 
 [liveupdate]
 settings = /liveupdate.settings
 enabled = 1
 
 [tilemap]
-max_count = 16
-max_tile_count = 2048
+max_count = 0
+max_tile_count = 0
 
 [engine]
 run_while_iconified = 0
+fixed_update_frequency = 60
 
 [druid]
 no_auto_input = 0
@@ -201,9 +217,9 @@ input_key_esc = key_esc
 input_key_back = key_back
 input_key_enter = key_enter
 input_key_backspace = key_backspace
-input_multitouch = multitouch
-input_scroll_up = scroll_up
-input_scroll_down = scroll_down
+input_multitouch = touch_multi
+input_scroll_up = mouse_wheel_up
+input_scroll_down = mouse_wheel_down
 
 [native_extension]
 app_manifest = /example/game.appmanifest