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

Virtual Arsenal Manager #285

Draft
wants to merge 141 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
141 commits
Select commit Hold shift + click to select a range
bab2062
- Increased 3den Radio UI height
Sep 24, 2023
fec1ae6
- Fixed Entity Counter positioning
Sep 24, 2023
d575764
- Updated files
Sep 24, 2023
c8c5484
- Updated File
Sep 26, 2023
054c0a3
- Improved Code
Sep 26, 2023
b659415
- Replaced GUI_GRID with pixelGrid
Sep 26, 2023
6fc1ae6
- Code formatting
Sep 27, 2023
7e2601e
- Removed redundant macro
Sep 27, 2023
b87c933
- Removed deprecated macro use
Sep 28, 2023
1a386e9
- Entire redesign of VAM main UI
Sep 28, 2023
14cd8a7
- Update
Sep 28, 2023
41c11a3
- added functionality to UI controls
Oct 1, 2023
c1de269
- Header and Close button in Placement Tools UI is now static
Oct 1, 2023
8164e9c
- Updated UI layout
Oct 1, 2023
0f13ee2
- Updated code
Oct 1, 2023
ae928ef
- Added macro
Oct 2, 2023
7fabefd
- Removed obsolete tools
Oct 2, 2023
6536aa1
- Minor code improvements
Oct 2, 2023
eca83b5
- Removed obsolete tools
Oct 2, 2023
b1f3ba8
- Removed obsolete tools
Oct 2, 2023
b01cba4
- Updated Files
Oct 2, 2023
d2a9ed5
- Fixed incorrect class name of Placemen Tools UI
Oct 2, 2023
500392b
- Remove multiselect from Variable Viewer
Oct 2, 2023
d412ade
- Profilenamespace is now saved if playlist was changed
Oct 3, 2023
75fe459
- Comment
Oct 3, 2023
c1deadc
- Update
Oct 3, 2023
e2a70eb
- Update
Oct 3, 2023
fd109dc
- Mission Backup attribute will now create backup files in mission ro…
Oct 8, 2023
c151fa1
- Removed duplicated macros
Oct 9, 2023
cd8a5a6
- Removed redundant definition
Oct 9, 2023
c4e4c44
- Texture Finder can no longer be dragged
Oct 9, 2023
2f9efab
- Updated files
Oct 9, 2023
6e94cda
Merge pull request #284 from R3voA3/7.8.3
R3voA3 Oct 9, 2023
23841af
- Bumped version number
Oct 9, 2023
cd8c340
- Added missing define
Oct 17, 2023
c31c848
- Improved display3DENPublishMissionSelectImage
Oct 17, 2023
f634eb9
- Removed wrong comment
Oct 17, 2023
8c9e634
- Restructured context menu
Oct 17, 2023
c1bf447
- Updated changelog
Oct 17, 2023
6cfed17
- Readded Y axis color to statusbar
Oct 26, 2023
2135a2f
- Updated files
Oct 26, 2023
07f15fa
- fixed entity counter
Oct 27, 2023
a457aa6
- updted files
Oct 27, 2023
54d22da
Merge pull request #287 from R3voA3/v7.8.4
R3voA3 Oct 27, 2023
54e81c6
Fix header formatting in CHANGELOG.md
klausman Nov 20, 2023
d3f48dc
Merge pull request #292 from klausman/patch-1
R3voA3 Nov 20, 2023
a40107a
Update markerHideOnStart.hpp
hypoxia125 Dec 9, 2023
4ceb3a1
Update markerHideOnStart.hpp
hypoxia125 Dec 9, 2023
5dc41f2
- Added minimap
Dec 15, 2023
f95ad19
Merge pull request #293 from hypoxia125/master
R3voA3 Dec 15, 2023
e1edff7
- improved code
Dec 15, 2023
48ff77c
- added the ability to toggle minimap via menu strip
Dec 16, 2023
debf8e8
- fixed attributes would be saved to mission.sqm even if unused
Dec 16, 2023
80283a7
- updated files
Dec 16, 2023
a867776
- fixed formatting
Dec 16, 2023
b74f80d
Merge branch 'master' into v7.8.6
R3voA3 Dec 16, 2023
a91b3d4
- restored changelog
Dec 16, 2023
dddf251
- renamed slider control so it's more generic
Dec 16, 2023
3658936
- Added the ability to change minimap size via shortcut
Dec 16, 2023
f5b48c2
- Moved minimap to the left side to prevent overlapping with preview …
Dec 19, 2023
ec283da
- added localiation for size settings
Dec 19, 2023
d032d47
- code formatting
Dec 19, 2023
b0f4468
- replaced default player icon with custom one
Dec 19, 2023
a545b87
- update
Dec 19, 2023
6a76acd
Mission backups: allow configuration of backup folder
klausman Dec 19, 2023
6cd49c9
- improved backup naming to include worldName
Dec 20, 2023
3b4ec90
- updated changelog
Dec 20, 2023
19f4869
- updated contributors
Dec 20, 2023
c143501
Merge pull request #296 from klausman/backuppath
R3voA3 Dec 20, 2023
66963cb
- improved local build handling to exclude signing
Dec 20, 2023
0939350
- Added minimap
Dec 15, 2023
08ef9fa
- improved code
Dec 15, 2023
072385a
- added the ability to toggle minimap via menu strip
Dec 16, 2023
056ed65
- fixed attributes would be saved to mission.sqm even if unused
Dec 16, 2023
aafc37f
- updated files
Dec 16, 2023
7e5a643
- renamed slider control so it's more generic
Dec 16, 2023
234a128
- Added the ability to change minimap size via shortcut
Dec 16, 2023
72b8d58
- Moved minimap to the left side to prevent overlapping with preview …
Dec 19, 2023
32c9167
- added localiation for size settings
Dec 19, 2023
ad40d85
- code formatting
Dec 19, 2023
492e7fd
- replaced default player icon with custom one
Dec 19, 2023
acf3da3
- update
Dec 19, 2023
db01c43
- improved local build handling to exclude signing
Dec 20, 2023
887c4c9
Merge branch 'v7.8.6' of https://github.com/R3voA3/3den-Enhanced into…
Dec 20, 2023
4639d44
- code formatting
Dec 27, 2023
343da02
- updated dynamic simulation debug mode
Dec 27, 2023
9e89b99
- added tool to highlight area markers in 3D space
Dec 27, 2023
8c2cf61
- update
Dec 27, 2023
a7206a7
- update
Dec 27, 2023
d6980c9
Merge pull request #294 from R3voA3/v7.8.6
R3voA3 Dec 27, 2023
3448919
- updated build task to support building without starting the game
Dec 28, 2023
67b6467
- minimap is disabled by default
Dec 28, 2023
3386e24
- update
Dec 28, 2023
e84cf67
Update README.md
R3voA3 Dec 28, 2023
7a134c2
- updated documenation function
Dec 29, 2023
94c5a2b
- fixed bug in debug options function
Dec 29, 2023
9ad528b
- added dev folder is being created on build with static name
Dec 29, 2023
c6ddea4
- added shortcut to Steam WS
Dec 29, 2023
3c5c0ab
Merge branch 'master' of https://github.com/R3voA3/3den-Enhanced
Dec 29, 2023
52d8b86
- Various improvements to Functions Viewer
Jan 5, 2024
4ad54aa
- Garrison UI was overhauled
Mar 10, 2024
ab6de15
- Many tweaks to functions viewer
Mar 10, 2024
959f2a0
- Fixed file name
Mar 10, 2024
4c41095
- fixed duplicated entry
Mar 10, 2024
354b75a
- improved translation
Mar 10, 2024
251c9ae
- fixed script error when deleting area helper
Mar 11, 2024
90e237e
- renamed function
Mar 11, 2024
96582e6
Translate French
Alfred-Neuman Apr 3, 2024
c835f42
Translate French
Alfred-Neuman Apr 4, 2024
24add68
Merge pull request #301 from Alfred-Neuman/master
R3voA3 Apr 22, 2024
4092836
- Restructured mod to work with hemtt
May 1, 2024
ca59c59
- Remove some unused strings
May 1, 2024
f049e5d
- updated .gitignore
May 1, 2024
3317eeb
- Replaced GUI_GRID with pixelGrid
Sep 26, 2023
a96dc26
- Code formatting
Sep 27, 2023
a8585f0
- Entire redesign of VAM main UI
Sep 28, 2023
1ca9d3a
- Update
Sep 28, 2023
1b8ee1f
- added functionality to UI controls
Oct 1, 2023
ed0713d
- Updated UI layout
Oct 1, 2023
3de051d
- Updated code
Oct 1, 2023
151eae4
Merge branch 'Virtual-Arsenal-Manager' of https://github.com/R3voA3/3…
May 1, 2024
366e41f
- moved functions
May 1, 2024
a9ad22e
- moved functions
May 1, 2024
8a0d696
- deleted folder
May 1, 2024
b224235
- deleted WIP folder as it's part of other branch now
May 1, 2024
d625593
- removed old folder
May 1, 2024
0b032e9
- Entire redesign of VAM main UI
Sep 28, 2023
b9ee135
- Update
Sep 28, 2023
ff40811
- added functionality to UI controls
Oct 1, 2023
57a4d06
- Updated UI layout
Oct 1, 2023
c19630e
- Updated code
Oct 1, 2023
d137ba6
- Replaced GUI_GRID with pixelGrid
Sep 26, 2023
aa7329a
- Code formatting
Sep 27, 2023
71d0587
- Entire redesign of VAM main UI
Sep 28, 2023
ed1134e
- added functionality to UI controls
Oct 1, 2023
8b1a764
- Updated UI layout
Oct 1, 2023
6ddfdd1
- Updated code
Oct 1, 2023
1b4c3d6
- moved functions
May 1, 2024
a837714
- moved functions
May 1, 2024
6085cc5
- removed old folder
May 1, 2024
0ce6c36
Merge branch 'Virtual-Arsenal-Manager' of https://github.com/R3voA3/3…
May 1, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
File renamed without changes.
8 changes: 6 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
*.biprivatekey
*.code-workspace
*.txt
*.sqfc
*.url

