Anthariel
7523dd011f
Update stringtable.xml
2015-04-13 02:06:17 +02:00
PabstMirror
74967910a3
opps
2015-04-12 18:27:55 -05:00
PabstMirror
d50bff866b
addToInventory use addMagazineArray -maybe fix #530
2015-04-12 18:27:25 -05:00
Anthariel
8d79fd242a
Update stringtable.xml
...
Added: Some missing french translations. (I took 10 minutes to translate the banana description (-:)
2015-04-12 18:18:52 +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
FreeZbe
45ff6c7ce9
French: (Nearly) Complete French translations
...
Some entries (3 or 4) are still missing.
I dont understand what you mean / what the input is related to.
2015-04-12 14:15:45 +02:00
licht-im-Norden87
7eaee37ff6
Update stringtable.xml
2015-04-12 13:48:59 +02:00
commy2
e87f491470
mute implementation in noradio, handle post init on remote units
2015-04-12 11:17:58 +02:00
commy2
54f29d75f5
functions to mute unit
2015-04-12 10:05:49 +02:00
commy2
018854a7c3
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into muteunit
2015-04-12 09:15:45 +02:00
PabstMirror
78b64ea273
Missing English
2015-04-12 01:36:41 -05:00
bux578
2fc7f44c39
french translation, tabler 4 spaces test
2015-04-12 07:50:23 +02: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
c6efd4e546
Merge https://github.com/EpMAK/ACE3 into russian-merge
2015-04-12 05:39:46 +02:00
KoffeinFlummi
5108137302
Merge https://github.com/Ricciardino/ACE3 into italian-merge
2015-04-12 04:38:46 +02:00
licht-im-Norden87
bd07e18b43
Update stringtable.xml
2015-04-12 03:26:45 +02:00
jaynus
2a2f96a034
ACRE API functions and core functions were incorrect.
2015-04-11 14:10:30 -07:00
jaynus
458c49b0a7
Merge remote-tracking branch 'origin/master' into javelinLocking
...
Conflicts:
addons/common/XEH_preInit.sqf
2015-04-11 14:01:47 -07: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
commy2
b9077888aa
unmute handleing
2015-04-11 20:26:43 +02:00
Glowbal
24765741ab
Enabled setAccTime fix from commy
2015-04-11 20:05:22 +02:00
Glowbal
dd7e746368
formatting
2015-04-11 19:52:30 +02:00
Kllrt
12f87013b2
Merge branch 'master' of https://github.com/acemod/ACE3
2015-04-11 19:38:28 +02:00
Kllrt
38adfbcb70
Added missing CZ strings and made little revision
2015-04-11 16:33:00 +02:00
commy2
761e4aec64
edit description
2015-04-11 16:27:04 +02:00
commy2
62b45a8a07
initial commit
2015-04-11 15:59:21 +02:00
commy2
9cf44b1d32
initial commit
2015-04-11 15:46:41 +02:00
jaynus
4188893839
Move spatial model translations to ace_common
2015-04-10 14:23:55 -07:00
jaynus
0a88220fc2
Constraints work, added worldToScreenBounds to common.
2015-04-10 14:20:06 -07:00
commy2
11ad74735c
Merge pull request #458 from Tenga/master
...
Formatting fixes for fnc_isFeatureCameraActive and fnc_externalCamera
2015-04-10 22:12:55 +02:00
PabstMirror
adc7db9ae9
#456 - Fix AI rotating while dead (disableAI func)
...
Still some small head movements, but I don't know how to fix that.
2015-04-10 15:02:40 -05:00
commy2
2a72e183b1
Merge pull request #450 from Tenga/master
...
Count the commander camera as a 3rd person camera
2015-04-10 21:54:52 +02:00
Tenga
229590ed20
Formatting fixes for fnc_isFeatureCameraActive and fnc_externalCamera
2015-04-10 21:54:47 +02:00
Tenga
c8cff6e91c
- Added isFeatureCameraActive to ace_common
...
- ace_goggles_fnc_externalCamera now checks for cameras made by a BI feature
2015-04-10 21:48:24 +02:00
PabstMirror
661ddc3562
#441 - Crash with no model on ace_fakeweapon
2015-04-10 14:35:08 -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
Riccardo Petricca
d9e78e511e
Added italian translation to the last terms.
...
Added italian translation to the last added terms.
2015-04-10 21:13:03 +02:00
ruPaladin
d198cb25e9
Update stringtable.xml
2015-04-10 20:37:21 +03:00
commy2
5d097c4dd9
add comment explaining why isNumber is used
2015-04-10 19:11:51 +02: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
commy2
c03ee8e9c6
lowercase gps
2015-04-10 18:34:26 +02:00
commy2
dc49f2c71e
rewrite assigned item fix
2015-04-10 18:31:43 +02:00
EpMAK
fab5605ad5
Translation
...
Russian translation of the texts
2015-04-10 17:51:48 +03: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
commy2
d5f190dff8
fix: getGunner returns null object when throwing grenades, planting explosives
2015-04-10 06:47:31 +02:00
commy2
105184ce88
fix: getGunner returns null object if pilot uses manual fire if no gunner is present
2015-04-10 06:36:09 +02:00
Grzegorz
95be641918
common PL translation
2015-04-10 03:52:30 +02:00
VyMajoris
c1941f2719
Added - Portuguese translation to common/Stringtable
...
I see that the english description for the banana is from the Wikipedia. If wanted I can use the portuguese version from Wikipedia.
2015-04-09 22:12:54 -03:00
VyMajoris
ae7af34a11
Added - Portuguese translation to common/Stringtable
...
Everything translated. Even the banana.
2015-04-09 20:53:44 -03:00
Legolasindar
5f5ce47bec
Update stringtable.xml
...
fixed one term in spanish
2015-04-10 01:26:06 +02:00
Legolasindar
65b3566d41
Update stringtable.xml
...
fixed spanish terms.
2015-04-10 01:24:37 +02:00
Legolasindar
cef9a6454a
Update stringtable.xml
...
Updated spanish terms, on moved english to first raws.
2015-04-10 00:38:24 +02:00
licht-im-Norden87
3c4656522f
Stringtable: German additions
2015-04-09 23:33:36 +02:00
licht-im-Norden87
00c37e0b9d
Update stringtable.xml
2015-04-09 23:12:00 +02:00
KoffeinFlummi
3a871eed58
Merge branch 'master' into tools-cleanup
2015-04-09 13:37:19 +02:00
commy2
c5b38c8942
manual merge
2015-04-08 21:51:42 +02:00
commy2
1ae69d56ff
Merge pull request #377 from KoffeinFlummi/142light
...
142 directional light for map effects
2015-04-08 21:46:48 +02:00
commy2
7346c194f4
Merge pull request #306 from KoffeinFlummi/optics
...
Taosenai's Animated Optics req 1.42
2015-04-08 21:41:12 +02:00
commy2
01a9374a26
Merge pull request #382 from KoffeinFlummi/disablebs
...
disable cursor showing map position
2015-04-08 10:48:31 +02:00
commy2
4834facccf
moving it to map
2015-04-08 00:30:36 +02:00
KoffeinFlummi
ce45237989
Report full version number in RPT for debugging
2015-04-08 00:27:00 +02:00
commy2
50dbbda8eb
disable cursor showing map position
2015-04-08 00:20:43 +02:00
PabstMirror
2f4335d3c2
#344 - Ignore missing ace_serverconfig on client
2015-04-07 17:14:27 -05:00
commy2
2e66e57535
manual merge
2015-04-07 23:08:17 +02:00
commy2
d1b8595c0e
light intensity from object: handle campfires
2015-04-07 23:02:54 +02:00
commy2
96268b6407
directional light for map effects
2015-04-07 22:19:03 +02:00
commy2
88a5519465
cache the frames
2015-04-07 21:42:08 +02:00
commy2
d825505aa0
cache light config properties
2015-04-07 21:22:00 +02:00
commy2
ba618a69ec
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-07 20:54:45 +02:00
commy2
722c2af4dc
lightIntensity, handle soldier flashlights
2015-04-07 20:54:25 +02:00
esteldunedain
765ae4ee64
Merge branch 'master' into tabCleanup
...
Conflicts:
addons/explosives/functions/fnc_addClacker.sqf
addons/explosives/functions/fnc_detonateExplosive.sqf
addons/explosives/functions/fnc_getPlacedExplosives.sqf
addons/explosives/functions/fnc_openDetonateUI.sqf
addons/explosives/functions/fnc_openPlaceUI.sqf
addons/explosives/functions/fnc_openTransmitterUI.sqf
addons/explosives/functions/fnc_openTriggerSelectionUI.sqf
addons/explosives/functions/fnc_placeExplosive.sqf
addons/explosives/functions/fnc_place_Approve.sqf
addons/explosives/functions/fnc_setPosition.sqf
2015-04-07 15:00:56 -03:00
commy2
98f7125171
function to return light intensity recieved from another object
2015-04-07 18:54:53 +02:00
commy2
deabbcd840
add function that returns config properties of a vehicles light
2015-04-07 15:43:23 +02:00
commy2
5df25cf44d
function to return all turned on lights of any objects
2015-04-07 15:06:27 +02:00
commy2
0d126dc562
function to return object's lights
2015-04-07 14:44:34 +02:00
commy2
bb8762f4b9
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-07 13:55:09 +02:00
commy2
ad5aad60c7
fix: ambient brightness can return values greater 1
2015-04-07 13:54:33 +02:00
bux578
92da20ce62
translations
...
#367
2015-04-07 10:02:33 +02:00
bux578
9ce2e38814
removed <orignal> language entry
2015-04-07 09:27:26 +02:00
esteldunedain
09461d94ef
Rewritten changeProjectileDirection
2015-04-06 18:10:17 -03:00
esteldunedain
aec9962121
Fix changeProjectileDirection
2015-04-06 18:02:08 -03:00
esteldunedain
04e9f28734
Make function handle negative numbers
2015-04-06 16:12:38 -03:00
commy2
c1799616c7
add function to convert numbers to string
2015-04-06 20:47:11 +02:00
jaynus
1bb6be5654
Cleaning up of all tabs in source code files.
2015-04-06 09:22:43 -07:00
PabstMirror
c1abb2669d
#340 - Fix stringtables
2015-04-06 11:03:04 -05:00
Glowbal
befb52e855
Merge pull request #260 from KoffeinFlummi/serverConfig
...
Server Config support
2015-04-06 01:42:33 +02: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
Glowbal
f1a3d588ba
Changed initialization order of config settings.
...
ACE_Settings should never force any setting by default. Loading it first ensures that all settings from ACE_Settings exist. This way, ACE_ServerSettings will override ACE_Settings, even if no force is used. Mission settings will override the server config settings, if no force is used.
This ensures that all settings are of their correct type, in case an outdated or corrupt server config is used, as well as have their correct localized display name and description
2015-04-05 12:38:10 +02:00
Glowbal
044d2551ce
Merge branch 'master' into serverConfig
2015-04-04 23:00:47 +02:00
Glowbal
77d39877d2
Merge branch 'master' into medicalImprovements
2015-04-04 22:01:15 +02:00
Glowbal
a7edd00420
removed useless doAnimation call when animation is not "unconscious" in unconscious state
2015-04-04 20:41:49 +02: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
PabstMirror
efe810ae4e
Private Variables for localEvent
2015-04-04 12:08:59 -05:00
commy2
e27c91710c
Revert "Fixed: numerous player-based events were repeat invalid firing for null player object. This is now limited to only appropriate null-friendly events."
...
This reverts commit 6864529d9c
2015-04-04 16:26:32 +02:00
commy2
1dea63067a
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into optics
2015-04-04 16:14:19 +02:00
commy2
ea275b1e52
2d with and without PIP
2015-04-04 08:51:22 +02:00
Nou
6541600d44
Switch everything to use modelToWorldVisual instead of modelToWorld.
2015-04-03 15:26:27 -07:00
Nou
6c4dda2dc8
Use visual versions.
2015-04-03 14:40:01 -07:00
commy2
9968bc132c
get a pip scope to work
2015-04-03 22:30:29 +02:00
commy2
b0575bad21
improve infoDisplayChanged EH
2015-04-03 17:50:52 +02:00
Nicolás Badano
63ac3bb768
Merge branch 'master' into lasers
...
Conflicts:
addons/common/XEH_preInit.sqf
2015-04-03 10:40:11 -03:00
Glowbal
4478602cfb
Consistent use of quotes for localized text
2015-04-03 12:56:12 +02:00
Glowbal
2d0e8dea7e
Added banana to curator item list
2015-04-03 01:27:22 +02:00
jaynus
6864529d9c
Fixed: numerous player-based events were repeat invalid firing for null player object. This is now limited to only appropriate null-friendly events.
2015-04-02 16:20:22 -07:00
jaynus
d81d1b3176
Added: ACE Event stack debugging output, use DEBUG_EVENTS in main\script_debug
...
Added: PFH Perfcounter tracking+output, use ENABLE_PERFORMANCE_COUNTERS in main\script_debug and then call ace_common_fnc_dumpPerformanceCounters
2015-04-02 16:05:21 -07:00
commy2
88b9d0899f
shortdot scope onDraw
2015-04-03 00:03:08 +02:00
jaynus
596854a264
Moved getTurretDirection to common.
...
Tweak creation of action (fucking actions?!) :( :( :(
2015-04-02 10:05:50 -07:00
PabstMirror
ec59397e4f
Fix playerTurretChanged event
2015-04-02 11:15:31 -05:00
jaynus
b0926a542c
Merge pull request #282 from KoffeinFlummi/AddItemToInventory
...
Added a function that will add the passed item to the unit or place it i...
2015-04-02 08:42:48 -07:00
commy2
f2d802eb90
make getGunner work in person turret turret units (commander FFV) and for foot soldiers
2015-04-02 13:52:22 +02:00
commy2
d8e0c54406
function to log ace config entries
2015-04-02 10:27:21 +02:00
commy2
2fd2e313f2
sort stuff
2015-04-02 08:44:58 +02:00
commy2
8fde553731
getItemType more relyable after potential arma updates
2015-04-02 08:16:13 +02:00
commy2
191126ecd6
update getItemType
2015-04-02 07:37:44 +02:00
jaynus
cc27ff63d6
finalized. works for weapons/mags/items. Optional container also works.
2015-04-01 16:51:34 -07:00
jaynus
5d6495dafe
Merge remote-tracking branch 'origin/master' into AddItemToInventory
2015-04-01 16:42:24 -07:00
commy2
411fb6bc62
getText vs. getNumber
2015-04-01 22:13:37 +02:00
commy2
a14cc0853e
function to return item type
2015-04-01 21:52:56 +02:00
jaynus
bd1f69d8a2
assign container
2015-04-01 10:37:47 -07:00
commy2
b66bb4ffd6
add functions to get cfg type of items and objects
2015-04-01 19:36:11 +02:00
jaynus
46a761a1c8
canAdditem works on weapons.
2015-04-01 10:35:22 -07:00
jaynus
de920e8874
Final cleanup.
2015-04-01 10:34:38 -07:00
jaynus
ec6fb6fcb8
containerize.
2015-04-01 10:34:16 -07:00
jaynus
c3f915a0ac
tabs because
2015-04-01 10:22:27 -07:00
jaynus
37bbbc607f
derp.
2015-04-01 10:20:58 -07:00
jaynus
46284622b3
Optional container variable for adding item to a specific container (vest/backpack/uniform)
2015-04-01 10:20:24 -07:00
Garth L-H de Wet
e06e7a2a51
Added a function that will add the passed item to the unit or place it in a ground holder if the unit has no space.
2015-04-01 18:48:46 +02:00
Nicolás Badano
1def2bd2b4
Fix bugs with interaction with vehicles and passengers
2015-03-31 18:09:29 -03:00
commy2
d7aaead032
remove obsolete function for channel
2015-03-28 07:04:50 +01:00
commy2
7486ae3036
ace_common_fnc_currentChannel is no longer relyable
2015-03-28 06:55:46 +01:00
commy2
e7ec618f97
function decription
2015-03-28 02:10:04 +01:00
commy2
d12ba196c5
function to return attachments, muzzles with magazines and ammo, moved stuff around
2015-03-28 01:43:30 +01:00
commy2
66c026d4a0
refueling the uav didn't work on UAVs local to server or HC
2015-03-28 00:30:51 +01:00
Glowbal
7a091215e1
Draft #188
2015-03-27 16:26:18 +01:00
Glowbal
4336cf0fc1
Merge pull request #258 from KoffeinFlummi/BananaPort
...
Banana
2015-03-27 00:04:53 +01:00
Glowbal
f652ae89d1
Banana
2015-03-26 23:14:22 +01:00
commy2
9fcb193064
Merge pull request #243 from KoffeinFlummi/mediccarry
...
refining carrying injured persons
2015-03-26 18:04:35 +01:00
commy2
0a0e7c8a0c
disable user input was broken
2015-03-26 17:32:00 +01:00
commy2
606c1fbcf9
tweaks
2015-03-26 14:11:04 +01:00
commy2
0b05a2bfb2
speed up some debug functions by 99.99%
2015-03-26 14:11:01 +01:00
commy2
816b1d74ad
tweak, pushBack vs + Array
2015-03-26 14:10:59 +01:00
commy2
97ae218288
adjust functions to new syntax
2015-03-26 14:10:56 +01:00
commy2
dea830441b
tweak turret functions
2015-03-26 14:10:53 +01:00
commy2
91b63fbb7d
tweaks
2015-03-26 03:20:17 +01:00
commy2
6a0ca8590f
speed up some debug functions by 99.99%
2015-03-26 02:26:09 +01:00
commy2
cb29f1a6c9
tweak, pushBack vs + Array
2015-03-26 01:58:49 +01:00
commy2
b613ab8630
adjust functions to new syntax
2015-03-25 23:03:45 +01:00
commy2
80349658d6
tweak turret functions
2015-03-25 22:50:28 +01:00
