PabstMirror
|
1e7e5c7aa5
|
Don't show passenger actions for UAV crew
|
2015-05-17 17:52:56 -05:00 |
|
PabstMirror
|
bb63882d20
|
#1238 - open door error
|
2015-05-15 22:52:54 -05:00 |
|
esteldunedain
|
89fe91cce0
|
Fix tap shoulders keybind
|
2015-05-15 15:52:09 -03:00 |
|
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 |
|
SAM
|
021679208b
|
First batch of settings files
Separating ACE_Settings.hpp from config.cpp
|
2015-05-14 20:46:35 +02:00 |
|
PabstMirror
|
f0b7b34321
|
Cleanup
|
2015-05-14 13:00:56 -05:00 |
|
PabstMirror
|
ec38c8c951
|
Merge branch 'master' into interactionPrivates
Conflicts:
addons/interaction/functions/fnc_addPassengerActions.sqf
addons/interaction/functions/fnc_getDoorAnimations.sqf
addons/interaction/functions/fnc_moduleInteraction.sqf
addons/interaction/functions/fnc_moveDown.sqf
addons/interaction/functions/fnc_removeTag.sqf
addons/interaction/functions/fnc_showMouseHint.sqf
addons/interaction/functions/fnc_updateTooltipPosition.sqf
|
2015-05-14 12:53:18 -05:00 |
|
jonpas
|
5a17b39a7e
|
Merge remote-tracking branch 'origin/master' into interactionCodingGuidelines
Conflicts:
addons/interaction/CfgVehicles.hpp
|
2015-05-14 16:57:49 +02:00 |
|
GieNkoV
|
ed1acd8c15
|
Some small errors fixed #2
Mainly tabs and wrong italian strings (got those from newest master)
|
2015-05-12 19:42:35 +02:00 |
|
GieNkoV
|
bc72c71e8e
|
Fix small errors inside stringtables
|
2015-05-12 19:11:56 +02:00 |
|
Grzegorz Sikora
|
44466e8be8
|
Remove tabs and repair errors @Glowbal found
Conflicts:
addons/map/CfgVehicles.hpp
addons/medical/CfgVehicles.hpp
Conflicts:
addons/map/CfgVehicles.hpp
addons/medical/CfgVehicles.hpp
addons/optionsmenu/stringtable.xml
|
2015-05-12 18:27:27 +02:00 |
|
Grzegorz Sikora
|
156bba3321
|
Yes/No to BOOL
Conflicts:
addons/common/CfgVehicles.hpp
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/hearing/CfgVehicles.hpp
addons/hearing/stringtable.xml
addons/interaction/stringtable.xml
addons/map/CfgVehicles.hpp
addons/map/stringtable.xml
addons/medical/CfgVehicles.hpp
addons/medical/stringtable.xml
addons/nametags/stringtable.xml
addons/respawn/stringtable.xml
addons/switchunits/CfgVehicles.hpp
addons/switchunits/stringtable.xml
Conflicts:
addons/common/CfgVehicles.hpp
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/hearing/stringtable.xml
addons/interaction/stringtable.xml
addons/map/CfgVehicles.hpp
addons/map/stringtable.xml
addons/medical/CfgVehicles.hpp
addons/medical/stringtable.xml
addons/nametags/stringtable.xml
addons/respawn/stringtable.xml
addons/switchunits/CfgVehicles.hpp
addons/switchunits/stringtable.xml
|
2015-05-12 18:26:24 +02:00 |
|
Grzegorz Sikora
|
6a821715a0
|
Stringtable modules
Conflicts:
addons/missionmodules/CfgVehicles.hpp
addons/respawn/CfgVehicles.hpp
|
2015-05-12 18:25:40 +02: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
|
643df71932
|
Added: Italian translation from Blackedsoul p#20
|
2015-05-10 11:05:16 +02:00 |
|
Alessandro Foresi
|
6695a8793b
|
Added: Some italian translastions
|
2015-05-09 23:43:03 +02:00 |
|
jonpas
|
1a2e7d0596
|
Tabs to Spaces, Removed unused GUI class
|
2015-05-09 22:25:48 +02:00 |
|
jonpas
|
633e94a114
|
CBA Macros to Interaction functions
|
2015-05-09 22:14:00 +02:00 |
|
jonpas
|
e9abd8c27a
|
Fixed lowercasing, improved examples
|
2015-05-09 04:55:41 +02:00 |
|
jonpas
|
2ff372e2a1
|
Function headers per Coding Guidelines for Interaction
|
2015-05-09 04:47:15 +02:00 |
|
jonpas
|
50d5e845ee
|
Lowercased beginning of functions pt2
|
2015-05-09 03:12:28 +02:00 |
|
jonpas
|
2a9f4d779d
|
Lowercased beginning of function names
|
2015-05-09 03:09:26 +02:00 |
|
KoffeinFlummi
|
a1d2bd62a4
|
Merge branch 'patch-1' of https://github.com/FreeZbe/ACE3 into french-merge
Conflicts:
addons/interaction/stringtable.xml
|
2015-05-03 01:08:22 +02:00 |
|
KoffeinFlummi
|
e918e1d661
|
Merge https://github.com/ruPaladin/ACE3 into russian-merge
Conflicts:
addons/interaction/stringtable.xml
addons/medical/stringtable.xml
|
2015-05-02 23:43:33 +02:00 |
|
KoffeinFlummi
|
d0c7fce7f3
|
Merge https://github.com/adam3adam/ACE3 into czech-merge
Conflicts:
addons/interaction/stringtable.xml
addons/medical/stringtable.xml
addons/mk6mortar/stringtable.xml
|
2015-05-02 23:29:45 +02: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 |
|
Harakhti
|
6c2717be7f
|
More more translations
Stope.
|
2015-05-02 18:06:01 +02:00 |
|
adam3adam
|
05a6389acd
|
Czech translation v2
mk6mortar and some medical translation
|
2015-05-02 12:46:28 +02:00 |
|
ruPaladin
|
219735611f
|
interaction2
|
2015-05-02 12:47:06 +03:00 |
|
ruPaladin
|
3b6e491f5c
|
interaction
|
2015-05-02 12:42:44 +03:00 |
|
FreeZbe
|
66f39fc1dc
|
French : update / fix stringtable
|
2015-05-02 10:12:28 +02:00 |
|
ToasterBR
|
021b00c722
|
Translation to Portuguese
Done all remaining portuguese translations, including some minor
corrections
|
2015-05-02 03:38:53 -03:00 |
|
licht-im-Norden87
|
106f2ab89b
|
Added german strings to interaction
|
2015-05-02 03:25:28 +02:00 |
|
PabstMirror
|
675b76f569
|
Privates - Interaction
|
2015-05-01 18:12:24 -05:00 |
|
Grzegorz
|
c1d87f2a75
|
PL translation
interaction
|
2015-05-01 23:50:27 +02:00 |
|
Felix Wiegand
|
a211bcfacf
|
Merge pull request #689 from acemod/group
Reword the group action names
|
2015-05-01 23:30:10 +02: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 |
|
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 |
|
PabstMirror
|
a46d4e11ab
|
Remove linebreak from teamManagement, fix leaveteam
|
2015-04-30 12:38:19 -05:00 |
|
PabstMirror
|
5ca75f9973
|
Action names Join->Assign
|
2015-04-30 12:20:01 -05:00 |
|
PabstMirror
|
ca57a4e168
|
Merge branch 'master' into group
Conflicts:
addons/interaction/CfgVehicles.hpp
addons/interaction/stringtable.xml
|
2015-04-30 11:59:53 -05:00 |
|
Glowbal
|
581c64f66f
|
Implemented unloading from vehicles #740
|
2015-04-29 23:12:47 +02:00 |
|
Dimaslg
|
f8d5c423ae
|
Merge conflicts resolved
|
2015-04-29 21:15:22 +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 |
|
commy2
|
f5d7331847
|
no team management on the dead or unconscious units, fix #803
|
2015-04-26 20:57:55 +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 |
|
esteldunedain
|
e3a06999c3
|
Reduce MainActions distance for CAManBase from 5m to 4m
|
2015-04-24 00:57:49 -03:00 |
|