#Folders
versions/
SQFC/
releases
.hemttout
.vscode
.hemtt/missions
16 changes: 16 additions & 0 deletions .hemtt/hooks/post_release/renameZip.rhai
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//Rename zipped file to old 3den Enhanced standard
let releases = HEMTT_RFS.join("releases");
let src = releases.join(HEMTT.project().prefix() + "-latest.zip");
let dst = releases.join("@" + HEMTT.project().name() + " v" + HEMTT.project().version() + ".zip");

if src.is_file()
{ // support --no-archive
if !src.move(dst)
{
fatal("Failed to move " + src + " to " + dst);
}
else
{
print("Zip file created: " + dst)
}
}
21 changes: 21 additions & 0 deletions .hemtt/hooks/post_release/setVersion.rhai
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
//Creates version.txt file inside the release folder which is then read by the powershell script
//That updates the mod on Steam Workshop

let strVersion = HEMTT.project().version().to_string();
let destination = HEMTT_OUT.join("version.txt");

destination.create_file().write(strVersion);

if (destination.isFile())
{
print("File created: " + destination);
}
else
{
fatal("version.txt could not be created!");
}

//Update version in mod.cpp
let strFileContent = HEMTT_OUT.join("mod.cpp").open_file().read();
strFileContent.replace("0.0.0", HEMTT.project().version().to_string());
HEMTT_OUT.join("mod.cpp").create_file().write(strFileContent);
46 changes: 46 additions & 0 deletions .hemtt/project.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name = "3den Enhanced"
mainprefix = "x"
prefix = "enh"
author = "R3vo"

