Commit Graph

152 Commits

Author SHA1 Message Date
Magnetar
3b181cb1b0 Merge branch 'master' into BFT 2018-10-04 16:05:31 +02: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
lugubrioushatchling
e1241da4a9 Fixes for portuguese translation of ACE medical (#6222)
* Update stringtable.xml

* Update AUTHORS.txt

* Update stringtable.xml

* Update stringtable.xml
2018-04-02 00:35:27 -05:00
Orbis2358
5bb27a28a7 Korean translations fix (#6151)
* Korean translations fixed

Avulsion: 적출상
Laceration: 열상
Crush: 압궤상
Puncture Wound: 자상

* Update AUTHORS.txt
2018-02-18 02:31:34 +01:00
mharis001
b30e188d1a Change ace_map settings to use CBA init directly (#5984)
* Make default channel setting a list

* Convert more map settings to CBA

* Give BFT settings own category

* Remove '?' from end of setting display names

* Fix mistake of ACE_Settings removal (movedToSQF = 1)

* Move settings to initSettings.sqf
2018-01-28 15:50:28 -06:00
TheMagnetar
4e651ed7b7 Merge branch 'master' into BFT 2018-01-26 20:02:32 +01:00
John Harvey
13be39d0eb Optionals moved into launchable mod folders (#5038)
* Optionals moved into launchable mod folders
when using make.py

* added '@' prefix

* Simplify publish.py
2017-12-31 13:12:42 -06:00
ulteq
2163e712e5 Ballistics - Dispersion overhaul (#5819)
* Ballistics - Dispersion overhaul
* Updated rifle dispersion according to the data from @dagger

* Updated AUTHORS.txt
2017-11-29 13:18:52 -06:00
Tuupertunut
0644ad9ca2 Rearm bugfixing (#5411)
* Added workaround functions for turret magazine ammo.

* Switched to retrieving turrets dynamically instead of looking them up from an array.

* Refactoring only, no functional changes

* Repurposed getNeedRearmMagazines as a general purpose rearm info function + more.

* The function retrieves all non-full magazines. This code was previously repeated in many different functions, but is now centralized in one.
* Empty pylon filling is no longer supported in favor of the upcoming "pylons" ACE-module.

Fixed bugs:

* Rearm was using broken commands "magazineTurretAmmo" and "setMagazineTurretAmmo". They are now replaced with their corresponding workaround functions.
* Pylon rearm was trying to set ammo count on empty pylons.

Note: rearmSuccessLocal is not yet fixed!

* Rearming no longer switches shell types in cannons/mortars.

* Added Tuupertunut to authors.

* Rearming no longer switches shell types. 2nd try.

Last time it was fixed only if the turret is manned. Now it is fixed even when unmanned.

* Updated fnc_rearm to support the earlier repurposing of fnc_getNeedRearmMagazines.

* Small fixes and comments.

* Renamed fnc_getVehicleMagazines to fnc_getTurretConfigMagazines.

The latter describes much better what the function actually does.

* Removed redundant checks.

* Refactoring.

* Fixed spaces in macros.

* Renamed fnc_getAllTurrets to fnc_getAllRearmTurrets
2017-09-29 14:53:25 -05:00
classic
8a0bbf655b Update the Jpn translation (#5536)
* Update the Jpn translation

support to new entry.

* Update the Jpn translation

Fully translated for the maverick

* add credit

because I am translating mod to Japanese ;)
2017-09-20 14:59:46 +02:00
Keithen
7fe932803b Add requireSurrender setting for AI - close #5518 (#5522) 2017-09-19 13:21:30 -05:00
xrufix
31b1050f3b Maverick L (laser guided AGM) (#5364)
* Initial commit

* Initial commit

* Initial Commit

ACE-Coding-Guidelines compatible version of http://steamcommunity.com/sharedfiles/filedetails/?id=943852645

* Changes to realisticnames, readme.md, added to authors.

* Dependency on ace_missileguidance

* readme

* Use ACE-AMG for ammo

* Use macros in all configs

* Use own attackProfile to prevent climbing at start even in low-flight-conditions.

* include HUD from ace_hellfire

* fix missing semicolon

* Add missing defines, makes HUD work for now.

* Readme

* replace tabs with spaces

* replace tabs with spaces 2

* replace tabs with spaces 3

* Use missileguidance's DIR-Profile instead of own. Keep profiles config for name and nameLocked values necessary for HUD

* Use showHud from ace_laser

* Minor Cleanup
2017-09-16 22:25:20 +02:00
BaerMitUmlaut
b7e42cb7a4 New medical box (#5278)
* Replaced medical box

* Added ElTyranos as author

* RVMAT code style

* Added ground contact points, fixed broken face
2017-08-22 12:55:14 -05:00
Wakbub
2c97865e02 Correct typos ("enginer" to "engineer") (#5355)
* Update ACE_Settings.hpp

Correction of typos.

* Update CfgVehicles.hpp

Correction of typos.

* Update stringtable.xml

Correction of typos.

* Update AUTHORS.txt

In accordance with your process of merging pull requests.
2017-07-11 12:50:35 -05:00
Christian Klemm
16439f5640 Add ability to abort module destination (#5284)
* Add the ability to abort a module action via ace_zeus_fnc_getModuleDestination
* Action can be aborted by pressing ESC
* Current position is still passed to the code callback
2017-07-10 12:41:35 +01:00
Phyma
cec82be93b Raise lower carry object (#5234)
* Fix to move items up and down

* Fixed private

* Fixed public bug

* Inserted Pabst solution

* Remove extra space

* Fixed request + added author

* Fixed to correct comment

* Tweeked comment again
2017-06-04 12:46:49 -05:00
SilentSpike
ae69118fba Implement new cook off SFX (#5179)
* Implement new cook off SFX with variants
* Add hybrid V to authors
2017-06-02 22:20:36 +01:00
KoffeinFlummi
9791eb9eed Add AtixNeon to AUTHORS.txt 2017-05-25 12:02:17 +02:00
KoffeinFlummi
5f4a7d7b46 Add Luigium to AUTHORS as requested. 2017-01-03 23:40:28 +01:00
Ozan Eğitmen
fd1888be36 Add 'uniforms' Component (#4435) 2016-10-27 19:34:25 +02:00
Glowbal
04f89cbe3a Add BFT Components 2016-09-03 09:35:37 +02:00
commy2
5047d95086 add some authors 2016-06-26 00:23:43 +02:00
Glowbal
8dc8926960 Merge branch 'master' into fix-c4996
Conflicts:
	extensions/parse_imagepath/ace_parse_imagepath.cpp
2016-06-12 17:30:29 +02:00
PabstMirror
980da16826 FastRope Sounds - Fix Config, Merge PFEH, Add CC Attribution 2016-05-10 10:09:52 -05:00
looter
2f6b932511 Merge branch 'master' into c4996 2016-04-08 07:33:21 -05:00
bux578
ada519a59c sort people 2016-03-29 20:35:34 +02:00
FFAAMOD
67695286c7 Added FFAAMOD to AUTHORS.txt 2016-03-02 20:01:41 +01:00
jonpas
f7d89479f5 Move jonpas to Core Team in AUTHORS.txt and remove typo 2016-02-22 22:08:10 +01:00
Thomas Kooi
8055eae580 Merge pull request #3210 from acemod/taggingX
Tagging X
2016-02-20 17:05:02 +01:00
looterz
dffc087a50 Update AUTHORS.txt 2016-02-17 17:41:17 -06:00
Thomas Kooi
f47b51c0cb Merge pull request #3070 from dixon13/newCivInteraction
Changes to civilian interaction
2016-02-05 09:14:45 +01:00
Nicolás Badano
dadec15948 Merge pull request #2104 from acemod/trenches
Trenches
2016-02-04 23:43:06 -03:00
Joko
a6d84eca8e add GitHawk to AUTHORS 2016-02-04 21:08:34 +01:00
esteldunedain
2d45a28863 Merge branch 'master' into trenches 2016-02-04 17:04:09 -03:00
Thomas Kooi
f26fb9e9da Merge pull request #3107 from jonpas/headless
Add Dynamic AI Group Tranferring to Headless Clients
2016-02-04 20:00:16 +01:00
fr89k
bd9587981d Added email address for fr89k 2016-01-29 13:58:01 +01:00
fr89k
ddd63bf1a8 AUTHORS.txt now in alphabetical order 2016-01-29 13:54:57 +01:00
fr89k
d2296411d8 As bux578 requested: Added myself to AUTHORS.txt
Forgot to change the AUTHORS.txt in the last pull request
2016-01-29 13:45:52 +01:00
esteldunedain
1d886ac624 Merge branch 'master' into trenches
Conflicts:
	AUTHORS.txt
2016-01-23 17:39:54 -03:00
esteldunedain
e113853395 Merge branch 'master' into tagging 2016-01-20 18:51:41 -03:00
jonpas
971d8d1e02 Add @System98 to AUTHORS.txt 2016-01-02 14:35:39 +01:00
dixon13
16fdde3500 Update AUTHORS.txt 2015-12-23 19:18:23 -07:00
kaban
fd06472f4d Russian Translations - Update 2015-12-10 20:32:16 +03:00
voiper
675006a22f Add name to authors.txt 2015-11-29 16:56:48 -08:00
Thomas Kooi
c132ef86cf Merge pull request #2133 from jonpas/dynamicViewDistance
Mk 1 eyeballs Integration
2015-11-28 20:40:29 +01:00
Broström.A | Evul
de90960127 Update AUTHORS.txt 2015-10-29 22:51:06 +01:00
Glowbal
8e4bc264cc Merge branch 'master' into map_gestures
Conflicts:
	AUTHORS.txt
2015-10-18 12:20:54 +02:00
[OMCB]kaban
085b60bddd Added some name to AUTHORS.txt 2015-09-05 05:45:25 +03:00
BaerMitUmlaut
01c37f5bb5 Merge fix 2015-09-02 20:00:17 +02:00
Glowbal
2b3957324c Merge pull request #2262 from jonpas/readmeFix
Updated README.md files
2015-08-29 22:37:40 +02:00