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
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
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
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
commy2
ed72697141
Merge pull request #728 from acemod/error
...
Show error message and quit mission if a dll isn't present
2015-04-20 19:41:38 +02:00
esteldunedain
9295393dd6
Allow cursor for interactions
2015-04-20 13:54:51 -03:00
commy2
ea368511b7
ace extensions class for modularity
2015-04-20 18:48:58 +02:00
esteldunedain
f928f37e26
Eliminate interact_menu fps drops due to high nearby object counts.
...
Instead of reanalizing every frame which actions points should be rendered based on distance, that job is now done only 5 times per second.
The rest of the frames the action points from the last frame are rerendered..
Close #434
2015-04-20 01:16:51 -03:00
KoffeinFlummi
592e0d2dd3
Merge https://github.com/ruPaladin/ACE3 into russian-merge
...
Conflicts:
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
2015-04-19 00:51:09 +02:00
KoffeinFlummi
8015aca0c3
Merge branch 'master' of https://github.com/acemod/ACE3
2015-04-19 00:40:18 +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
esteldunedain
8b389949bc
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-18 18:42:11 -03:00
esteldunedain
bce0d84989
Fix interact menu object ordering
2015-04-18 18:41:36 -03:00