[files]
include = [
"LICENSE.md",
"CONTRIBUTORS.md",
"userconfig",
"python_code/**",
"keys/**",
]

[version]
major = 7
minor = 8
patch = 9
git_hash = 0

[hemtt.release]
sign = false

[properties]
author = "R3vo"
url = "https://steamcommunity.com/sharedfiles/filedetails/?id=623475643"

# Launched with `hemtt launch`
[hemtt.launch.default]
workshop = [
"450814997", # CBA_A3
"1751569185", # Pythia
"1387934106", # 7erra's Editing Extensions
"2073243184", # 3Den Stringtable Viewer
]

mission = "scriptLibrary.VR" # Mission to launch directly into the editor with

parameters = [
"-skipIntro", # These parameters are passed to the Arma 3 executable
"-noSplash", # They do not need to be added to your list
"-showScriptErrors", # You can add additional parameters here
"-debug"
]

executable = "arma3_x64"
12 changes: 11 additions & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"problemMatcher": []
},
{
"label": "Build 3den Enhanced",
"label": "Build 3den Enhanced & Start Arma 3",
"type": "shell",
"command": "tools/build.ps1",
"problemMatcher": [],
Expand All @@ -40,6 +40,16 @@
"true"
],
"problemMatcher": []
},
{
"label": "Build 3den Enhanced",
"type": "shell",
"command": "tools/build.ps1",
"args": [
"false",
"false"
],
"problemMatcher": []
},
{
"label": "Clear Log Files",
Expand Down
1 change: 0 additions & 1 deletion 3denEnhanced/$PBOPREFIX$.txt

This file was deleted.

88 changes: 0 additions & 88 deletions 3denEnhanced/GUI/3DENShortcuts.hpp

This file was deleted.

163 changes: 0 additions & 163 deletions 3denEnhanced/GUI/3denRadio.hpp

This file was deleted.

Loading