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 |
|
ruPaladin
|
d8eb564c65
|
Update stringtable.xml
|
2015-04-15 19:52:29 +03:00 |
|
KoffeinFlummi
|
8b915380b7
|
Merge branch 'hungarian-merge'
|
2015-04-15 13:55:02 +02:00 |
|
KoffeinFlummi
|
2ffbccbf20
|
Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge
|
2015-04-15 12:59:56 +02:00 |
|
esteldunedain
|
495c822061
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
|
2015-04-14 19:10:31 -03:00 |
|
esteldunedain
|
6f4bb48489
|
Merge branch 'master' into linearMenuExperiment
Conflicts:
addons/attach/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/magazinerepack/stringtable.xml
addons/overheating/stringtable.xml
extensions/CMakeLists.txt
|
2015-04-14 19:09:57 -03:00 |
|
KoffeinFlummi
|
ebcdafe610
|
Fix spelling of "isClientSetable"
|
2015-04-14 21:43:19 +02:00 |
|
KoffeinFlummi
|
b563bf8a8e
|
Merge branch 'Update-Stringtable-Common' of https://github.com/licht-im-Norden87/ACE3 into german-merge
|
2015-04-14 15:04:42 +02:00 |
|
KoffeinFlummi
|
63fe4118d4
|
Merge https://github.com/FreeZbe/ACE3 into french-merge
|
2015-04-14 14:48:13 +02:00 |
|
Harakhti
|
8bfd915ec4
|
Translation: N to R
This was a lot more fun than the previous two were. 12 folders left...
|
2015-04-13 23:45:44 +02:00 |
|
ulteq
|
2332f19274
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics
Conflicts:
addons/ballistics/stringtable.xml
addons/magazines/CfgAmmo.hpp
addons/magazines/CfgMagazines.hpp
addons/magazines/CfgVehicles.hpp
addons/magazines/CfgWeapons.hpp
addons/magazines/newclasses.txt
|
2015-04-13 21:35:53 +02:00 |
|
Kllrt
|
1c611ba2db
|
Added another new CZ strings
|
2015-04-13 21:15:04 +02:00 |
|
Grzegorz Sikora
|
ac886828b0
|
Fixes
|
2015-04-13 18:02:48 +02:00 |
|
KoffeinFlummi
|
f6c7d444e1
|
Merge https://github.com/Anthariel/ACE3 into french-merge
|
2015-04-13 13:31:48 +02:00 |
|
KoffeinFlummi
|
118b5509ea
|
Merge https://github.com/gienkov/ACE3 into polish-merge
|
2015-04-13 13:00:59 +02:00 |
|
Anthariel
|
c2253cf199
|
Update stringtable.xml
|
2015-04-13 01:30:16 +02:00 |
|
simon84
|
51bc7208bc
|
German translation
Some german translations and corrections
|
2015-04-12 20:52:15 +02:00 |
|
KoffeinFlummi
|
614afa8537
|
Merge https://github.com/Kllrt/ACE3 into czech-merge
Conflicts:
addons/attach/stringtable.xml
addons/captives/stringtable.xml
addons/common/stringtable.xml
addons/dragging/stringtable.xml
addons/explosives/stringtable.xml
addons/goggles/stringtable.xml
addons/grenades/stringtable.xml
addons/hearing/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/medical/stringtable.xml
addons/microdagr/stringtable.xml
addons/nametags/stringtable.xml
addons/optionsmenu/stringtable.xml
addons/overheating/stringtable.xml
addons/realisticnames/stringtable.xml
addons/reload/stringtable.xml
addons/reloadlaunchers/stringtable.xml
addons/weaponselect/stringtable.xml
addons/wep_javelin/stringtable.xml
addons/winddeflection/stringtable.xml
|
2015-04-12 14:27:59 +02:00 |
|
FreeZbe
|
45ff6c7ce9
|
French: (Nearly) Complete French translations
Some entries (3 or 4) are still missing.
I dont understand what you mean / what the input is related to.
|
2015-04-12 14:15:45 +02:00 |
|
licht-im-Norden87
|
400b8f4270
|
Update stringtable.xml
|
2015-04-12 14:14:48 +02:00 |
|
esteldunedain
|
0565eb6c74
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into linearMenuExperiment
Conflicts:
addons/laser_selfdesignate/stringtable.xml
|
2015-04-12 01:26:55 -03:00 |
|
esteldunedain
|
7b797d906f
|
Merge branch 'master' into linearMenuExperiment
Conflicts:
addons/interact_menu/functions/fnc_renderIcon.sqf
addons/overheating/stringtable.xml
|
2015-04-12 00:19:33 -03:00 |
|
KoffeinFlummi
|
59952441d8
|
Merge branch 'patch-2' of https://github.com/licht-im-Norden87/ACE3 into german-merge
|
2015-04-12 06:22:17 +02:00 |
|
KoffeinFlummi
|
c6efd4e546
|
Merge https://github.com/EpMAK/ACE3 into russian-merge
|
2015-04-12 05:39:46 +02:00 |
|
licht-im-Norden87
|
a30eabfb1d
|
Update stringtable.xml
|
2015-04-12 03:30:11 +02:00 |
|
esteldunedain
|
488000bdf3
|
Rename "Check Temperature" to "Check Weapon Temperature" and move it inside the equipment submenu. Close #494
|
2015-04-11 19:34:29 -03:00 |
|
EpMAK
|
21abff3713
|
Revert "Revert "Russian Translation""
This reverts commit ea04f4ab3e.
|
2015-04-11 21:33:34 +03:00 |
|
EpMAK
|
ea04f4ab3e
|
Revert "Russian Translation"
This reverts commit 17a552bb80.
|
2015-04-11 21:33:07 +03:00 |
|
Kllrt
|
38adfbcb70
|
Added missing CZ strings and made little revision
|
2015-04-11 16:33:00 +02:00 |
|
esteldunedain
|
d6e70cfe6b
|
Merge branch 'patch-3' of https://github.com/Legolasindar/ACE3 into Legolasindar-patch-3
Conflicts:
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/frag/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/logistics_wirecutter/stringtable.xml
addons/medical/stringtable.xml
|
2015-04-10 16:20:18 -03:00 |
|
EpMAK
|
17a552bb80
|
Russian Translation
Russian translation of stringtables: new lines + old lines fixed a bit,
realistic names for armory are not yet filled.
|
2015-04-10 19:55:57 +03:00 |
|
EpMAK
|
68d08b8c7b
|
Revert "Translation"
This reverts commit fab5605ad5.
|
2015-04-10 19:46:18 +03:00 |
|
commy2
|
5ff1d9863d
|
remove +2 offset for check temperature, also fix the shade of grey, #431
|
2015-04-10 17:48:21 +02:00 |
|
commy2
|
fc98e78a53
|
hide check temperature action when empty weapon is selected, #431
|
2015-04-10 17:36:58 +02:00 |
|
EpMAK
|
fab5605ad5
|
Translation
Russian translation of the texts
|
2015-04-10 17:51:48 +03:00 |
|
ulteq
|
ad8e6450eb
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics
|
2015-04-10 15:44:33 +02:00 |
|
Legolasindar
|
470a12ed46
|
Update stringtable.xml
added spanish translation
|
2015-04-10 13:19:26 +02:00 |
|
Anthariel
|
fb8c49135e
|
Update stringtable.xml
Added: French Translation (100%)
|
2015-04-10 05:43:42 +02:00 |
|
Grzegorz
|
03faa32cef
|
overheating PL translation
|
2015-04-10 02:07:19 +02:00 |
|
licht-im-Norden87
|
fb5189be9a
|
Overheating
|
2015-04-10 00:38:51 +02:00 |
|
commy2
|
5ea35a01bb
|
sorting out required addons for modularity
|
2015-04-09 13:23:29 +02:00 |
|
ulteq
|
b5b962bd4a
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into abIntegration
|
2015-04-07 20:59:37 +02:00 |
|
jaynus
|
1bb6be5654
|
Cleaning up of all tabs in source code files.
|
2015-04-06 09:22:43 -07:00 |
|
esteldunedain
|
038c871356
|
Make overheating use bullet mass in grains introduced by ab
|
2015-04-05 20:11:42 -03:00 |
|
esteldunedain
|
a658cafb4e
|
Remove line breaks from actions
|
2015-04-04 01:45:03 -03:00 |
|
Nicolás Badano
|
8b3648cf8d
|
Configure exceptions for self actions inside vehicles
|
2015-03-24 15:43:49 -03:00 |
|
Nicolás Badano
|
5e79970740
|
Switching nicknames
|
2015-03-24 01:18:00 -03:00 |
|
Nicolás Badano
|
a823fb2dca
|
Tweaks on action names to:
- Remove >> for submenus
- Split long action names in two lines
|
2015-03-24 00:16:32 -03:00 |
|
PabstMirror
|
7e383dc10e
|
#198 canInteractWith EGVAR -> EFUNC
|
2015-03-20 17:55:39 -05:00 |
|
commy2
|
b5f307919e
|
replace canInteract with canInteractWith
|
2015-03-15 13:00:10 +01:00 |
|
PabstMirror
|
bed312dcee
|
Use MACRO_ADDITEM from main instead of redefining
|
2015-03-11 17:36:40 -05:00 |
|
Glowbal
|
f08f8beeff
|
Merge branch 'master' into Additional_UI_Client_settings
Conflicts:
addons/reload/CfgEventHandlers.hpp
addons/reload/functions/fnc_checkAmmo.sqf
|
2015-03-08 17:03:25 +01:00 |
|
Glowbal
|
2250255d65
|
Clientside display text option for weapon jamming
|
2015-03-08 16:57:06 +01:00 |
|
PabstMirror
|
4018742f26
|
Return False on keyUp Code
|
2015-03-05 02:51:24 -06:00 |
|
PabstMirror
|
0919e59719
|
Key Bind Redo (except vector)
|
2015-03-05 01:32:26 -06:00 |
|
Nicolás Badano
|
80778cf8db
|
overheating: updated headers
|
2015-02-08 19:54:12 -03:00 |
|
Glowbal
|
0419b7cbe5
|
Formatting
|
2015-02-01 11:17:15 +01:00 |
|
Glowbal
|
3f0b6650e0
|
Added weapon resting & weapon jam sounds
|
2015-02-01 11:11:51 +01:00 |
|
PabstMirror
|
9631154926
|
Set ADDON variable in XEH_preInit
|
2015-01-29 01:38:46 -06:00 |
|
PabstMirror
|
bf791e32c4
|
Merge pull request #93 from KoffeinFlummi/progresBarNew
#87 - New Progress Bar
|
2015-01-27 19:28:51 -06:00 |
|
KoffeinFlummi
|
c407553d49
|
Add remaining READMEs, add helper script
|
2015-01-26 14:34:48 +01:00 |
|
PabstMirror
|
5e932f8c71
|
Replace calls to progressBar
Mag repack
Defuse
Swap Barrel
|
2015-01-26 00:24:33 -06:00 |
|
Nicolás Badano
|
7895173407
|
overheating: cba keybinds
|
2015-01-18 17:08:56 -03:00 |
|
Nicolás Badano
|
a7e016fa8f
|
overheating: change addPerFrameHandler to waitAndExecute
|
2015-01-17 03:13:05 -03:00 |
|
Nicolás Badano
|
886ffacb35
|
overheating: replace last spawn by a PFH
|
2015-01-15 23:36:58 -03:00 |
|
Nicolás Badano
|
c8811552c8
|
overheating: add function headers
|
2015-01-15 23:36:31 -03:00 |
|
Nicolás Badano
|
9bd5758e40
|
overheating: replace a spawn by a PFH
|
2015-01-15 22:00:01 -03:00 |
|
Nicolás Badano
|
9408363706
|
Fix interaction and overheating headers
|
2015-01-14 01:14:47 -03:00 |
|
Nicolás Badano
|
d0f56f44ab
|
overheating: final fixes
|
2015-01-13 22:26:55 -03:00 |
|
Nicolás Badano
|
a97b767283
|
overheating: ironing out bugs
|
2015-01-13 21:07:32 -03:00 |
|
Nicolás Badano
|
2a2eb38de7
|
overheating: hard code path to parent script_components
|
2015-01-13 00:37:53 -03:00 |
|
Nicolás Badano
|
a53a265117
|
overheating: Replace calls to core for calls to common
|
2015-01-13 00:30:39 -03:00 |
|
Nicolás Badano
|
1db298722b
|
CBAfy AGM_Overheating
|
2015-01-13 00:23:14 -03:00 |
|
Nicolás Badano
|
c0df8b7f54
|
Pre CBA AGM_Overheating
|
2015-01-12 23:43:38 -03:00 |
|