Skip to content

Commit cd08ef6

Browse files
BentroenBentroen
committed
3.8.3
Squashed commit of the following: commit 31aaf46 Author: Bentroen <[email protected]> Date: Sat Jul 24 00:17:57 2021 -0300 Clearer wording on changelog commit 5a16403 Author: Bentroen <[email protected]> Date: Fri Jul 23 22:07:37 2021 -0300 3.8.3 commit db05f4f Author: Bentroen <[email protected]> Date: Fri Jul 23 07:11:23 2021 -0300 Save older NBS warning preference to settings commit 6015344 Author: Bentroen <[email protected]> Date: Fri Jul 23 07:06:05 2021 -0300 Add preference toggle for warning when opening older NBS files commit 57e5725 Author: Bentroen <[email protected]> Date: Fri Jul 23 06:13:18 2021 -0300 Change default window scale based on display DPI commit 7d892ef Author: Bentroen <[email protected]> Date: Fri Jul 23 06:04:34 2021 -0300 Update GameMaker IDE to 2.3.3.570 commit 6debfb4 Author: Bentroen <[email protected]> Date: Fri Jul 23 05:16:45 2021 -0300 Revert changes in pull request #247 Reverts changes in commits 3b3e8a9, e391e1c, b8ed482 and 73af6b5. commit fa42437 Author: Bentroen <[email protected]> Date: Fri Jul 23 04:58:41 2021 -0300 Revert changes in pull request #227 Reverts changes in commits 3a44405 and bfb5417. commit e58757a Merge: 3d44ecb 601d12f Author: ShinkoNet <[email protected]> Date: Sun May 23 10:07:00 2021 +1000 Merge pull request #227 from karl-police/patch-1 MIDI wrong import and input fix commit 3d44ecb Merge: 4854f47 3b3e8a9 Author: ShinkoNet <[email protected]> Date: Sun May 23 10:06:37 2021 +1000 Merge pull request #247 from chenxi050402/development Added 120FPS and 144FPS option in preferences; added "Fluent" theme; increased tempo limit commit 3b3e8a9 Author: chenxi050402 <[email protected]> Date: Sun May 23 03:45:13 2021 +0800 Added window shadow commit e391e1c Author: chenxi050402 <[email protected]> Date: Sun May 23 02:22:22 2021 +0800 Minor changes to icon commit b8ed482 Author: chenxi050402 <[email protected]> Date: Sat May 22 23:59:08 2021 +0800 Added "Fluent" theme; increased tempo limit commit 4854f47 Merge: ae55ccf 87e792b Author: Bentroen <[email protected]> Date: Thu May 20 18:11:50 2021 -0300 Merge pull request #236 from elfq/patch-1 Update license year -> 2021 commit 73af6b5 Author: chenxi050402 <[email protected]> Date: Fri May 21 00:58:25 2021 +0800 Added 120FPS and 144FPS option commit ae55ccf Author: Bentroen <[email protected]> Date: Sat Apr 17 05:08:07 2021 -0300 Position windows correctly in the center when scaling the window commit 383d62a Author: Bentroen <[email protected]> Date: Sat Apr 17 05:01:43 2021 -0300 Implement window scale control Fixes #31 commit 3a57460 Author: Bentroen <[email protected]> Date: Sat Apr 17 04:31:25 2021 -0300 Update GameMaker IDE to 2.3.2.556 commit 87e792b Author: elf <[email protected]> Date: Wed Mar 3 21:47:53 2021 -0500 Update license year -> 2021 commit a983ec2 Author: Bentroen <[email protected]> Date: Mon Jan 18 18:28:41 2021 -0300 Fix Edit menu click offset by one Fixes #228 commit 601d12f Merge: bfb5417 3a44405 Author: karl-police <[email protected]> Date: Thu Jan 14 11:29:49 2021 +0100 Merge pull request #1 from karl-police/patch-2 Update import_midi.gml commit 3a44405 Author: karl-police <[email protected]> Date: Thu Jan 14 11:29:18 2021 +0100 Update import_midi.gml commit bfb5417 Author: karl-police <[email protected]> Date: Thu Jan 14 11:28:02 2021 +0100 Update midi_input_set_key.gml
1 parent f08e1b2 commit cd08ef6

File tree

123 files changed

+420
-306
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+420
-306
lines changed

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2019 Hielke
3+
Copyright (c) 2021 Hielke
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎Minecraft Note Block Studio.yyp

+2-18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎datafiles/Data/changelog.txt

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
Changes in v3.8.3 (2021.07.23):
2+
* Added a window scale setting, which makes elements on screen larger or
3+
smaller. Useful if you have a high-resolution display or want to see more
4+
stuff at once!
5+
* The default scale value will match the current display scale of your system.
6+
* Added an option to disable the warning when opening an older NBS file.
7+
* Fixed actions in the Edit context menu being incorrect.
8+
19
Changes in v3.8.2 (2021.01.04):
210
* Added a warning about version compatibility when exporting a schematic.
311
* Fixed a crash when trying to export a schematic.

‎objects/obj_controller/obj_controller.yy

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎objects/obj_menu/obj_menu.yy

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎objects/obj_popup/obj_popup.yy

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎options/linux/options_linux.yy

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎options/mac/options_mac.yy

+3-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎options/main/options_main.yy

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scripts/control_create/control_create.gml

+5
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ function control_create() {
2020
cam_window = camera_create()
2121
view_set_camera(0, cam_window)
2222
window_background = c_white
23+
window_scale = get_default_window_scale()
24+
prev_scale = -1
25+
rw = 0
26+
rh = 0
2327

2428
// Audio
2529
channels = 256
@@ -39,6 +43,7 @@ function control_create() {
3943
dontplace = 0
4044
vers = version
4145
menu_shown = ""
46+
show_oldwarning = 1
4247
songfolder = songs_directory
4348
patternfolder = pattern_directory
4449
icons_init()

‎scripts/control_draw/control_draw.gml

+11-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
function control_draw() {
22
// control_draw()
3-
var a, b, c, d, e, f, g, p, l, s, exist, str, str2, m, xx, x1, y1, x2, y2, iconcolor, showmenu, rw, rh, totalcols, totalrows, compx, prev
3+
var a, b, c, d, e, f, g, p, l, s, exist, str, str2, m, xx, x1, y1, x2, y2, iconcolor, showmenu, totalcols, totalrows, compx, prev;
44

55
var targetspeed = 1000000 / room_speed
66
var currspeed = targetspeed / delta_time
7-
8-
rw = window_width
9-
rh = window_height
7+
8+
rw = floor(window_width * (1 / window_scale))
9+
rh = floor(window_height * (1 / window_scale))
10+
11+
// Update window scale
12+
if (window_scale != prev_scale) {
13+
camera_set_view_size(cam_window, rw, rh)
14+
}
15+
prev_scale = window_scale
16+
1017
curs = cr_default
1118
showmenu = 0
1219
cursmarker = 0

0 commit comments

Comments
 (0)