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.

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

Add Zeus and 3DEN comments #785

Open
wants to merge 27 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
d05a5f3
Show 3DEN comments in Zeus
Timi007 Dec 26, 2024
28e4f2f
Make icons smaller and hide line behind icon
Timi007 Dec 26, 2024
0935239
Spelling
Timi007 Dec 26, 2024
d2b1a84
Add tooltip to comments
Timi007 Dec 29, 2024
be9ba01
Fix 3DEN event handlers added again when returning from preview
Timi007 Dec 29, 2024
c6a094e
Save comment when starting preview
Timi007 Dec 29, 2024
58482f1
Move gui to file
Timi007 Dec 29, 2024
4e8bd2d
Add zeus comments
Timi007 Dec 30, 2024
83f9d1e
Allow deleting comments
Timi007 Dec 30, 2024
8256b2c
Add type for zeus/3DEN comment & cleanup
Timi007 Dec 30, 2024
d66d336
Merge to one package
Timi007 Dec 30, 2024
4c44b03
Remove module
Timi007 Dec 31, 2024
045bc1a
Allow editing and pick color of comments
Timi007 Dec 31, 2024
f346539
Adapt to be more consistent with area_markers
Timi007 Jan 4, 2025
e5bcece
Add 3DEN checkbox attribute for ignoring comments
Timi007 Jan 4, 2025
6359e65
Use LINKFUNC
Timi007 Jan 6, 2025
2fa657a
Fix obsolete param
Timi007 Jan 6, 2025
dbd3231
Add ability to move comment
Timi007 Jan 9, 2025
b3e916a
Cleanup
Timi007 Jan 10, 2025
f44d79c
Add documentation
Timi007 Jan 10, 2025
bdbc943
Remove module dependency
Timi007 Jan 10, 2025
98133f6
Fix JIP problems
Timi007 Jan 10, 2025
3bf6e7f
Fix spelling
Timi007 Jan 10, 2025
4e8d409
Add comment feature to README
Timi007 Jan 12, 2025
d1cc8c8
Add option to lock position
Timi007 Jan 15, 2025
3dc2d03
Use toolbox instead of checkbox
Timi007 Jan 17, 2025
4a4e223
Merge branch 'master' into comments
Timi007 Mar 6, 2025
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
Prev Previous commit
Next Next commit
Use toolbox instead of checkbox
Timi007 committed Jan 17, 2025
commit 3dc2d0361239dcc953638d9fa00c1a33f27fb160
2 changes: 1 addition & 1 deletion addons/comments/functions/fnc_openDialog.sqf
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ if (_positionOrId isEqualType [] && _position isEqualTo []) then {
[
["EDIT", localize "str_3den_comment_attribute_name_displayname", [_title], true],
["EDIT:MULTI", localize "str_3den_comment_attribute_name_tooltip", [_tooltip], true],
["CHECKBOX", LLSTRING(LockPosition), _lockPosition, _isEditingComment],
["TOOLBOX:YESNO", LLSTRING(LockPosition), [_lockPosition], _isEditingComment],
["COLOR", localize "str_3den_marker_attribute_color_displayname", _color, _isEditingComment]
],
{

Unchanged files with check annotations Beta

// Filter destroyed objects and any objects that are attached to or "part of" another
// The data for these objects will be included in the parent object's data
_objects = _objects select {alive _x && {vehicle _x == _x} && {isNull attachedTo _x} && {isNull ropeAttachedTo _x}};

Check notice on line 26 in addons/common/functions/fnc_serializeObjects.sqf

GitHub Actions / build

Using `vehicle` to check if a unit is in a vehicle is inefficient

inefficient "not in vehicle" check
_objects = _objects arrayIntersect _objects;
// Find the center position of all objects if one is not given
params ["_display"];
// Remove "Gear" animation when entering Zeus
if (GVAR(disableGearAnim) && {vehicle player == player}) then {

Check notice on line 21 in addons/common/functions/fnc_displayCuratorLoad.sqf

GitHub Actions / build

Using `vehicle` to check if a unit is in a vehicle is inefficient

inefficient "not in vehicle" check
[{player switchMove _this}, animationState player] call CBA_fnc_execNextFrame;
};
private _state = ["ACTIVE", "REMOVED"] select isNil {cba_common_PFHhandles select _id};
diag_log text format ["%1 - ID = %2, Delay = %3 - %4:%5", _state, _id, _delay, _file, _line];
} forEach ZEN_PFH_COUNTER;

Check notice on line 30 in addons/common/functions/fnc_dumpPerformanceCounters.sqf

GitHub Actions / build

Variable should not be all caps: ZEN_PFH_COUNTER

all caps variable
};
diag_log text "-------- ZEN COUNTER RESULTS --------";
private _average = (_total / _count) * 1000;
diag_log text format ["%1 - Average: %2s / %3 = %4ms", _name, _total, _count, _average];
};
} forEach ZEN_COUNTERS;

