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

Update release branch #415

Merged
merged 23 commits into from
Dec 7, 2018
Merged

Update release branch #415

merged 23 commits into from
Dec 7, 2018

Conversation

CreepPork
Copy link
Member

When merged this pull request will:

  • Update the release branch to current release

Revo78 and others added 23 commits August 14, 2018 20:53
* Updated translations again.

* Another french translation update
* Fix exception handling and add support lwircm from RHS

* Use localization
* Handle VLS

* Remove loggers

* Address CreepPork's glorious review

* Use underscore for unused variable
* Added toggle include crew keybind

* Improve description and add FR/DE localization

* fix grammar in FR translation

* Make Eden-like toggle
* Prevent modules from being added automatically

* Prevent modules from being added automatically II

* Faction filter: Add side to text and sort the entries

* Add the available modules filter

* Remove workaround from Achilles init

* Reduce scheduled env to a minimum

* Apply module filter to module tree loading EH

* Fix undefined variable error in register custom modules

* Fix custom modules and duplicates for loaded missions

* Remove logger
* Add surprise

* Update credits

* Fix localization; Add destruction rate option

* Not for curators

* Remove changes to overcast

* Update comments; Remove unused function

* Prevent zero division error

* Use CamelCase

* Remove logger

* Address review

* Address 2nd review

* Remove unnecessary comment
* Add interpolation and angle/rotation functions

* update sqf_validator

* Implement plane CAS

* Offset radius correction

* Implement standard deviation

* Create a function for ownership changes

* Add new icons

* Add advanced CAS functions and update the module

* Improve exception handling

* Use BIS function

* Fix spacing in cfgFunctions

* Add examples

* Use joinString

* Use format instead of joinString

* Add semicolon at the end

* Use camelCase
* Update changlog and credits

* Update version

* Fix spelling

* Remove unused localization

* Fix spelling II
* Handle the case where Zeus is the server

* Fix the nuke module duplicate
* Increase maximum attribute window height

* Use pp for BI GUI grids; Move grid defs to separate file; Use dynamic H grids for inventory attribute

* Use grid defs from ui_f

* Use .inc instead of .h for SQF inclusions

* Include .inc in addon builder

* Fix Rsc Display Attributes

* Change .inc to .inc.sqf
* Do not kill curators and logics

* Introduce _unitDies and handle Achilles revive in switchUnit functions

* Nuke now kills switched units as well

* Correct function name

* Do not kill 'invincible' units
* Revise fix for loss of sides in creation tab

* Make use of CBA settings subcategories for faction/module filters

* Fix for FIA: Include side id in filter

* Port DZN search patch to Achilles

* Address review

* Extend comment
* Fixed wrong error message #382

* Address review
* Added feedback to player pressing toggle crew keybind #380

* Removed default keybind
* Restore achilles modules when a player was promoted to Zeus

* Fix the issue that countermeasure keybinding is triggered when using the creation search field

* Add RHS AN/ALQ to CM

* CAS: Player exception; No empty parentheses; Exclude CMs & LDs

* Suppressive Fire: Exception handling for players

* Transfer ownership: Filter groups with players
* Missing semicolon

* Remove double semicolons; Add missing semicolons

* Replace double double quotes

* Replace more double double quotes

* Remove invalid syntax
* Merge RC change logs

* Fix spelling
@CreepPork CreepPork added the priority/high Issue or PR that should be resolved as quickly as possible. label Dec 6, 2018
@CreepPork CreepPork self-assigned this Dec 6, 2018
@CreepPork CreepPork added the testing/tested Indicates that the PR's latest commit has been tested and is working properly. label Dec 6, 2018
@CreepPork
Copy link
Member Author

CreepPork commented Dec 6, 2018

For some reason, I can merge this PR without @oOKexOo's approval. Even though the branch protection rule is enabled.

@CreepPork CreepPork merged commit c77e5d1 into release Dec 7, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
priority/high Issue or PR that should be resolved as quickly as possible. testing/tested Indicates that the PR's latest commit has been tested and is working properly.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants