Nicolás Badano
|
d9b6636221
|
Merge pull request #1196 from Winter259/common-cleanup
Cleanup of nearly all common functions
|
2015-05-14 18:31:19 -03:00 |
|
PabstMirror
|
2158f467f4
|
#1171 - Safe get variables if settings not defined
|
2015-05-14 15:29:09 -05:00 |
|
esteldunedain
|
f17c7c12a6
|
Fixed object actions not working
|
2015-05-14 16:56:32 -03:00 |
|
SAM
|
31adb5a9fc
|
Second batch of settings files
|
2015-05-14 20:59:25 +02:00 |
|
esteldunedain
|
4a074d4e31
|
Replace BIS_fnc_sortBy by sort for interact_menu occlusion
|
2015-05-14 10:54:22 -03:00 |
|
esteldunedain
|
5ef29c2354
|
Merge remote-tracking branch 'origin/master' into interactionOclusion
Conflicts:
addons/interact_menu/functions/fnc_keyDown.sqf
|
2015-05-14 10:39:02 -03:00 |
|
PabstMirror
|
58ee797a94
|
Merge branch 'master' into userActionPrototype
|
2015-05-13 00:00:55 -05:00 |
|
PabstMirror
|
1827d8ad95
|
Fix #1024 - Adjust self iMenu for wave height
|
2015-05-12 16:04:42 -05:00 |
|
KoffeinFlummi
|
2bb3a0f139
|
Cleanup #1095
- Fix tabs
- Remove tabler comments
- Restore one removed Russian string
|
2015-05-10 16:19:46 +02:00 |
|
Alessandro Foresi
|
2dd06babec
|
Added: Italian translations completed.
Fixed: BOM markers where missing
|
2015-05-10 11:44:46 +02:00 |
|
Alessandro Foresi
|
6695a8793b
|
Added: Some italian translastions
|
2015-05-09 23:43:03 +02:00 |
|
ViperMaul
|
996c342087
|
Merge pull request #994 from acemod/imenumisclick
don't close menu when no action is selected
|
2015-05-06 13:31:07 -07:00 |
|
Glowbal
|
50cc5db92f
|
fixes #1017
|
2015-05-05 20:05:31 +02:00 |
|
PabstMirror
|
6c45292e89
|
Merge branch 'master' into userActionPrototype
Conflicts:
addons/interact_menu/functions/fnc_renderBaseMenu.sqf
|
2015-05-04 14:23:21 -05:00 |
|
PabstMirror
|
e6889f1634
|
Merge branch 'master' into userActionPrototype
|
2015-05-04 14:21:49 -05:00 |
|
PabstMirror
|
6c5d72640c
|
Caching, Optimzations
|
2015-05-04 14:06:33 -05:00 |
|
ViperMaul
|
032424b23e
|
Merge pull request #1006 from acemod/skipLOSCheckBodyparts
Interact menu: Increase the minimum distance required for LOS checks to 1.5m
|
2015-05-04 10:14:59 -07:00 |
|
esteldunedain
|
d07b69aca4
|
Increase the minimum distance required to perform LOS checks to 1.5m; should avoid LOS checks for medical bodyparts entirely, thus avoiding problems with weaponholders obstructing actions.
|
2015-05-04 13:37:14 -03:00 |
|
PabstMirror
|
bdc967d3a9
|
Extension to parse text for image path
|
2015-05-03 13:44:02 -05:00 |
|
PabstMirror
|
5c556647ab
|
Some Cleanup
|
2015-05-03 02:06:49 -05:00 |
|
PabstMirror
|
5147f9f584
|
Ladder Actions
|
2015-05-03 00:33:20 -05:00 |
|
PabstMirror
|
d4225e03d2
|
Split into functions (for future caching)
|
2015-05-02 23:13:35 -05:00 |
|
KoffeinFlummi
|
298e1d88bd
|
Merge branch 'hu-catchup' of https://github.com/Harakhti/ACE3 into hungarian-merge
Conflicts:
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/laser/stringtable.xml
addons/medical/stringtable.xml
addons/respawn/stringtable.xml
|
2015-05-02 23:17:39 +02:00 |
|
commy2
|
f44aaee7c7
|
also in cursor mode
|
2015-05-02 23:02:40 +02:00 |
|
commy2
|
0fd783082d
|
don't close menu when no action is selected
|
2015-05-02 22:53:23 +02:00 |
|
esteldunedain
|
aad108a6a3
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into interactionOclusion
|
2015-05-02 14:55:35 -03:00 |
|
esteldunedain
|
e6c333bff4
|
Fix oclusion when self-interacting
|
2015-05-02 14:54:57 -03:00 |
|
esteldunedain
|
1735047e3c
|
Make closer action points oclude farther ones. Improves the clutter of the interact menu when interating with a person from the side. Close #738
|
2015-05-02 14:37:58 -03:00 |
|
Harakhti
|
6c2717be7f
|
More more translations
Stope.
|
2015-05-02 18:06:01 +02:00 |
|
ToasterBR
|
021b00c722
|
Translation to Portuguese
Done all remaining portuguese translations, including some minor
corrections
|
2015-05-02 03:38:53 -03:00 |
|
PabstMirror
|
d2fdeb5e96
|
Allow Skipping LOS Check (Because of doors)
|
2015-05-02 00:13:09 -05:00 |
|
esteldunedain
|
fae10aa731
|
Replace dialog by display.
|
2015-05-02 01:33:28 -03:00 |
|
PabstMirror
|
334647fa60
|
Merge branch 'master' into userActionPrototype
|
2015-05-01 22:55:35 -05:00 |
|
KoffeinFlummi
|
f1ba0cff26
|
Merge https://github.com/ProfessorCZ/ACE3 into czech-merge
Conflicts:
AUTHORS.txt
addons/advanced_ballistics/stringtable.xml
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/kestrel4500/stringtable.xml
addons/laserpointer/stringtable.xml
addons/medical/stringtable.xml
addons/respawn/stringtable.xml
|
2015-05-02 00:26:25 +02:00 |
|
KoffeinFlummi
|
debfe990e8
|
Fix duplicates
|
2015-05-02 00:19:10 +02:00 |
|
KoffeinFlummi
|
13b99ed53f
|
Merge https://github.com/adam3adam/ACE3 into czech-merge
Conflicts:
AUTHORS.txt
addons/interact_menu/stringtable.xml
|
2015-05-02 00:17:01 +02:00 |
|
Lukas
|
1d3f5cc312
|
Czceh translation
|
2015-05-02 00:04:50 +02:00 |
|
KoffeinFlummi
|
fb807cbb86
|
Merge branch 'master' into spanish-merge
Conflicts:
addons/interact_menu/stringtable.xml
addons/respawn/stringtable.xml
|
2015-05-01 22:44:10 +02:00 |
|
Dimaslg
|
6f2caec6ec
|
Last touches to Spanish translation
|
2015-05-01 22:42:09 +02:00 |
|
adam3adam
|
f5303d455c
|
Translation of some stuff into czech language
adv. ballistics, atragmx, interaction menu, kestrel4500, laser pointer
and little part of medical
|
2015-05-01 22:23:03 +02:00 |
|
KoffeinFlummi
|
c9ff497c83
|
Merge branch 'master' into polish-merge
Conflicts:
addons/respawn/stringtable.xml
|
2015-05-01 21:13:36 +02:00 |
|
Lubomír Blažek
|
dcb3196e58
|
Czech strings
|
2015-05-01 20:52:41 +02:00 |
|
Grzegorz
|
e36fbe9da7
|
Update stringtable.xml
|
2015-05-01 19:32:43 +02:00 |
|
Grzegorz Sikora
|
4668869959
|
PL translation
|
2015-05-01 19:30:30 +02:00 |
|
ruPaladin
|
2aa788bba2
|
Update stringtable.xml
|
2015-05-01 19:26:23 +03:00 |
|
KoffeinFlummi
|
48e59f0d71
|
Merge branch 'master' of https://github.com/acemod/ACE3
Conflicts:
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
|
2015-05-01 17:46:58 +02:00 |
|
KoffeinFlummi
|
1e786d4a92
|
Merge https://github.com/FreeZbe/ACE3 into french-merge
Conflicts:
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
|
2015-05-01 17:45:00 +02:00 |
|
KoffeinFlummi
|
e46eba673f
|
Merge branch 'master' into german-translation
Conflicts:
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
|
2015-05-01 17:36:40 +02:00 |
|
KoffeinFlummi
|
954e4ef549
|
Merge branch 'master' of https://github.com/acemod/ACE3
Conflicts:
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
|
2015-05-01 17:32:19 +02:00 |
|
KoffeinFlummi
|
e96f23c197
|
Merge branch 'en-to-hu' of https://github.com/Harakhti/ACE3 into hungarian-merge
Conflicts:
addons/atragmx/stringtable.xml
addons/interact_menu/stringtable.xml
addons/laserpointer/stringtable.xml
addons/medical/stringtable.xml
addons/mk6mortar/stringtable.xml
addons/realisticnames/stringtable.xml
addons/respawn/stringtable.xml
|
2015-05-01 17:30:59 +02:00 |
|
Felix Wiegand
|
526b0a2d59
|
Merge pull request #931 from gienkov/master
PL translation
|
2015-05-01 17:15:22 +02:00 |
|
KoffeinFlummi
|
5f60321a69
|
Merge https://github.com/Legolasindar/ACE3 into spanish-merge
Conflicts:
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
addons/mk6mortar/stringtable.xml
|
2015-05-01 17:12:00 +02:00 |
|
FreeZbe
|
acf74dd2ae
|
Update stringtable.xml
|
2015-05-01 14:13:32 +02:00 |
|
bux578
|
2acc10ba70
|
meh
|
2015-05-01 12:19:42 +02:00 |
|
bux578
|
aa2e5077e4
|
missing german translation
|
2015-05-01 12:17:28 +02:00 |
|
commy2
|
b859956604
|
rename category ace <blank> to ace common
|
2015-05-01 10:19:47 +02:00 |
|
esteldunedain
|
324b9510e3
|
Allow positions for actions to be computed dynamically. Also leverage that for the position of the "Weapon" action, instead of hard coding an exception for that.
|
2015-05-01 01:56:39 -03:00 |
|
esteldunedain
|
fc02bb4e06
|
Stylistic changes
|
2015-05-01 00:32:16 -03:00 |
|
esteldunedain
|
aa4a5539d4
|
Merge branch 'master' into interactMoreOptions
Conflicts:
addons/interact_menu/functions/fnc_renderIcon.sqf
|
2015-05-01 00:04:22 -03:00 |
|
KoffeinFlummi
|
984a1fe337
|
Rename breakLine to break_line
|
2015-05-01 02:14:23 +02:00 |
|
Grzegorz
|
1e0eaa1971
|
Update stringtable.xml
|
2015-04-30 22:55:43 +02:00 |
|
Grzegorz Sikora
|
03973f3dcf
|
PL translation
|
2015-04-30 22:54:15 +02:00 |
|
PabstMirror
|
090062153c
|
Merge branch 'master' into interactMoreOptions
Conflicts:
addons/interact_menu/config.cpp
|
2015-04-30 15:36:00 -05:00 |
|
PabstMirror
|
ba18f8b430
|
Handle Scaling
|
2015-04-30 14:07:19 -05:00 |
|
commy2
|
8c8e310d66
|
handle cursor mode
|
2015-04-30 21:00:30 +02:00 |
|
commy2
|
5ec8b6d36c
|
Merge branch 'master' of https://github.com/acemod/ACE3 into menuonclick
|
2015-04-30 20:01:58 +02:00 |
|
Harakhti
|
4e165e2572
|
Update Hungarian translations
Let us match the current revision. At the time of making, the Ballistics
XML was broken.
|
2015-04-30 13:25:25 +02:00 |
|
Bla1337
|
5d1478b733
|
interact and medical system localization upd
|
2015-04-30 14:01:22 +03:00 |
|
PabstMirror
|
11aafe013b
|
Localization
|
2015-04-29 23:53:00 -05:00 |
|
PabstMirror
|
9aa2e3130a
|
Options for Shadow/Outline and Text Size
|
2015-04-29 23:37:52 -05:00 |
|
PabstMirror
|
e40a2a524d
|
Merge branch 'master' into interactMoreOptions
|
2015-04-29 22:57:35 -05:00 |
|
ulteq
|
4e171c2988
|
Merge pull request #916 from FreeZbe/master
French: update and fix stringtable
|
2015-04-29 16:46:49 +02:00 |
|
FreeZbe
|
5ec6bea71d
|
French: update stringtable
|
2015-04-29 16:19:23 +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 |
|
PabstMirror
|
47d4446520
|
Don't check intersection if distance < 1m
Related to #869
|
2015-04-29 02:34:47 -05:00 |
|
PabstMirror
|
d7d43ce3b1
|
#828 - Private Variables for Interact Menu
|
2015-04-29 01:26:13 -05:00 |
|
PabstMirror
|
1512e4c367
|
isClientSettable spelling
|
2015-04-28 14:09:26 -05:00 |
|
PabstMirror
|
9e8b13cd2b
|
Merge branch 'master' into altSelfInteract
Conflicts:
addons/interact_menu/functions/fnc_renderIcon.sqf
addons/interact_menu/functions/fnc_renderSelector.sqf
addons/interact_menu/stringtable.xml
|
2015-04-28 14:02:03 -05:00 |
|
ulteq
|
2a759aba70
|
Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master
Conflicts:
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
|
2015-04-28 18:55:23 +02:00 |
|
NukeDev
|
db82df6214
|
Italian's Translation's Changes v2
|
2015-04-28 18:10:35 +02:00 |
|
Ivan Navarro Cabello
|
8a55c69cd7
|
added spanish translation
added spanish translation
|
2015-04-28 17:03:49 +02:00 |
|
simon84
|
8ac6f61fcf
|
added some translations
added some translations
|
2015-04-28 00:36:37 +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 |
|
commy2
|
5320f4c6b7
|
fix broken parse text cache in some cases
|
2015-04-26 19:33:08 +02:00 |
|
commy2
|
f96deadd20
|
imenu: remove shadow, fix caching
|
2015-04-26 12:41:15 +02:00 |
|
PabstMirror
|
898d6c74a8
|
#854 - No canInteractWith check for Ace_MainAction
Was preventing subactions from showing.
|
2015-04-25 16:02:59 -05:00 |
|
ulteq
|
ca6a559557
|
Fixed a typo
|
2015-04-25 21:18:09 +02:00 |
|
Felix Wiegand
|
dc7c7fcaf5
|
Merge pull request #811 from gienkov/master
PL translation
|
2015-04-25 20:46:47 +02:00 |
|
esteldunedain
|
fc49814689
|
Use FUNC(ctrlSetParsedTextCached) for the selector too. Eliminates glitches
|
2015-04-25 10:52:52 -03:00 |
|
Grzegorz
|
a7e1d1c1c8
|
Update stringtable.xml
|
2015-04-25 14:36:53 +02:00 |
|
commy2
|
b7763331d6
|
the index
|
2015-04-25 14:34:09 +02:00 |
|
commy2
|
73b17efa2f
|
cache ctrlSetStructedText parseText
|
2015-04-25 13:28:21 +02:00 |
|
commy2
|
73f387d3e3
|
outline interaction menu text
|
2015-04-25 11:55:39 +02:00 |
|
commy2
|
664d08d4aa
|
add option to only use action when clicking
|
2015-04-25 08:23:54 +02:00 |
|
esteldunedain
|
c8563ce484
|
Add LOS check for actions points. Close #785
|
2015-04-24 00:57:22 -03:00 |
|
PabstMirror
|
55732d4262
|
Text Shadow should have been black.
|
2015-04-23 13:33:38 -05:00 |
|
Grzegorz Sikora
|
1063d4bb2c
|
PL translation
|
2015-04-22 13:17:43 +02:00 |
|
PabstMirror
|
96be881ea9
|
User changeable text/shadow colors for interaction
|
2015-04-20 18:28:01 -05:00 |
|
commy2
|
afc8abce85
|
hide open bag option when it's not selected via scroll wheel
|
2015-04-20 22:00:13 +02:00 |
|