mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
c8404f496e
* Arsenal update * Fixes * Update fnc_onSelChangedLeft.sqf * Update fnc_updateUniqueItemsList.sqf * Header fixes * Fix for defines.hpp Co-authored-by: Dystopian <sddex@ya.ru> * Moved fnc_baseWeapon, filtered invalid items * Update addons/arsenal/functions/fnc_scanConfig.sqf Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com> * Fixes and tweaks - Sorting is guaranteed to give a fixed order - Dog tags no longer throw errors when reloading the ACE arsenal mission when you had some saved in your loadout before quitting the last time you played. * Cleanup, bug fixes and additions - Added the ability to add items from "CfgMagazines" into the "Misc. items" or custom tabs. - Added "baseWeapon" class support for weapon attachments. If a weapon attachment has the config property "baseWeapon" defined, it will take that item and show that in the arsenal. - Added stronger filtering on item scopes (scope > 0 at least for every item) - Added "descending" (default, as it is now) and "ascending" sort order as a drop down menu, - Unique backpacks in containers can now be removed with either the "-" or "clear all items" button. - When sorting by a number, 2 decimal points have been added, so that when you sort by weight it returns the correct order. * More fixes and tweaks - Converted the arsenal to partially work with hashmaps instead of arrays (for configItems and virtualItems, currentItems is still an array). - Because of the above, performance of FUNC(addVirtualItems) and FUNC(removeVirtualItems) has improved immensely. - Sorting now caches results, reducing repeated sorting times drastically. - CBA disposable launchers are handled differently now: Within the arsenal, you can change weapon attachments on disposable launchers, but you can't change their magazines (primary or secondary). Item info on the right and the stats show correct information. - FUNC(addSort) now checks if the new sorting method already exists and doesn't add it if it does. - FUNC(removeSort) now exists. You can't remove the default sort type (alphabetically) to avoid problems with the arsenal. - Both FUNC(addStat) and FUNC(compileStats) actually taken priority into account now. Because of that priority on several stats needed to be tweaked. - FUNC(removeStat) ensures that there are no gaps within the stat array (so if there is an empty spot in the stats page, it's because there is a stat, but the condition for it being shown hasn't been met). * Update fnc_replaceUniqueItemsLoadout.sqf * Update fnc_onSelChangedLeft.sqf * Update fnc_scanConfig.sqf * Update docs/wiki/framework/arsenal-framework.md Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com> * Minor cleanup * Baseweapon filtering * Improvements + better unique items support * Update fnc_fillRightPanel.sqf * Update fnc_onSelChangedLeft.sqf Fixed: Switching between weapons with incompatible primary magazines while a compatible secondary magazine is loaded doesn't equip the new weapon's primary magazine. * Update addons/common/functions/fnc_uniqueUnitItems.sqf Co-authored-by: PabstMirror <pabstmirror@gmail.com> * undefined variable Co-authored-by: PabstMirror <pabstmirror@gmail.com> * fix undefined loadout var * Update fnc_fillLoadoutsList.sqf --------- Co-authored-by: Dystopian <sddex@ya.ru> Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com> Co-authored-by: PabstMirror <pabstmirror@gmail.com> |
||
|---|---|---|
| .. | ||
| _includes | ||
| _layouts | ||
| _posts | ||
| css | ||
| img | ||
| js | ||
| src | ||
| tools | ||
| wiki | ||
| _config_dev.yml | ||
| _config.yml | ||
| .dockerignore | ||
| .editorconfig | ||
| .gitattributes | ||
| .gitignore | ||
| 404.md | ||
| acebot.json | ||
| CNAME | ||
| docker-compose.yml | ||
| Dockerfile | ||
| entrypoint.sh | ||
| favicon-32.png | ||
| favicon.png | ||
| Gemfile | ||
| google38c2ed88459ce9b8.html | ||
| googlebd2887f5a38652f2.html | ||
| humans.txt | ||
| index.html | ||
| manifest.json | ||
| news.md | ||
| package-lock.json | ||
| README_DE.md | ||
| README_PL.md | ||
| README.md | ||
| README.zh-TW.md | ||
| robots.txt | ||
| sitemap.xml | ||
| team.md | ||
| version.md | ||
Source of https://ace3.acemod.org/
Updating compiled JavaScript and CSS files
-
Install Node.js
-
Open Command Prompt and navigate to
srcdirectorycd <ACE3_directory>/docs/src -
Install Node packages
npm installOn Bash on Ubuntu on Windows also install
nodejs-legacyin case of errors. -
Update files
grunt
Setting up the Jekyll environment
Using Docker
We include files for Docker to run Jekyll in a separate container. This allows you to not having to install anything apart from Docker on your computer.
Running the Dockerfile
-
Install Docker
-
cd into the
/docs/directory -
Open Command Prompt and navigate to this directory
cd <ACE3_directory>/docs -
Build and run the container
docker-compose up -
Navigate to http://localhost:4000
Manually
Installing prerequisites
Windows (CMD)
-
Install Ruby 2.0.0-p648 (x64)
-
Install Ruby DevKit for 2.0 (x64)
-
Open Command Prompt and navigate to this directory
cd <ACE3_directory>/docs -
Install
bundlergemgem install bundler -
Install required gems through
bundlerbundle install
Debian / Bash on Ubuntu on Windows
-
Open Bash and navigate to this directory
cd <ACE3_directory>/docs -
Install
makeandgccsudo apt-get install make gcc -
Install
ruby2.0,ruby2.0-devandruby-switchsudo apt-add-repository ppa:brightbox/ruby-ng sudo apt-get update sudo apt-get install ruby2.0 ruby2.0-dev ruby-switch -
Set Ruby version
sudo ruby-switch --set ruby2.0 -
Install
bundlersudo gem install bundler -
Install required gems through bundler
bundle install -
In case of sticky folder error during
bundle install, execute the following to fix permissionsfind ~/.bundle/cache -type d -exec chmod 0755 {} +
Running
-
Run Jekyll through bundler
bundle exec jekyll serve --future --incremental --config _config_dev.ymlUse
--force_pollingon Bash on Ubuntu on Windows due to a bug preventing watching. -
Navigate to http://localhost:4000