Commit Graph

15434 Commits

Author SHA1 Message Date
a90dd7210e Safemode - Fix indicator when switching units (#6612)
* Fix safe mode indicator when switching units

* Use DIK macro instead of magic number
2018-10-27 15:13:40 -05:00
4d5f2d0de2 French translation (#6644)
* Add french strings for advanced fatigue, finger and rearm

* Add french strings for rearm, fix some of the old ones

* Add missing strings for ACE Nightvision

* Add missing strings for ACE Pylons

* Add missing string for ACE mk6 mortar

* Add / Fix french strings in ACE CookOff

* Update addons/nightvision/stringtable.xml

Co-Authored-By: alganthe <alganthe@live.fr>

* Update addons/nightvision/stringtable.xml

Co-Authored-By: alganthe <alganthe@live.fr>

* Update addons/nightvision/stringtable.xml

Co-Authored-By: alganthe <alganthe@live.fr>

* Update addons/pylons/stringtable.xml

Co-Authored-By: alganthe <alganthe@live.fr>
2018-10-27 15:10:45 -05:00
83ce5345da Make small UAVs battery life more realistic (#6647) 2018-10-26 16:15:37 +02:00
10468c6156 Merge pull request #6654 from acemod/noLaserLight
Common - disable light from green weap lasers
2018-10-26 15:10:35 +02:00
b97ec2c8c8 Common - disable light from green weap lasers 2018-10-25 11:40:27 -05:00
1fe7c5c29c Map - Improve flashlight support (#6608)
* Improve flashlight support

* Speed up items check loop

* Speed up more

* Remove useless var
2018-10-25 11:39:27 -05:00
8580cb250a AI - Fix units not being removed from the garrison unitMove list consistently (#6651)
* Fix units not being removed from the garrison unitMove list consistently

Not sure how I missed that.

* fix whitespace

* Fix typo in unGarrison check

dedmen saw nothing :D
2018-10-24 12:55:12 -05:00
25f36d9340 Improve ai garrison pathing (#6649)
AI - Fix garrison pathing
2018-10-23 13:28:30 -05:00
b8d4f981b2 Fix major typo in a popular Radio mod's name (#6650) 2018-10-23 13:23:10 -05:00
fefba89f19 Repair - Make eden attributes use config values as default (#6480)
* Make eden attributes use config values as default

* Simplify config with inheritance
2018-10-21 17:07:19 -05:00
d842e0ad58 Map - Fix effects breaking mid mission (#6566)
* fix map effects breaking mid mission

* avoid magic numbers

* params a function

* XEH DisplayLoad instead of dummy display

* formatting, parentheses

* fix a thing

* skip effects in briefing
2018-10-21 17:01:18 -05:00
001942b2ed Vehicle Lock - Enable for planes (#6646)
* enable vehicle lock module for planes

* Add actions to planes

* improved lazy eval

* remove superfluous parent class check

* IS_KIND_OF_ANY macro

* Update addons/vehiclelock/functions/fnc_moduleSync.sqf

* Improve handleVehicleInitPost XEH
2018-10-21 16:37:16 -05:00
6f6b0d15f8 Add curator garrison path drawing, clean up garrison code (#6643) 2018-10-18 11:14:26 -05:00
95fbdbce65 disable marker editing for polylines (#6596) 2018-10-16 18:08:10 -05:00
52abed1d07 Fastroping - Fix 3den default value (#6642)
Close #5550
2018-10-16 12:24:41 -05:00
50e233c22c Add key handling to 3DEN attribute (#6622) 2018-10-14 08:54:51 -05:00
9b6aa4c8c2 Add MagazineWells support (#6604)
* Add MagazineWells to ballistics

* Add HuntIR wells

* Add Vanilla wells

* New CBA magwells

* indent

* test

* Revert "test"

This reverts commit 00f689f681.

* Fix huntIR configs

* Use CBA_65x39_Mk200 well
2018-10-13 13:11:57 -05:00
4ff8fc13ff Fix turrets without weapon treated as gunner (#6636) 2018-10-13 12:07:51 -05:00
d7c7ead574 Zeus - Add Repair and Rearm interactions (#6632)
* Add Repair and Rearm interaction to zeus

* Optimize remoteControl statement
2018-10-13 12:07:32 -05:00
6ad28439b0 Cargo - Revert Load Times Normalize (#6638) 2018-10-13 11:59:16 -05:00
6363f73fb8 AMS and KHS realistic name (#6605)
Realisticnames - Update AMS and KHS's name
2018-10-12 23:00:20 -05:00
468ab249a2 Scopes - Update AMS, KHS and LRPS "ACE_ScopeAdjust" (#6606)
* ams_khs_scopeadjust

* Update CfgWeapons.hpp
2018-10-12 22:58:35 -05:00
c95877d823 Cargo - Add load time coefficient setting (#6618)
* Add loadTimeCoefficient setting

* Call settingChanged function

* Normalize load coefficient
2018-10-12 22:37:05 -05:00
9972f5374f Default enable Quick mount (empty keybind) and Move to CBA Settings (#6613)
Quickmount - Default enable quick mount (empty keybind) and Move to CBA Settings
2018-10-12 22:14:03 -05:00
4ff01967b6 Add Feature Camera Player EH and Handling (#6573)
* Switch to CBA Feature Camera handling

* Register ACE3's Feature Cameras

* Backwards compatiblity for old ace event

* Require CBA 3.9
2018-10-12 14:59:40 +02:00
0633b807fa Some Refactoring (#6607)
* SwitchUnits

* tacticalLadder

* vehiclelock

* vector

* Typo, thanks circleCI

* Fix stuff

* Fix animate loop
2018-10-09 20:21:46 -05:00
f2f5a94549 Merge pull request #6060 from Drofseh/tracer_adjustment
ACE Tracer adjustment, fix nighttime visibility, add white tracers
2018-10-10 01:42:48 +02:00
28d23e50f7 Merge branch 'tracer_adjustment' of https://github.com/Drofseh/ACE3 into tracer_adjustment 2018-10-09 16:37:09 -07:00
d8cf117841 Merge remote-tracking branch 'refs/remotes/acemod/master' into tracer_adjustment 2018-10-09 16:36:49 -07:00
75f364c80b travis 2018-10-10 01:25:13 +02:00
44414d4fc0 travis 2018-10-10 01:24:46 +02:00
641eb49dfe travis 2018-10-10 01:24:11 +02:00
a6888cb798 travis 2018-10-10 01:23:40 +02:00
9e8242a8a3 redo large calibre tracers.
I've just taken the small arms tracers, scaled them up 2x, and then
saved over the old large calibre tracers.
This works a lot better and looks a lot nicer than the old large calibre
tracers.
They use the same rvmats and textures as the small arms tracers, so the
old files for large calibre tracers can be removed.
2018-10-08 22:25:39 -07:00
5594b9cef1 Italian Translation Update (#6621)
Added new strings in:
-Advanced fatigue
-Arsenal
-Ballistics
-Common
-Concertina wire
-Dogtags
-Explosives
-Maverick
-MicroDAGR
-Night vision
-Overpressure
-Realistic names
-Scopes
-Zeus

Fixed some strings in:
-Common
-Concertina wire
-Hitreactions
-HuntIR
-Inventory
-Laser
-Maverick
-Medical ai
-Missile guidance
-Realistic Names
-Spotting scope
-Switch Units
-Tactical ladder
-Tripod
2018-10-08 20:49:37 -05:00
86a243d3cc Fix ENVG II overlay (#6630) 2018-10-08 15:24:44 -05:00
9eba55be21 Cargo - CanLoadItem ignores vehicle height on scripted load (#6629) 2018-10-08 15:23:59 -05:00
e54e8d0f8c Fix blacklist not working in multiplayer (#6598) 2018-10-07 22:49:29 -05:00
9aa34ab462 Cache dogtag actions (#6625) 2018-10-07 22:23:49 -05:00
98bf92f406 Merge pull request #6626 from veteran29/remove-BOM
Remove BOM character from stringtables
2018-10-07 13:17:12 +02:00
5e07d894f8 Remove BOM from stringtables 2018-10-07 11:30:15 +02:00
38d44eb144 Use CircleCI instead of Travis for build status (#6620)
* Use CircleCI instead of Travis for build status

We are no longer using Travis and the status badge should reflect this.

* Polish de other readmes
2018-10-07 08:11:24 +02:00
7c4faee388 Merge pull request #6623 from acemod/fix-viv-engine
fix engine start delay turning viv laoded vehicle when starting the engine
2018-10-06 14:09:12 +02:00
dfde6e2aae fix engine start delay turning viv laoded vehicle when starting the engine 2018-10-06 13:41:26 +02:00
97e3766ed3 Fix slow motion falling of SLAM mines (#2770) (#6619) 2018-10-06 12:07:08 +02:00
58c0c3fd02 Consitently capitalize first letters of wiki titles (#6615)
* Consitently capitalize first letters of wiki titles

* fix title case, add framework to the atragmx page
2018-10-05 15:20:50 +02:00
4b151adc63 force lf endings for docker entrypoint file (#6614) 2018-10-05 06:58:56 +02:00
7aa59ecbc4 Fix duplicate japanese strings (#6611) 2018-10-02 15:16:44 +02:00
43c5258585 Realistic Names - Rename RGN to V40 Mini-Grenade, fix some trailing spaces (#6590)
* Add new strings, fix Czech M67

Czech string for M67 had a trailing space.

* Apply new strings

* Remove placeholder translations

* Fix more trailing spaces
2018-09-27 09:18:54 +02:00
db5e9eaad7 Fix rope redeploying without FRIES - fix #5686 (#6599) 2018-09-26 13:56:50 +02:00