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
FreeZbe
f55bd5a629
French: updates / fixes stringtable
2015-04-18 18:49:46 +02:00
ruPaladin
a6e0cac734
interact_menu (fixes to prevent text overlapping)
2015-04-17 16:02:46 +03:00
nomisum
8813315f36
added missing translations german
2015-04-17 11:40:31 +02:00
esteldunedain
bdd3422150
Allow to dynamically modify actions at runtime. An optional code entry called modifierFunction can be added. That code is called before evaluating the action, allowing to dynamically change the actions name, icon, etc
2015-04-16 23:53:54 -03:00
Coren4
4ff68eabd4
Update stringtable.xml
2015-04-16 14:59:19 +02:00
Tachii
dd09cc4d06
Update fnc_createAction.sqf
...
typo
2015-04-16 00:57:15 +03:00
KoffeinFlummi
1b67b2df26
Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge
...
Conflicts:
addons/disposable/stringtable.xml
addons/explosives/stringtable.xml
addons/fcs/stringtable.xml
addons/frag/stringtable.xml
addons/hearing/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/javelin/stringtable.xml
addons/kestrel4500/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/laserpointer/stringtable.xml
addons/magazinerepack/stringtable.xml
addons/maptools/stringtable.xml
addons/markers/stringtable.xml
addons/microdagr/stringtable.xml
addons/movement/stringtable.xml
2015-04-15 22:20:47 +02:00
FreeZbe
df61f5c995
French : update stringtable
2015-04-15 21:15:57 +02:00
ruPaladin
64504a9515
addons/interact_menu translation to Russian
2015-04-15 18:27:28 +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
Marco
544894a05e
Update stringtable.xml
...
Italian
2015-04-15 10:59:44 +02:00
esteldunedain
25e8e93fd0
Add back stringtables for the list menu
2015-04-15 01:32:42 -03:00
esteldunedain
5faf4b7dfa
Remove comment
2015-04-15 01:27:29 -03:00
esteldunedain
a9f44530c9
Move the function that prevents firing while the interact_menu is open to the interact_menu pbo
2015-04-15 01:20:20 -03:00
esteldunedain
7ad9238bbf
Fixes
2015-04-14 23:32:03 -03:00
esteldunedain
c397246534
Fix the fov test. Issue not fixed
2015-04-14 23:22:08 -03:00
esteldunedain
53ce7d0be4
Increase the tolerance to 2m
2015-04-14 23:12:48 -03:00
esteldunedain
7a606a2352
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-14 22:54:10 -03:00
esteldunedain
ee34078960
Add early visibility check to interact menu
2015-04-14 22:53:10 -03:00
jaynus
b307b4bc4b
Fixed: Flummi missed 2 isClientSettable renames.
2015-04-14 18:38:52 -07:00
jaynus
b39209cc28
BAD @esteldunedain! BAD DOGGY!
2015-04-14 17:09:13 -07:00
Nicolás Badano
10b1587453
Merge pull request #592 from gienkov/master
...
PL translation
2015-04-14 20:36:25 -03:00
esteldunedain
ee04ea2f41
Allow actions on coordinates instead of selections
2015-04-14 20:21:11 -03:00
Grzegorz Sikora
3543b9c806
PL Translation
...
Some french, german and russian entries were listed twice, had to remove
one of two here and there so this list is for revision by different
translators
2015-04-15 00:43:42 +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
63fe4118d4
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
Harakhti
3c3f6ba4c3
Translation: A to I
...
Some parts filled out, other parts corrected or stylized.
2015-04-13 19:28:58 +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
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
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
630a2a0f7a
Make the list menu optional via a client setting
2015-04-12 01:15:38 -03:00
esteldunedain
01bc6b233a
Merge branch 'breakLineExtension' into linearMenuExperiment
...
Conflicts:
addons/interact_menu/functions/fnc_renderIcon.sqf
2015-04-12 00:21:05 -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
esteldunedain
df17df61f9
Improve the way lines are split
2015-04-11 23:39:06 -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
362753209e
Merge branch 'master' of https://github.com/acemod/ACE3
2015-04-12 05:40:24 +02:00
KoffeinFlummi
c6efd4e546
Merge https://github.com/EpMAK/ACE3 into russian-merge
2015-04-12 05:39:46 +02:00
PabstMirror
350a79c8a4
#498 - Use cursor mode when scoped
2015-04-11 19:44:42 -05: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
56681e632d
Merge branch 'master' of https://github.com/acemod/ACE3
2015-04-11 16:36:31 +02:00
Kllrt
38adfbcb70
Added missing CZ strings and made little revision
2015-04-11 16:33:00 +02:00
esteldunedain
b8e0388581
Fix nearestObjects with getPos choking over seawater. Fix #465
2015-04-11 11:12:40 -03:00
PabstMirror
b5e5359795
CursorCentered - Localizations
2015-04-11 00:35:18 -05: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
EpMAK
fab5605ad5
Translation
...
Russian translation of the texts
2015-04-10 17:51:48 +03:00
FreeZbe
8fc73af1c4
Translation update
...
Addition of french translation
2015-04-10 16:26:09 +02:00
Jo David
33a14076fc
Merge branch 'master' of https://github.com/acemod/ACE3 into translations
...
Conflicts:
addons/captives/stringtable.xml
addons/medical/stringtable.xml
2015-04-10 09:01:24 +02:00
Anthariel
81122e0839
Update stringtable.xml
...
Added: French Translation (100%)
2015-04-10 06:30:49 +02:00
VyMajoris
c260ff89ba
Added - Portuguese Translation to Interact_menu
2015-04-09 23:00:13 -03:00
Grzegorz
e907553abc
interact_menu PL translation
2015-04-10 03:28:14 +02:00
Legolasindar
b8b151e62e
Update stringtable.xml
...
added spanish terms
2015-04-10 01:20:39 +02:00
licht-im-Norden87
7d71d360b0
Update stringtable.xml
...
Not quite convinced by my translation ... Flummi you better have a look
2015-04-09 23:45:33 +02:00
licht-im-Norden87
2373e78245
Update stringtable.xml
2015-04-09 23:43:58 +02:00
PabstMirror
2bc0976979
Merge pull request #277 from KoffeinFlummi/revert-276-revert-272-142menudeploy
...
Revert "Revert "1.42 - cursor mode when bipod deployed""
2015-04-08 13:26:05 -05:00
PabstMirror
03dbe8e6c5
Make it optional
2015-04-07 22:57:58 -05:00
PabstMirror
ce70c72cd6
wip1
2015-04-07 22:44:41 -05:00
bux578
92da20ce62
translations
...
#367
2015-04-07 10:02:33 +02:00
jaynus
1bb6be5654
Cleaning up of all tabs in source code files.
2015-04-06 09:22:43 -07:00
jaynus
e3ad83e109
Merge pull request #286 from KoffeinFlummi/lasers
...
Self designating lasers, Javelin Guidance, DAGR laser guidance, Comanche updated HUDS
2015-04-05 13:26:54 -07:00
esteldunedain
848b5133ef
Remove debug chats for interact_menu
2015-04-04 19:15:29 -03:00
Nicolás Badano
5f4030469f
Merge pull request #309 from KoffeinFlummi/closeInteractMenu
...
Close interact menu when knocked out
2015-04-04 15:35:00 -03:00
esteldunedain
d090b3328c
- Close interact_menu when the player falls unconscious
...
- Prevent all types of interactions while unconscious
2015-04-04 12:25:49 -03:00
esteldunedain
7617908ad3
Make menu open linearly to the right of the action point
2015-04-04 01:44:49 -03:00
esteldunedain
06f6039dca
Stronger shadow for the interact_menu text
2015-04-04 01:04:32 -03:00
esteldunedain
a5ff34e1d8
Keep cursored menus always centered. Fix #299 .
2015-04-03 20:49:40 -03:00
Nou
fff8a240e3
Remove compensation for movement, instead use modelToWorldVisual
2015-04-03 15:31:44 -07:00
Nou
6541600d44
Switch everything to use modelToWorldVisual instead of modelToWorld.
2015-04-03 15:26:27 -07:00
PabstMirror
33ee7dc07c
iMenu - Add some localization and fix veh icons
2015-04-03 00:42:25 -05:00
PabstMirror
0daa029622
Show Vehicle Name/Icon for interaction
2015-03-31 23:56:41 -05:00
Nicolás Badano
e38f48d7ad
Remove debug stuff
2015-03-31 18:16:53 -03:00
Nicolás Badano
4381f164d1
Fix the self interaction menu of vehicles
2015-03-31 18:09:23 -03:00
Nicolás Badano
149fd13fce
Prevent the interact menu from closing dialogs opened by the actions
2015-03-31 18:09:20 -03:00
Nicolás Badano
1e0ece9fa2
Revert "Revert "1.42 - cursor mode when bipod deployed""
2015-03-30 17:32:55 -03:00
Nicolás Badano
d9bfb84675
Revert "1.42 - cursor mode when bipod deployed"
2015-03-30 17:31:50 -03:00
Nicolás Badano
a7f1e58dcf
Merge pull request #272 from KoffeinFlummi/142menudeploy
...
1.42 - cursor mode when bipod deployed
2015-03-30 17:26:18 -03:00
PabstMirror
24b47584a2
InteractMenu - Fix Actions Added to Objects
2015-03-29 12:04:57 -05:00
PabstMirror
95a9daf18b
Minor Header Correction
2015-03-28 19:08:25 -05:00
commy2
e574d19844
1.42 - cursor mode when bipod deployed
2015-03-28 16:24:17 +01:00
