Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

4.2.8.0 #16

Merged
merged 1 commit into from
Aug 14, 2024
Merged

4.2.8.0 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ on:
push:
tags:
- "v*"
workflow_dispatch:

permissions:
contents: write
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# Changelog for Tao's Folding Map Rewrite 14.8.2024

4.2.8.0
- Fixed forests not showing up when loading "Enhanced Map"/"Enhanced Map Ace Version" (which turned them off).
- Added setting "Zoom step", which allows you to set how much the map zooms in and out with every key press.

# Changelog for Tao's Folding Map Rewrite 9.7.2024

4.2.7.0
Expand Down
4 changes: 2 additions & 2 deletions addons/main/functions/fnc_zoomIn.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
*/

// Don't allow excessive zoom
if (GVAR(mapScale) / 2 < 0.005) exitWith {};
if (GVAR(mapScale) / GVAR(zoomStep) < 0.005) exitWith {};

GVAR(mapScale) = GVAR(mapScale) / 2;
GVAR(mapScale) = GVAR(mapScale) / GVAR(zoomStep);

private _controlActiveMap = FOLDMAP displayCtrl GVAR(mapCtrlActive);

Expand Down
2 changes: 1 addition & 1 deletion addons/main/functions/fnc_zoomOut.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* Public: No
*/

GVAR(mapScale) = (GVAR(mapScale) * 2) min 1;
GVAR(mapScale) = (GVAR(mapScale) * GVAR(zoomStep)) min 1;

private _controlActiveMap = FOLDMAP displayCtrl GVAR(mapCtrlActive);

Expand Down
2 changes: 2 additions & 0 deletions addons/main/gui.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ class RscTitles {
colorSea[] = {0.46, 0.65, 0.74, 0.5};
colorForest[] = {0.02, 0.5, 0.01, 0.3};
colorForestBorder[] = {0.02, 0.5, 0.01, 0.27};
colorForestTextured[] = {0.02, 0.5, 0.01, 0.3};
colorRocks[] = {0, 0, 0, 0.3};
colorCountlines[] = {0.65, 0.45, 0.27, 0.7};
colorMainCountlines[] = {1, 0.1, 0.1, 0.9};
Expand Down Expand Up @@ -153,6 +154,7 @@ class RscTitles {
colorSea[] = {0.208, 0.05, 0.043, 0.5};
colorForest[] = {0.447, 0.122, 0.137, 0.3};
colorForestBorder[] = {0.447, 0.122, 0.137, 0.27};
colorForestTextured[] = {0.447, 0.122, 0.137, 0.3};
colorRocks[] = {0, 0, 0, 0.4};
colorCountlines[] = {0.371, 0.124, 0.122, 0.75};
colorMainCountlines[] = {0.371, 0.124, 0.122, 0.9};
Expand Down
8 changes: 8 additions & 0 deletions addons/main/initSettings.inc.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,14 @@
[0, 10, 0, 2]
] call CBA_fnc_addSetting;

[
QGVAR(zoomStep),
"SLIDER",
["Zoom step", "Sets the step between zoom levels."],
[COMPONENT_NAME, "General"],
[1, 10, 2, 2]
] call CBA_fnc_addSetting;

[
QGVAR(allowAdjust),
"LIST",
Expand Down
4 changes: 2 additions & 2 deletions addons/main/script_version.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#define MAJOR 4
#define MINOR 2
#define PATCHLVL 7
#define BUILD 1
#define PATCHLVL 8
#define BUILD 0