Check notice on line 55 in addons/common/functions/fnc_dumpPerformanceCounters.sqf

GitHub Actions / build

Variable should not be all caps: ZEN_COUNTERS

all caps variable
};
private _markerCover = createMarker [format [QGVAR(cover_%1), _x], _coverPos];
_markerCover setMarkerShape "RECTANGLE";
_markerCover setMarkerBrush "Solid";
_markerCover setMarkerColor "ColorBlack";

Check notice on line 56 in addons/cover_map/functions/fnc_create.sqf

GitHub Actions / build

Repeated calls to global marker updates

use setMarkerColorLocal
_markerCover setMarkerSize [_sizeMarker, SIZE_OUT - _sizeA];

Check notice on line 57 in addons/cover_map/functions/fnc_create.sqf

GitHub Actions / build

Repeated calls to global marker updates

use setMarkerSizeLocal
_markerCover setMarkerDir _direction;
private _dotPos = [
// Create border marker
private _markerBorder = createMarker [QGVAR(border), [_centerX, _centerY]];
_markerBorder setMarkerShape "RECTANGLE";

Check notice on line 74 in addons/cover_map/functions/fnc_create.sqf

GitHub Actions / build

Repeated calls to global marker updates

use setMarkerShapeLocal
_markerBorder setMarkerBrush "Border";

Check notice on line 75 in addons/cover_map/functions/fnc_create.sqf

GitHub Actions / build

Repeated calls to global marker updates

use setMarkerBrushLocal
_markerBorder setMarkerColor "ColorBlack";

Check notice on line 76 in addons/cover_map/functions/fnc_create.sqf

GitHub Actions / build

Repeated calls to global marker updates

use setMarkerColorLocal
_markerBorder setMarkerSize [_sizeX, _sizeY];

Check notice on line 77 in addons/cover_map/functions/fnc_create.sqf

GitHub Actions / build

Repeated calls to global marker updates

use setMarkerSizeLocal
_markerBorder setMarkerDir _angle;
y = 0;
w = QUOTE(POS_W(1));
h = QUOTE(POS_H(1));
soundClick[] = {"\a3\ui_f\data\sound\rscbutton\soundclick", 0.09, 1};

Check warning on line 56 in addons/common/gui.hpp

GitHub Actions / build

a property that references a file is missing a file extension

missing file extension
soundEnter[] = {"\a3\ui_f\data\sound\rscbutton\soundenter", 0.09, 1};

Check warning on line 57 in addons/common/gui.hpp

GitHub Actions / build

a property that references a file is missing a file extension

missing file extension
soundEscape[] = {"\a3\ui_f\data\sound\rscbutton\soundescape", 0.09, 1};

Check warning on line 58 in addons/common/gui.hpp

GitHub Actions / build

a property that references a file is missing a file extension

missing file extension
soundPush[] = {"\a3\ui_f\data\sound\rscbutton\soundpush", 0.09, 1};

Check warning on line 59 in addons/common/gui.hpp

GitHub Actions / build

a property that references a file is missing a file extension

missing file extension
};
class GVAR(RscCombo): RscCombo {