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 from Original #7

Merged
merged 186 commits into from
Oct 31, 2019
Merged

Update from Original #7

merged 186 commits into from
Oct 31, 2019

Conversation

classicarma
Copy link
Owner

When merged this pull request will:

ViperMaul and others added 30 commits April 27, 2019 13:06
* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* fix transltion
* JAM - Add 1.92 vanilla mag wells

* add all mx mags to all mx rifles
* tooltips for dropDisposable setting

* tooltips for dropDisposable setting

* add setting to disable disposable launchers

* don't disable launcher magazine slot if disposable launcher replacement is disabled

* Update Japanese translation (#1127)

* retroactive InitPost event to wait for setting to be synched in MP
* fix fail to read settings from settings file

* add comments for guards
* repair test

* with is broken in scheduled

* repair curator ammo box preload

* repair 3den ammo box preload
* add manual reticle night switch keybind

* add  optics reticleSafezoneSize config entry  (#1142)

* optics reticleSafezoneSize config entry

* optics hidePeripheralVision config entry (#1143)
* add buildingPos dummy object

* update model, editor group

* CfgPatches and author config entry

* delete animations

* add objects to zeus

* Change texture to `#(argb,8,8,3)color(0,0,0,0,co)`

* add CBA_fnc_buildingPositions
* optimize magwell preloading

* recognize inherited items

* fix some test weirdness
* add CBA_fnc_randomVector3D

* simplify

* fix math
* Change descriptionShort of legacy Zafir mags

* Remove reference to Zafir in Chinese

Co-Authored-By: commy2 <commy-2@gmx.de>

* Remove "original" entries, move english to top
* replace %20 with space

* replace %20 on briefing/map
* Extend 3den selectable date range

* add commy2 suggestions

* update ModuleDate_F with expanded years

* add macro

* Update addons/common/CfgVehicles.hpp

Co-Authored-By: commy2 <commy-2@gmx.de>

* Update addons/common/Cfg3DEN.hpp

Co-Authored-By: commy2 <commy-2@gmx.de>
* Add next attachment in next frame

- Moves adding of next attachment to next frame
- Allows different flashlight modes to be used and update properly when switching
- Currently switching from one flashlight to another in the same frame whilst the flashlight is on causes the light effect not to update to the new flashlight

Question: Would the localEvent need to be moved into the next frame as well?

* Accessory switch localEvent next frame

* Suggestions from commy for readability
* draw scripted optic in pause menu in MP

* draw scripted optic in pause menu in MP
Drofseh and others added 29 commits September 29, 2019 10:37
Add magwells for the UZI and AS50
Co-Authored-By: commy2 <commy-2@gmx.de>
Add Missing Turkish Translations
XEH - Fix version report in rpt
Co-Authored-By: jonpas <jonpas33@gmail.com>
 Replace all use of count as a forEach
…he sides to support 21:9 aspect ratio screens.
…h what you saw before scoping in.

See #1245 (comment) for comparison of old value.
Add support for 21:9 resolutions to CBA optics addon.
localized diary topics replacement pull request
add XEH support to WeaponHolder(Simulated)
@classicarma classicarma merged commit d5b1a2d into classicarma:master Oct 31, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.