|
|
b2be71c9cf
|
Merge branch 'master' into userActionPrototype
|
2015-04-14 14:22:57 -05:00 |
|
|
|
63fe4118d4
|
Merge https://github.com/FreeZbe/ACE3 into french-merge
|
2015-04-14 14:48:13 +02:00 |
|
|
|
85beb72a3a
|
ASL Stuff
|
2015-04-13 23:27:03 -05:00 |
|
|
|
c6b4a57ee2
|
Pull Icon from config
|
2015-04-13 23:11:18 -05:00 |
|
|
|
5c994765ef
|
Cleanup
|
2015-04-13 22:39:00 -05:00 |
|
|
|
e84c5f4bb3
|
Radius Distance
|
2015-04-13 22:26:38 -05:00 |
|
|
|
fda4f60a9e
|
House UserAction Prototype
|
2015-04-13 22:19:38 -05:00 |
|
|
|
3c3f6ba4c3
|
Translation: A to I
Some parts filled out, other parts corrected or stylized.
|
2015-04-13 19:28:58 +02:00 |
|
|
|
f6c7d444e1
|
Merge https://github.com/Anthariel/ACE3 into french-merge
|
2015-04-13 13:31:48 +02:00 |
|
|
|
118b5509ea
|
Merge https://github.com/gienkov/ACE3 into polish-merge
|
2015-04-13 13:00:59 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
630a2a0f7a
|
Make the list menu optional via a client setting
|
2015-04-12 01:15:38 -03:00 |
|
|
|
01bc6b233a
|
Merge branch 'breakLineExtension' into linearMenuExperiment
Conflicts:
addons/interact_menu/functions/fnc_renderIcon.sqf
|
2015-04-12 00:21:05 -03:00 |
|
|
|
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 |
|
|
|
df17df61f9
|
Improve the way lines are split
|
2015-04-11 23:39:06 -03:00 |
|
|
|
59952441d8
|
Merge branch 'patch-2' of https://github.com/licht-im-Norden87/ACE3 into german-merge
|
2015-04-12 06:22:17 +02:00 |
|
|
|
362753209e
|
Merge branch 'master' of https://github.com/acemod/ACE3
|
2015-04-12 05:40:24 +02:00 |
|
|
|
c6efd4e546
|
Merge https://github.com/EpMAK/ACE3 into russian-merge
|
2015-04-12 05:39:46 +02:00 |
|
|
|
350a79c8a4
|
#498 - Use cursor mode when scoped
|
2015-04-11 19:44:42 -05:00 |
|
|
|
21abff3713
|
Revert "Revert "Russian Translation""
This reverts commit ea04f4ab3e.
|
2015-04-11 21:33:34 +03:00 |
|
|
|
ea04f4ab3e
|
Revert "Russian Translation"
This reverts commit 17a552bb80.
|
2015-04-11 21:33:07 +03:00 |
|
|
|
56681e632d
|
Merge branch 'master' of https://github.com/acemod/ACE3
|
2015-04-11 16:36:31 +02:00 |
|
|
|
38adfbcb70
|
Added missing CZ strings and made little revision
|
2015-04-11 16:33:00 +02:00 |
|
|
|
b8e0388581
|
Fix nearestObjects with getPos choking over seawater. Fix #465
|
2015-04-11 11:12:40 -03:00 |
|
|
|
b5e5359795
|
CursorCentered - Localizations
|
2015-04-11 00:35:18 -05:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
68d08b8c7b
|
Revert "Translation"
This reverts commit fab5605ad5.
|
2015-04-10 19:46:18 +03:00 |
|
|
|
fab5605ad5
|
Translation
Russian translation of the texts
|
2015-04-10 17:51:48 +03:00 |
|
|
|
8fc73af1c4
|
Translation update
Addition of french translation
|
2015-04-10 16:26:09 +02:00 |
|
|
|
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 |
|
|
|
81122e0839
|
Update stringtable.xml
Added: French Translation (100%)
|
2015-04-10 06:30:49 +02:00 |
|
|
|
c260ff89ba
|
Added - Portuguese Translation to Interact_menu
|
2015-04-09 23:00:13 -03:00 |
|
|
|
e907553abc
|
interact_menu PL translation
|
2015-04-10 03:28:14 +02:00 |
|
|
|
b8b151e62e
|
Update stringtable.xml
added spanish terms
|
2015-04-10 01:20:39 +02:00 |
|
|
|
7d71d360b0
|
Update stringtable.xml
Not quite convinced by my translation ... Flummi you better have a look
|
2015-04-09 23:45:33 +02:00 |
|
|
|
2373e78245
|
Update stringtable.xml
|
2015-04-09 23:43:58 +02:00 |
|
|
|
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 |
|
|
|
03dbe8e6c5
|
Make it optional
|
2015-04-07 22:57:58 -05:00 |
|
|
|
ce70c72cd6
|
wip1
|
2015-04-07 22:44:41 -05:00 |
|
|
|
92da20ce62
|
translations
#367
|
2015-04-07 10:02:33 +02:00 |
|
|
|
1bb6be5654
|
Cleaning up of all tabs in source code files.
|
2015-04-06 09:22:43 -07:00 |
|
|
|
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 |
|
|
|
848b5133ef
|
Remove debug chats for interact_menu
|
2015-04-04 19:15:29 -03:00 |
|
|
|
5f4030469f
|
Merge pull request #309 from KoffeinFlummi/closeInteractMenu
Close interact menu when knocked out
|
2015-04-04 15:35:00 -03:00 |
|
|
|
d090b3328c
|
- Close interact_menu when the player falls unconscious
- Prevent all types of interactions while unconscious
|
2015-04-04 12:25:49 -03:00 |
|
|
|
7617908ad3
|
Make menu open linearly to the right of the action point
|
2015-04-04 01:44:49 -03:00 |
|
|
|
06f6039dca
|
Stronger shadow for the interact_menu text
|
2015-04-04 01:04:32 -03:00 |
|
|
|
a5ff34e1d8
|
Keep cursored menus always centered. Fix #299.
|
2015-04-03 20:49:40 -03:00 |
|
