mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
51a61653f4
* Add player initilization safety to setSpectator Public function which should wait for player unit to exist before running. With this change an additional variable is now set on the player unit which can be used to check whether players are spectators or not (part of grander plans). * Add UI initalization safety to setSpectator Should make it so that calling the public function before the main display has initalized will correctly wait until it has before starting spectator * Overhaul spectator Initial WIP overhaul of spectator component. Based on BI's End Game Spectator and AACO's work on POTATO spectate. The essential functionality is in place, but some things are broken and some are still to be transferred. * Remove redundant canInteract condition Spectator UI will be open anyway so this is pointless. * Fix follow camera controls Also ensure unit camera modes have a target more consistently * Fix widget weapon icon for unarmed * Fix follow camera zooming * Fix entity list not updating correctly * Remove redundant conditions * Fix list click behaviour * Remove a bunch of old debug * Alter behaviour of camera speed * Restructure the spectator addon * Fix camera tracking behaviour * Fix very fast camera toggle * Fix initial camera mode * Fix double click behaviour * Make AI name display consistent * Add UI toggle * Fix current camera mode button highlighting * Fix focus info widget when clicked on in 3D world * Improve key handling Use of `inputAction` could result in weirdness when multiple keys pressed at the same time. Hardcoded for now. * Implement dynamic help UI element * Remove some redundant code * Fix follow camera jitter * Add projectile drawing Technically the capability to draw projectiles has been in since the start. However it took me a bit of time to figure out how best to add/remove the required event handlers. I decided to add them during the process of finding things to draw, since I'm iterating over the list of spectatable entities here anyway. With an additional GVAR containing up to date entities, the fired EHs can remove themselves when applicable. This avoids any granularity issues with adding EHs en masse. * Improve naming convention related to drawing * Remove outdated unit and side settings Also re-add unit whitelisting/blacklisting support * Rename public function for consistency Adds a deprecated warning to the old function name. * Update stringtable Some entries are replaced with BI translations, others are no longer needed. I pieced together one of the camera mode settings by combining the BI translations of the individual versions. * Add location public functions and list population Just need to take care of drawing and then camera interaction now * Add location 2D and 3D drawing * Respect whitelist and blacklist correctly * Add location camera focus capability * Fix local helicopters follow mode bug * Add compatibility with `counter` template Simply repositions the counter UI to the top of the screen out of the way * Update respawn template This template is only compatible with respawn types 2 & 3 * Rename compatibility function * Add compatibility for respawn types 1,4 and 5 * Update setCameraAttributes function * Fix draw3D for respawn types 1,4 and 5 * Fix screeching seagulls #4265 * Fix script command typo * SQF Linter Pass * Add obsolete warning for public func params * Deprecate interrupt function * Fix incorrect function call * Make playable virtual spectator work * Improve focus handling in public function - User might want to reset focus for free cam, in which case objNull cannot be reserved for random - Focus is still required for unit camera - Update some function headers * Note explicitly the use of `player` * Remove unused base classes * Improve seagull culling * Add projectile drawing to vehicles * Fix same tab selection clearing list * Make projectile lines last 1 frame longer * Add true zeus compatibility - Re-opens spectator when zeus closes - Transfers the curator module over in the respawn template - Only handle uiForced in setSpectator to avoid issues with esc key - Add safety to setFocus so that it only updates the UI when applicable * Fix player moving in FPP * Fix zeus transfer and re-opening * Consolidate icon definitions * Fix AI setting for player groups * Improve handling of alive spectators Instead of disabling simulation, just stage them automatically if alive. * Fix respawn template for types 2 & 3 * Fix pre-set camera mode with no focus - Improve handling of UI updates in camera related functions - More explicit UI initalisation - Find a focus if one wasn't pre-set for a camera mode which requires a focus * Localise key names * Fix camera mode and vision settings on init When spectator starts the available camera modes and vision modes should be consulted to ensure they are respected upon opening. * Fix key localisation * Add next/prev entity keys * Fix vision modes update while camera active - Updates the camera vision mode in case the current was removed * Add public getCameraAttributes function * Fix spectator zeus compatibility - Camera control wasn't returned on exit due to change in fnc_ui * Improve vision mode handling - Curator now resets vision mode on entry - First person also reset vision mode so that it is consistent between camera changes * Improve location handling - It makes more sense to specifiy the position ATL since the text is going to be rendered there and a z of 0 is then ground height. - Updates the ui immediately if the list is already on locations * Disable list keyboard search * Fix handling of forced camera mode with no focus * Fix handling of free mode removal while no target * Fix locations respecting available modes * Fix list entry removal code - Replace getTargetGroups with getTargetEntities for consolidated filtering. - Fix the step of the removal loops and make them go to index 0 instead of 1 * Improve side handling of unit list - Accounts for possibly of whitelisted random objects that belong to other sides - Move the index decrement to loop, not within every loop * Add linter ignore directive * Fix list code * Improve entity fetching - Change whitelist/blacklist application to optimize the code * Include dead units in the list - Allow getTargetEntities to return dead units too - Iterate over allGroups in list updates to reduce overhead * Take care of TODOs * Mark stageSpectator as non-public * Fix updating list focus * Adjust default camera speed * Include the function file * Generalise camera button UI - Makes it easier to extend with future camera mode buttons - Removes potential error when display doesn't exist * Remove obsolete staged event - Add vision toggle to help - Restructure some function PREP * Add public function to return all spectators * Change default briefing name used on map display * Fix the order of 4 main sides in list * Restore non-toggle behaviour of camera speed * Fix UI gap between list and tabs * Force update UI list when player is staged Hopefully this fixes any issues related to the player appearing in the list * Update controls strings * Fix entity tooltips showing short name - Also revert changes to common function and just handle in this component * Include dead in unit switching * Show rank and vehicle icon in list - Rank is shown in tooltip - Vehicle icon is used to see which units in the list are mounted * Change default vehicle icon * Show whether medic/engineer in tooltip * Improve list double click behaviour * Improve group icon handling * Use dynamic group icons for drawing * Fix EFUNC call * Update all function headers * All the changes I had staged before arma broke git Arma managed to crash my whole system again, breaking my git repo and I resorted to nuking it and pasting the changes I had comitted locally back in. From memory: - Fix icon paths - use distanceSqr for minor speed boost - Add setting to show map locations in the UI - Limit location rendering based on distance - Probably some other crap * Fix squared comparisons * Remove unnecessary variable publicity * Deprecate fnc_stageSpectator The function was a source of confusion alongside fnc_setSpectator and so it is replaced by an additional parameter to hide the unit as part of fnc_setSpectator. No longer is the unit moved either, to reduce complexity and give more control to mission maker. * Fix undefined variable * Update spectator framework doc * Update spectator feature doc * Fix typos and grammar * Revent version introduced number * Update with new changes |
||
|---|---|---|
| .. | ||
| _includes | ||
| _layouts | ||
| _posts | ||
| css | ||
| img | ||
| js | ||
| squad | ||
| src | ||
| tools | ||
| wiki | ||
| _config_dev.yml | ||
| _config.yml | ||
| .dockerignore | ||
| .editorconfig | ||
| .gitattributes | ||
| .gitignore | ||
| 404.html | ||
| CNAME | ||
| docker-compose.yml | ||
| Dockerfile | ||
| favicon-32.png | ||
| favicon.png | ||
| Gemfile | ||
| google38c2ed88459ce9b8.html | ||
| googlebd2887f5a38652f2.html | ||
| humans.txt | ||
| index.html | ||
| manifest.json | ||
| news.html | ||
| README_DE.md | ||
| README_PL.md | ||
| README.md | ||
| robots.txt | ||
| sitemap.xml | ||
| team.md | ||
| version.html | ||
Source of https://ace3mod.com/
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