VKing
|
069169cc72
|
Changed ACE_time back to time in comments where appropriate
|
2015-10-21 22:52:21 +02:00 |
|
PabstMirror
|
079d88ded7
|
Merge pull request #2509 from acemod/miscFixNilFunctions
Fix some nil functions
|
2015-09-21 20:36:09 -05:00 |
|
PabstMirror
|
79d4eb62be
|
Allow fixing jam when in FFV slot
|
2015-09-20 16:55:33 -05:00 |
|
PabstMirror
|
5f0d73bab6
|
Cleanup more stuff
|
2015-09-18 14:24:20 -05:00 |
|
Glowbal
|
7e5ab07e32
|
Merge pull request #2387 from acemod/FixHCPPE
Fix that PPEffects Throw a error on HC
|
2015-09-15 21:04:37 +02:00 |
|
jokoho48
|
b7e02da1cc
|
remove if (!hasInterface) from PFH
move ! in ()
|
2015-09-11 16:58:26 +02:00 |
|
Michael Braun
|
035b3432c5
|
Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros
Conflicts:
addons/common/XEH_postInit.sqf
|
2015-09-01 08:45:59 +02:00 |
|
commy2
|
fc6f97e09e
|
fix autoriflemen spawning with 0x frag grenade bug
|
2015-08-30 13:30:21 +02:00 |
|
Michael Braun
|
5047d4de1c
|
Switched to ACE_LOG<LEVEL>_# variation
|
2015-08-26 17:39:44 +02:00 |
|
Michael Braun
|
097506076f
|
Fixed format usage in macros requiring ARR_# for it to work
|
2015-08-26 16:48:55 +02:00 |
|
Michael Braun
|
9e10aa86d7
|
Standardize logging format through ACE_LOG macros
|
2015-08-26 15:32:54 +02:00 |
|
PabstMirror
|
b3741f4036
|
Capitalization for macro CBA_fnc_addPerFrameHandler
|
2015-08-04 02:34:38 -05: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 |
|
PabstMirror
|
473ab7d7c0
|
Fix mmg UBC
|
2015-05-31 23:48:20 -05:00 |
|
jonpas
|
d934c25b78
|
Merge branch 'master' into macroSTR
Conflicts:
addons/interact_menu/ACE_Settings.hpp
|
2015-05-30 19:54:32 +02:00 |
|
Josuan Albin
|
7603e71468
|
removed useless entries
|
2015-05-29 22:08:13 +02:00 |
|
Josuan Albin
|
26a9f7f38e
|
navid and SPMG barrel swapping added
- added navid class to barrel swapping config
- added SPMG class to barrel swapping config
|
2015-05-29 15:31:48 +02:00 |
|
jonpas
|
763cb07629
|
Macro STRING to LSTRING
|
2015-05-28 21:59:04 +02:00 |
|
jonpas
|
6f6f2a55f0
|
Stringtable fixes except medical
|
2015-05-27 21:43:30 +02:00 |
|
jonpas
|
6072e14077
|
Changed all strings to macros (except external)
|
2015-05-27 19:04:25 +02:00 |
|
jaynus
|
c924baefd7
|
All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.
|
2015-05-21 09:42:44 -07:00 |
|
Kavinsky
|
8e9b35c757
|
Fixed Capitalized folders on include paths
|
2015-05-20 23:28:10 +02:00 |
|
SAM
|
31adb5a9fc
|
Second batch of settings files
|
2015-05-14 20:59:25 +02:00 |
|
KoffeinFlummi
|
a8c4068b56
|
Remove unnecessary comment
|
2015-05-07 18:51:18 +02:00 |
|
KoffeinFlummi
|
db07de31af
|
Whoops; back to the roots.
|
2015-05-07 18:49:40 +02:00 |
|
KoffeinFlummi
|
27c8255987
|
Convert ACE_bulletMass to grams
|
2015-05-07 18:33:34 +02:00 |
|
Bla1337
|
a7d66b59cf
|
transaltions
|
2015-05-03 14:01:35 +03: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 |
|
Glowbal
|
131468f0d8
|
plurals
|
2015-04-30 22:39:33 +02:00 |
|
Glowbal
|
1ca0d66f30
|
Initial categories
|
2015-04-30 22:02:20 +02:00 |
|
ulteq
|
2c97b20781
|
Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master
Conflicts:
addons/atragmx/stringtable.xml
addons/ballistics/stringtable.xml
addons/medical/stringtable.xml
addons/missileguidance/stringtable.xml
addons/overheating/stringtable.xml
addons/realisticnames/stringtable.xml
addons/vehiclelock/stringtable.xml
|
2015-04-30 13:20:31 +02:00 |
|
Dimaslg
|
f8d5c423ae
|
Merge conflicts resolved
|
2015-04-29 21:15:22 +02:00 |
|
NukeDev
|
d4dc5e6d85
|
Other Fixes 2
|
2015-04-29 17:22:20 +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 |
|
Bla1337
|
cfbf3bd053
|
Localization update
|
2015-04-29 11:20:21 +03:00 |
|
ulteq
|
d0c7a37841
|
Minor stringtable fix
|
2015-04-28 18:31:14 +02:00 |
|
ulteq
|
dc09c554c0
|
Merge branch 'master' of https://github.com/gienkov/ACE3 into gienkov-master
Conflicts:
addons/medical/stringtable.xml
addons/mk6mortar/stringtable.xml
|
2015-04-28 17:44:58 +02:00 |
|
Josuan Albin
|
e8dec708bc
|
Some french entries and a german duplicate
Added some french entries and removed a german duplicate
|
2015-04-27 16:18:28 +02:00 |
|
Grzegorz Sikora
|
a272258500
|
PL translation
|
2015-04-26 22:59:20 +02:00 |
|
KoffeinFlummi
|
b472292b20
|
Remove tabler comments.
sed is awesome.
|
2015-04-26 21:05:41 +02:00 |
|
KoffeinFlummi
|
1bb8628109
|
Merge https://github.com/simon84/ACE3 into german-merge
|
2015-04-26 21:00:22 +02:00 |
|
VyMajoris
|
523cb49ff1
|
Added - Portuguese translation to lots of things.
Also fixed a typo the english key for STR_ACE_microdagr_configure.
|
2015-04-26 03:09:16 -03:00 |
|
Dimaslg
|
274663e1b9
|
Spanish Translation
Minor fixes and spelling mistakes.
|
2015-04-25 18:53:45 +02:00 |
|
Nicolás Badano
|
1bfb13abac
|
Revert "remove author from items inheriting ACE_ItemCore"
|
2015-04-21 19:07:42 -03:00 |
|
bux578
|
3897b73d56
|
remove author from items inheriting ACE_ItemCore
|
2015-04-21 19:16:54 +02:00 |
|
KoffeinFlummi
|
3aafa2082d
|
Merge https://github.com/nomisum/ACE3 into german-merge
Conflicts:
addons/atragmx/stringtable.xml
addons/scopes/stringtable.xml
addons/weather/stringtable.xml
|
2015-04-19 00:39:44 +02:00 |
|
PabstMirror
|
caef5c105f
|
More Privates
|
2015-04-17 22:40:37 -05:00 |
|
nomisum
|
8813315f36
|
added missing translations german
|
2015-04-17 11:40:31 +02:00 |
|
simon84
|
cc75928cc0
|
Merge remote-tracking branch 'acemod/master'
Conflicts:
addons/disarming/stringtable.xml
addons/hearing/stringtable.xml
addons/medical/stringtable.xml
addons/microdagr/stringtable.xml
addons/nametags/stringtable.xml
addons/optionsmenu/stringtable.xml
addons/overheating/stringtable.xml
addons/winddeflection/stringtable.xml
|
2015-04-16 22:47:51 +02:00 |
|