Commit Graph

12348 Commits

Author SHA1 Message Date
commy2
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
Drofseh
28d23e50f7 Merge branch 'tracer_adjustment' of https://github.com/Drofseh/ACE3 into tracer_adjustment 2018-10-09 16:37:09 -07:00
Drofseh
d8cf117841 Merge remote-tracking branch 'refs/remotes/acemod/master' into tracer_adjustment 2018-10-09 16:36:49 -07:00
commy2
75f364c80b
travis 2018-10-10 01:25:13 +02:00
commy2
44414d4fc0
travis 2018-10-10 01:24:46 +02:00
commy2
641eb49dfe
travis 2018-10-10 01:24:11 +02:00
commy2
a6888cb798
travis 2018-10-10 01:23:40 +02:00
Drofseh
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
Andrea Verano
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
BaerMitUmlaut
86a243d3cc Fix ENVG II overlay (#6630) 2018-10-08 15:24:44 -05:00
PabstMirror
9eba55be21
Cargo - CanLoadItem ignores vehicle height on scripted load (#6629) 2018-10-08 15:23:59 -05:00
mharis001
e54e8d0f8c Fix blacklist not working in multiplayer (#6598) 2018-10-07 22:49:29 -05:00
mharis001
9aa34ab462 Cache dogtag actions (#6625) 2018-10-07 22:23:49 -05:00
commy2
98bf92f406
Merge pull request #6626 from veteran29/remove-BOM
Remove BOM character from stringtables
2018-10-07 13:17:12 +02:00
Filip Maciejewski
5e07d894f8 Remove BOM from stringtables 2018-10-07 11:30:15 +02:00
Thomas Kooi
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
commy2
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
commy2
dfde6e2aae
fix engine start delay turning viv laoded vehicle when starting the engine 2018-10-06 13:41:26 +02:00
BaerMitUmlaut
97e3766ed3
Fix slow motion falling of SLAM mines (#2770) (#6619) 2018-10-06 12:07:08 +02:00
Jo David
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
Jo David
4b151adc63
force lf endings for docker entrypoint file (#6614) 2018-10-05 06:58:56 +02:00
Josuan Albin
7aa59ecbc4 Fix duplicate japanese strings (#6611) 2018-10-02 15:16:44 +02:00
Blutze
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
jonpas
db5e9eaad7
Fix rope redeploying without FRIES - fix #5686 (#6599) 2018-09-26 13:56:50 +02:00
mharis001
0fd1a4c39e Convert CBA_fnc_uniqueUnitItems to common fnc_uniqueItems (#6593) 2018-09-22 21:59:16 -05:00
mharis001
8648ccaba5 Explosives - Optimize creating explosive place actions (#6413)
* Optimize explosive actions

* Optimize hasExplosives function

* Readability parentheses

* bump

* testing...

* last try

* for science

* fix for sqf_validator
2018-09-21 22:54:24 -05:00
Mezilsa
ab52ff8ddb add microdagrwaypoint precision as an option (#6437)
* Make the precision of the mircoDagr less perfekt

* Add strings of precision Option to stringtabel

* Update stringtable.xml

* Create initSettings.sqf

* Update ACE_Settings.hpp

* Finally

* Cleaning

* Update initSettings.sqf

* Move other settings to sqf, simplify waypointPrecision
2018-09-21 22:32:09 -05:00
mharis001
61000df120 Tagging - Cache required items check and use uniqueItems (#6582)
* Cache required items check and use uniqueItems

* Use config-case for required items
2018-09-21 15:11:02 -05:00
PabstMirror
afbf2049ea
Skip semi-colon test with findIf (#6584)
* Skip semi-colon test with findIf

* Fix  #6186

* column cleanser
2018-09-20 14:34:59 -05:00
Dedmen Miller
0a2f5cf238 Fixed #6581 (#6586) 2018-09-19 08:31:08 -05:00
Ozan Eğitmen
a6d40549dc Fix findIf typo, Don't deep copy arrays (#6587) 2018-09-19 08:24:57 -05:00
commy2
8587da58cb
Merge pull request #6583 from acemod/sqf_validator-findIf
sqf_validator compatibility with findIf command
2018-09-19 01:52:45 +02:00
commy2
7673ffab0a
sqf_validator compatibility with findIf command 2018-09-19 01:23:48 +02:00
commy2
550acf6a2b
Merge pull request #6208 from Max255PL/laserbeam
Add IR beam to visible laser mode
2018-09-18 20:54:42 +02:00
commy2
5aa8c1dca0 make setUnconscious not reset firing mode (#6519) 2018-09-18 11:35:40 -05:00
Dedmen Miller
e2ac18a05d [WIP] Fix script errors reporting wrong line numbers (#6407)
* advanced_ballistics

* advanced_fatigue

* advanced_throwing

* ai

* aircraft

* arsenal

* atragmx

* attach

* backpacks

* ballistics

* captives

* cargo

* chemlights

* common

* concertina_wire

* cookoff

* dagr

* disarming

* disposable

* dogtags

* dragging

* explosives

* fastroping

* fcs

* finger

* frag

* gestures

* gforces

* goggles

* grenades

* gunbag

* hearing

* hitreactions

* huntir

* interact_menu

* interaction

* inventory

* kestrel4500

* laser

* laserpointer

* logistics_uavbattery

* logistics_wirecutter

* magazinerepack

* map

* map_gestures

* maptools

* markers

* medical

* medical_ai

* medical_blood

* medical_menu

* microdagr

* minedetector

* missileguidance

* missionmodules

* mk6mortar

* modules

* movement

* nametags

* nightvision

* nlaw

* optics

* optionsmenu

* overheating

* overpressure

* parachute

* pylons

* quickmount

* rangecard

* rearm

* recoil

* refuel

* reload

* reloadlaunchers

* repair

* respawn

* safemode

* sandbag

* scopes

* slideshow

* spectator

* spottingscope

* switchunits

* tacticalladder

* tagging

* trenches

* tripod

* ui

* vector

* vehiclelock

* vehicles

* viewdistance

* weaponselect

* weather

* winddeflection

* yardage450

* zeus

* arsenal defines.hpp

* optionals

* DEBUG_MODE_FULL 1

* DEBUG_MODE_FULL 2

* Manual fixes

* Add SQF Validator check for #include after block comment

* explosives fnc_openTimerUI

* fix uniqueItems
2018-09-17 14:19:29 -05:00
mharis001
803d497d8a Improve checking of unit items (#6350)
* Add uniqueItems function

* Optimize dogtag children actions function

* Optimize getDetonators item search

* Store CfgWeapons lookup in getDetonators

* Update items to use new function

* Update items to use new function 2

* More optimization of uniqueItems function

* Update items to use new function 3
2018-09-17 14:03:28 -05:00
Timi007
7988622635 Add the ability to edit user placed markers (#6564)
* add the ability to edit user placed markers

* remove direct channel from valid channels

* add author

* optimize get map display

replace old method of getting the map display with displayParent

* optimize code by adding isEqualTo

* correct some spelling mistakes
2018-09-17 13:52:24 -05:00
PabstMirror
75f8a35d3d
RHS Compat - Simplify HuntIR mag config (#6580)
* RHS Compat - Simplify HuntIR mag config

* x
2018-09-17 13:22:18 -05:00
Ozan Eğitmen
db6a40f91d Arsenal - Add Default Loadouts API (#6558)
* Add addDefaultLoadout function

* Initialize defaultLoadoutsList by default

* Close params bracket

* Revert "Initialize defaultLoadoutsList by default"

This reverts commit a53d21046e.

* Add isNil check

* Remove tab

* Overwrite loadout if it exists

* Fix file name typo

* Use findIf and copy array

* Add override note to header

* Make btnImport use new function instead of duplicating code

* Use GVAR

* Use findIf

* Fix spacing

* Add documentation

* Improve documentation
2018-09-17 13:22:04 -05:00
Wakbub
64cc287408 RHS Compat - Fix GREF canoes refuel interaction (#6575)
* Fix RHS GREF canoes refuel interaction

* Removed ace_refuel from requiredAddons

* fix inheritance
2018-09-15 11:53:28 -05:00
PabstMirror
ae6a2709f3
Arsenal - Don't warn when calling removeUnitTrackProjectiles (#6574) 2018-09-14 23:58:28 -05:00
Blutze
3ee94d3aca [Arsenal] Filter firemodes for precision display by showToPlayer (#6572) 2018-09-14 15:01:50 -05:00
mharis001
d6976f63ac Zeus - UI improvements and additional objects setting for Editable Objects module (#6391)
* Add additional objects setting to Editable Objects

* Fix Teleport Players UI height and remove unnecessary strings

* Improve Garrison UI

* Config based combo for Toggle NVG and Toggle Flashlights UI

* Capitalize garrison module names
2018-09-13 08:40:55 -05:00
PabstMirror
429ecb6171
RHS Compats - Update bases classes for RHS 4.6 (#6529)
* RHS Compats - Update bases classes for 4.6

* Update CfgMagazines.hpp

* Update CfgWeapons.hpp
2018-09-13 00:29:30 -05:00
commy2
66da48fcdb
Merge pull request #6402 from mharis001/explosives-timer
Explosives - New Timer UI
2018-09-13 06:39:50 +02:00
PabstMirror
f2a57797da Make sure explosive is still valid when updating timer 2018-09-12 23:07:39 -05:00
Dystopian
0e980907fe Fix some item type magic numbers (#6487)
* Fix item type magic numbers

* Add weapon and magazine macros
2018-09-12 22:29:56 -05:00
Dystopian
364f84d382 Fix RHS static turrets interaction point (#6567) 2018-09-12 16:12:05 -05:00
Josuan Albin
eab84e0d09 Arsenal - Fix sort by value not sorting properly (#6570)
* Fix sort by value not sorting properly

* Change single to double quotes

* Remove uneeded space
2018-09-12 14:59:36 -05:00