commy2
|
3fdc0dd521
|
Merge pull request #3955 from acemod/add_name
add 'name' to components
|
2016-06-20 19:25:58 +02:00 |
|
BaerMitUmlaut
|
88b58216ee
|
Added beautified component names
|
2016-06-20 11:44:36 +02:00 |
|
commy2
|
c481ddedaf
|
add 'name' to components
|
2016-06-19 09:38:39 +02:00 |
|
Josuan Albin
|
7c9dcf6bdb
|
Merge branch 'pr/3480'
Conflicts:
addons/advanced_ballistics/stringtable.xml
addons/cargo/stringtable.xml
addons/flashlights/stringtable.xml
addons/hearing/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/main/stringtable.xml
addons/map/stringtable.xml
|
2016-06-18 16:26:46 +02:00 |
|
jonpas
|
03e923aa68
|
Cleanup Function Headers titles
|
2016-06-18 11:50:41 +02:00 |
|
jonpas
|
8ff4a2ecaf
|
Add size parameter to displayTextPicture, Improve parameter checking in displayText functions, Cleanup magazine repack (privates, deprecated macros, style)
|
2016-06-04 20:40:55 +02:00 |
|
jonpas
|
95573ee711
|
Stringtable URL (#3855)
* Move url into stringtable to display it properly, Add some missing author and url entries
* Fix main
* Remove duplicate author
|
2016-06-01 23:45:51 +02:00 |
|
jonpas
|
1354826d56
|
Put semi-colon to the correct place
|
2016-06-01 14:11:32 +02:00 |
|
jonpas
|
1331265e65
|
Move url into a macro
|
2016-06-01 13:49:10 +02:00 |
|
jonpas
|
6730d016c2
|
Convert CfgPatches to new Eden format and CBA 2.4.1 compatibility
|
2016-06-01 13:27:02 +02:00 |
|
jonpas
|
7a307393a4
|
Merge branch 'master' into useQuotedPathMacros
|
2016-05-30 21:14:17 +02:00 |
|
Ozan Eğitmen
|
b8abec0c61
|
Fix Capitalization of ACE Settings classes. (#3627)
|
2016-05-07 22:14:56 +02:00 |
|
jonpas
|
85b4366368
|
Use new QPATHTOF and QPATHTOEF macros
|
2016-04-08 20:34:50 +02:00 |
|
Alessandro Foresi
|
e97c7c0f65
|
Translation: IT completed (with BOM)
|
2016-03-27 21:22:15 +02:00 |
|
NorXAengell
|
772c4cc100
|
Another batch of translations and corrections (Fr)
|
2016-03-01 02:27:19 +01:00 |
|
bux578
|
aa8d3a3fd0
|
Merge pull request #3221 from BaerMitUmlaut/unified-ellipsis
Unified ellipsis
|
2016-02-23 08:27:28 +01:00 |
|
BaerMitUmlaut
|
74ea79e2cc
|
Unified ellipsis
|
2016-02-22 23:51:47 +01:00 |
|
commy2
|
46a239f9f6
|
precompile on game start
|
2016-02-22 15:20:36 +01:00 |
|
ChairborneIT
|
0021bc08df
|
Added translation for most Italian stringtable entries
|
2016-02-20 21:39:05 +01:00 |
|
PabstMirror
|
ed653456e5
|
Merge pull request #3338 from acemod/translations156merge
Fix Merge Conflicts on More Italian Translations
|
2016-02-19 15:09:40 -06:00 |
|
PabstMirror
|
dccc1d33fd
|
Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge
|
2016-02-17 12:30:03 -06:00 |
|
licht-im-Norden87
|
a725553a95
|
commy2
|
2016-02-10 17:11:24 +01:00 |
|
licht-im-Norden87
|
ed1047e199
|
magazine repack
|
2016-02-10 16:26:03 +01:00 |
|
ProfessorCZ
|
61611d0ec7
|
Czech Translation - Update
Update
|
2016-02-03 18:31:31 +01:00 |
|
PabstMirror
|
46d6e92bca
|
Add quick debug defines to all script_components
|
2016-01-28 23:26:02 -06:00 |
|
Alessandro Foresi
|
c16d97cad0
|
Merge branch 'master' into translation/15bn/alef
|
2016-01-03 12:23:27 +01:00 |
|
commy2
|
a8228f60c2
|
fix configFile capitalization
|
2015-11-30 17:23:02 +01:00 |
|
commy2
|
34d351c652
|
fix exitWith capitalization
|
2015-11-30 17:14:05 +01:00 |
|
VKing
|
069169cc72
|
Changed ACE_time back to time in comments where appropriate
|
2015-10-21 22:52:21 +02:00 |
|
Alessandro Foresi
|
6cb902a7ab
|
Changed: IT riempi instead of ricarica
|
2015-09-12 22:00:41 +02:00 |
|
Glowbal
|
f0792233ae
|
Merge pull request #2173 from jokoho48/codeCleanupMagazineRepack
Code Cleanup Magazine Repack Module
|
2015-08-21 14:09:55 +02:00 |
|
jonpas
|
de033f0ff2
|
README.md files added to all modules
|
2015-08-19 04:18:33 +02:00 |
|
jokoho48
|
4478be096e
|
Code Cleanup Magazine Repack Module.
|
2015-08-16 00:30:24 +02:00 |
|
jonpas
|
1eeca28a3d
|
Enabled DAGR, Kestrel4500, Laser switching, Mag Repack, Markers, MicroDAGR, NVG Adjusting and Check Ammo while Sitting
|
2015-06-13 22:08:13 +02:00 |
|
jonpas
|
332afb2174
|
Allow certain self-interactions while sitting
|
2015-06-09 16:17:05 +02:00 |
|
jonpas
|
541f1010a7
|
Merge branch 'master' into macroSTR
Conflicts:
addons/attach/functions/fnc_attach.sqf
addons/captives/functions/fnc_moduleSurrender.sqf
addons/common/CfgVehicles.hpp
addons/explosives/CfgModule.hpp
addons/hearing/CfgVehicles.hpp
addons/interaction/CfgVehicles.hpp
addons/map/CfgVehicles.hpp
addons/microdagr/CfgVehicles.hpp
addons/mk6mortar/CfgVehicles.hpp
addons/nametags/CfgVehicles.hpp
addons/nightvision/functions/fnc_changeNVGBrightness.sqf
addons/respawn/CfgVehicles.hpp
addons/switchunits/CfgVehicles.hpp
addons/vehiclelock/CfgVehicles.hpp
addons/winddeflection/stringtable.xml
|
2015-06-02 22:14:32 +02:00 |
|
jonpas
|
763cb07629
|
Macro STRING to LSTRING
|
2015-05-28 21:59:04 +02:00 |
|
jonpas
|
6072e14077
|
Changed all strings to macros (except external)
|
2015-05-27 19:04:25 +02:00 |
|
Macusercom
|
7eeddfbd65
|
German translations
Added a lot of German translations and fixed even more typos.
|
2015-05-26 17:04:53 +02:00 |
|
jaynus
|
c924baefd7
|
All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.
|
2015-05-21 09:42:44 -07:00 |
|
SAM
|
31adb5a9fc
|
Second batch of settings files
|
2015-05-14 20:59:25 +02:00 |
|
PabstMirror
|
245a6da6f6
|
Merge pull request #1027 from acemod/sortForMagRepack
Sort for mag repack
|
2015-05-12 21:56:12 -05:00 |
|
Alessandro Foresi
|
643df71932
|
Added: Italian translation from Blackedsoul p#20
|
2015-05-10 11:05:16 +02:00 |
|
Alessandro Foresi
|
7e7c3ed053
|
Added: More italian translations
|
2015-05-10 00:04:42 +02:00 |
|
PabstMirror
|
5f43cffecd
|
Sort for mag repack
|
2015-05-05 20:35:08 -05:00 |
|
KoffeinFlummi
|
761e23001f
|
Merge https://github.com/Dimaslg/ACE3 into spanish-merge
Conflicts:
addons/medical/stringtable.xml
addons/missileguidance/stringtable.xml
addons/optionsmenu/stringtable.xml
|
2015-05-01 16:51:20 +02:00 |
|
Dimaslg
|
f8d5c423ae
|
Merge conflicts resolved
|
2015-04-29 21:15:22 +02:00 |
|
KoffeinFlummi
|
a1e709047e
|
Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge
Conflicts:
AUTHORS.txt
addons/aircraft/stringtable.xml
addons/attach/stringtable.xml
addons/captives/stringtable.xml
addons/common/stringtable.xml
addons/disposable/stringtable.xml
addons/dragging/stringtable.xml
addons/explosives/stringtable.xml
addons/fcs/stringtable.xml
addons/frag/stringtable.xml
addons/grenades/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/kestrel/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/laserpointer/stringtable.xml
addons/logistics_uavbattery/stringtable.xml
addons/logistics_wirecutter/stringtable.xml
addons/magazinerepack/stringtable.xml
addons/maptools/stringtable.xml
addons/markers/stringtable.xml
addons/medical/stringtable.xml
addons/microdagr/stringtable.xml
addons/movement/stringtable.xml
addons/nametags/stringtable.xml
addons/nightvision/stringtable.xml
addons/optionsmenu/stringtable.xml
addons/overheating/stringtable.xml
addons/parachute/stringtable.xml
addons/realisticnames/stringtable.xml
addons/reload/stringtable.xml
addons/reloadlaunchers/stringtable.xml
addons/respawn/stringtable.xml
addons/safemode/stringtable.xml
addons/switchunits/stringtable.xml
addons/vehiclelock/stringtable.xml
addons/weaponselect/stringtable.xml
addons/wep_javelin/stringtable.xml
addons/winddeflection/stringtable.xml
|
2015-04-29 12:52:55 +02:00 |
|
KoffeinFlummi
|
b472292b20
|
Remove tabler comments.
sed is awesome.
|
2015-04-26 21:05:41 +02:00 |
|
Dimaslg
|
274663e1b9
|
Spanish Translation
Minor fixes and spelling mistakes.
|
2015-04-25 18:53:45 +02:00 |
|