PabstMirror
b61bd1fb75
1.46 New RscInfoType (fix UBC)
2015-06-08 13:26:18 -05:00
AKALegman
1ae8e29ac2
updated isPlayer v2
2015-06-08 19:12:16 +01:00
AKALegman
96fccbedf9
updated isPlayer
2015-06-08 11:09:49 +01:00
PabstMirror
32ce0aa6fd
Macroize all stringtables
2015-06-05 21:02:24 -05:00
PabstMirror
470492759c
Merge branch 'master' into multipleDevices
...
Conflicts:
addons/atragmx/initKeybinds.sqf
addons/common/XEH_postInit.sqf
addons/kestrel4500/CfgVehicles.hpp
addons/kestrel4500/initKeybinds.sqf
addons/microdagr/CfgVehicles.hpp
addons/microdagr/XEH_clientInit.sqf
2015-06-05 17:50:04 -05:00
Glowbal
7f2ada38a2
Merge branch 'checkpboSettings' of github.com:usecforce/ACE3
...
Conflicts:
addons/common/CfgVehicles.hpp
addons/common/config.cpp
2015-06-04 21:51:54 +02:00
jonpas
541f1010a7
Merge branch 'master' into macroSTR
...
Conflicts:
addons/attach/functions/fnc_attach.sqf
addons/captives/functions/fnc_moduleSurrender.sqf
addons/common/CfgVehicles.hpp
addons/explosives/CfgModule.hpp
addons/hearing/CfgVehicles.hpp
addons/interaction/CfgVehicles.hpp
addons/map/CfgVehicles.hpp
addons/microdagr/CfgVehicles.hpp
addons/mk6mortar/CfgVehicles.hpp
addons/nametags/CfgVehicles.hpp
addons/nightvision/functions/fnc_changeNVGBrightness.sqf
addons/respawn/CfgVehicles.hpp
addons/switchunits/CfgVehicles.hpp
addons/vehiclelock/CfgVehicles.hpp
addons/winddeflection/stringtable.xml
2015-06-02 22:14:32 +02:00
Glowbal
1c0c73be54
Merge pull request #1433 from acemod/fixSettingsFromModules
...
Delay initialization of modules until settings are properly setup
2015-06-01 19:18:11 +02:00
KoffeinFlummi
fa73aec15b
Merge https://github.com/Macusercom/ACE3 into german-merge
2015-06-01 14:27:49 +02:00
Glowbal
0b8896239c
Progress bar stops on death - fix for #1449
2015-05-31 09:23:36 +02:00
Macusercom
038880cb01
Additional Translations for German + some corrections
2015-05-30 23:33:51 +02:00
jonpas
66ceaa1d31
Fixed IS_STRING error due to regex replacing it with LSTRING
2015-05-30 20:09:53 +02:00
jonpas
d934c25b78
Merge branch 'master' into macroSTR
...
Conflicts:
addons/interact_menu/ACE_Settings.hpp
2015-05-30 19:54:32 +02:00
PabstMirror
d7d225cebc
Send waiting debug msg only once
2015-05-30 01:28:15 -05:00
PabstMirror
84d940e69d
Fix circular dependency - ModuleDescription
2015-05-30 00:31:07 -05:00
esteldunedain
9d29aa2107
- Change all modules on ACE using settings to type ACE_Module, so we can guarantee that they wait for settings before initing.
...
- Make ace_common require ace_modules, so all ACE pbos are guaranteed to have it
2015-05-30 01:37:41 -03:00
esteldunedain
333cb80171
Delay initialization of ACE_Modules until settings are properly setup
2015-05-30 01:18:23 -03:00
esteldunedain
afa6a2fad9
Remove the "ServerSettingsReceived" event, which is not longer needed. As per @pabstmirror solution, the GVAR(Settings) variable is monitored to determine when the server info has arrived. Fix #1273
2015-05-30 00:43:51 -03:00
PabstMirror
5efde25585
Fix ace_settings
2015-05-29 21:03:47 -05:00
jonpas
763cb07629
Macro STRING to LSTRING
2015-05-28 21:59:04 +02:00
jonpas
baca5a25d5
Merge branch 'master' into checkpboSettings
...
Conflicts:
addons/common/XEH_postInit.sqf
2015-05-28 20:52:35 +02:00
jonpas
86264a7b7d
Reworked ACE_Settings/Module functions to support both dynamically, Added SettingsInitialized
2015-05-28 20:49:30 +02:00
jonpas
b85ae8f194
Fixed missed external strings
2015-05-27 22:34:57 +02:00
Glowbal
7dd01ebb69
Merge pull request #1389 from acemod/possibleFixMedicalUnloadPatient
...
Possible fix medical unload patient
2015-05-27 19:34:23 +02:00
jonpas
6072e14077
Changed all strings to macros (except external)
2015-05-27 19:04:25 +02:00
esteldunedain
39fec12528
Merge branch 'master' into reliableSettings
2015-05-27 12:09:06 -03:00
Ivan Navarro Cabello
047a2ee736
added spansih translate
...
added spansih translate for (advanced_ballistics, ballistics, captives,
common, explosives, frag, hearing, interaction, map, medical, microdagr,
missileguidance, missionmodules, mk6mortar, nametags, optionsmenu,
respawn, switchunits, vehiclelock, weather, winddeflection).
I used the Pull request of #1251 for complete my commit, because #1251
is outdated now.
2015-05-27 15:27:04 +02:00
Macusercom
7eeddfbd65
German translations
...
Added a lot of German translations and fixed even more typos.
2015-05-26 17:04:53 +02:00
PabstMirror
4e70bf6e83
Single PFEH for waitAndExecute - using sort
2015-05-25 22:46:56 -05:00
ViperMaul
6a1724343d
remove debug
...
#1375
2015-05-25 11:38:28 -07:00
ViperMaul
789e92d8ef
Ensuring a proper return value and removing unnecessary code.
...
#1375
2015-05-25 10:32:52 -07:00
ViperMaul
9a07a9bfd6
modify unloadPerson to use unloadPersonLocal
...
#1375
2015-05-25 09:43:29 -07:00
ViperMaul
7141d251c7
create unloadPersonLocal
...
#1375
2015-05-25 09:41:24 -07:00
PabstMirror
f4bf6ea26d
Fix Time Calc
2015-05-22 14:29:56 -05:00
jaynus
c924baefd7
All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.
2015-05-21 09:42:44 -07:00
jonpas
1a468cb4ff
Split common ACE_Settings.hpp from config.cpp, shortened sampleSetting
2015-05-16 01:06:29 +02:00
jonpas
cccc741a16
#1123 - Added CheckPBOs to ACE_Settings
2015-05-16 00:54:01 +02:00
esteldunedain
0b1beed219
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into reliableSettings
...
Conflicts:
addons/common/XEH_postInit.sqf
2015-05-15 18:18:13 -03:00
jaynus
d4dab0275d
Me and my typos.
2015-05-15 12:54:02 -07:00
esteldunedain
d189cffce6
Fix event names
2015-05-15 15:49:22 -03:00
jaynus
e1c3e96eb1
Fixes: Nil scheduled space bug with hashes. This is still a bug everywhere else.
2015-05-15 10:45:07 -07:00
esteldunedain
ca94fd4c78
Remove the pfh
2015-05-14 20:58:45 -03:00
esteldunedain
5e3b6f389a
Reliable settings framework
2015-05-14 20:45:53 -03:00
PabstMirror
666db5e245
Fix Typo
2015-05-14 18:13:20 -05:00
PabstMirror
d5db268fc0
Clean unused privates
2015-05-14 17:17:41 -05:00
PabstMirror
c27d84e382
Common Privates Redo
2015-05-14 17:12:40 -05:00
PabstMirror
fd8d68c451
Merge branch 'master' into multipleDevices
...
Conflicts:
addons/common/stringtable.xml
2015-05-14 15:38:13 -05:00
SAM
0b6f02f45e
Second batch of cleaned up files.
2015-05-14 20:06:06 +02:00
SAM
9b55dd0b57
First batch of cleaned up files
2015-05-14 20:02:42 +02:00
jaynus
cac70762f5
Merge pull request #1149 from acemod/extBuildFix
...
Extensions build system updates, changes and crash fixes
2015-05-14 07:25:49 -07:00
Glowbal
abadf05342
Merge remote-tracking branch 'gienkov/module-translations'
...
Conflicts:
addons/medical/stringtable.xml
2015-05-14 16:01:41 +02:00
jaynus
9f3a57bf32
Changed: checkFiles extension check prints version returned by extension
...
Changed: Build changed to SSE2 instead of defaulting to AVX.
2015-05-13 09:57:24 -07:00
jaynus
ed2f73d4d9
Merge pull request #1117 from acemod/waveHeightAtFunc
...
Added: waveHeightAt Function
2015-05-12 21:15:35 -07:00
jaynus
d972f14649
Merge pull request #1092 from acemod/superTime
...
ACE_time variables for accurate purposeful time use
2015-05-12 19:34:20 -07:00
PabstMirror
e613db1fea
Add missing script_component include
2015-05-12 15:40:12 -05: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
PabstMirror
043fee03bd
Return Valid bool for keybind
2015-05-11 22:48:03 -05:00
PabstMirror
de2a89613c
ATragMX
2015-05-11 22:22:24 -05:00
PabstMirror
ffce1f6386
Condense mDagr interactions - intergrate kestral
2015-05-11 21:49:13 -05:00
jaynus
7efe8ccba5
Added: waveHeightAt Function, refs #1024 for use.
2015-05-11 16:44:17 -07:00
jaynus
9660978b92
Changed: search for ace_server, not ace_serverconfig
2015-05-11 09:02:13 -07:00
PabstMirror
57d6ad988b
Kestral WIP
2015-05-10 16:54:24 -05:00
PabstMirror
05f1b884fa
Localization/ headers
2015-05-10 15:17:50 -05:00
PabstMirror
f7ff4a2f36
Base Device Handler Framework
...
Multiple devices share Home/Ctrl-home keys
2015-05-10 14:59:53 -05:00
jaynus
e1c3c40cdd
I need more coffee. this should be more accurate.
2015-05-10 07:50:58 -07:00
jaynus
318b2437f9
Applied virtual time acceleration to the master ACE_time. Created ACE_tickTime macro, to provide same-frame millisecond resolution.
2015-05-10 07:42:53 -07:00
Alessandro Foresi
2dd06babec
Added: Italian translations completed.
...
Fixed: BOM markers where missing
2015-05-10 11:44:46 +02:00
Alessandro Foresi
643df71932
Added: Italian translation from Blackedsoul p#20
2015-05-10 11:05:16 +02:00
jaynus
7fb7b04a85
And one final bugfix for fast machines.
2015-05-09 23:13:02 -07:00
jaynus
8e34b99c0f
Optimization of variables.
2015-05-09 23:09:33 -07:00
jaynus
b3833c665d
Time magic.
2015-05-09 22:53:20 -07:00
commy2
aa6c3ddf2c
fix: check files script, order in activatedAddons is not guaranteed
2015-05-09 19:34:35 +02:00
commy2
7fb56d4fd5
simple check to compare client and server version of ace
2015-05-09 17:03:51 +02:00
commy2
3976c4d64f
the spaces
2015-05-09 16:06:44 +02:00
commy2
f0cca5b33e
ignore ace in checkPBO module, also fix #1020
2015-05-09 16:01:53 +02:00
commy2
57131496f2
check for outdated pbo files
2015-05-09 13:25:19 +02:00
Glowbal
518dfb4373
Added missing privates
2015-05-07 21:51:03 +02:00
PabstMirror
d8a6dd1bbd
Stuff
2015-05-01 12:58:56 -05:00
PabstMirror
8d1ac26e24
Save and replay valid awake animations
2015-05-01 12:12:13 -05:00
PabstMirror
0f736ae684
GetDeathAnim
2015-05-01 03:13:26 -05:00
Glowbal
349d723fea
Merge pull request #928 from acemod/AdjustUnloadPerson
...
Adjust unload person
2015-04-30 20:55:17 +02:00
Glowbal
67370f3340
Handles waking up
2015-04-30 20:49:38 +02:00
Glowbal
432a0102e8
Improved unloadPerson function
...
Removed caller parameter.
2015-04-30 20:44:43 +02:00
bux578
367da1f4bf
cleaned up insignias
2015-04-30 19:36:35 +02:00
commy2
8e54e6ec13
fix setFWS locality issues, fix #892
2015-04-30 00:53:49 +02:00
bux578
fce91279b5
add ace3 and banana insignia
...
`[this,"ACE_insignia_logo"] call BIS_fnc_setUnitInsignia;`
and
`[this,"ACE_insignia_banana"] call BIS_fnc_setUnitInsignia;`
2015-04-29 22:04:31 +02:00
Glowbal
dfbc9b74fd
Added arsenalScope #913
2015-04-29 15:14:37 +02:00
commy2
d149db61e8
ace insignia, #906
2015-04-29 13:01:08 +02:00
KoffeinFlummi
b263ac6847
Merge branch 'patch-5' of https://github.com/VyMajoris/ACE3 into portuguese-merge
...
Conflicts:
addons/common/stringtable.xml
2015-04-29 12:57:48 +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
NukeDev
1d434949de
Some Italian Translation's Changes
2015-04-28 17:46:35 +02:00
VyMajoris
ba89bc8faa
Added - Myself to AUTHORS.txt
2015-04-26 03:15:25 -03:00
Nou
7c857a5a7e
Make sure load spawns the function, not calls it.
2015-04-25 00:52:51 -07:00
Nou
c8e6e7018c
Moved infinite spawned loop to Loaded event for handing save game loads. Events for the win! diag_activeSQFScripts as of this build returns empty on a bare mission.
2015-04-25 00:49:47 -07:00
Nicolás Badano
1bfb13abac
Revert "remove author from items inheriting ACE_ItemCore"
2015-04-21 19:07:42 -03:00
bux578
3897b73d56
remove author from items inheriting ACE_ItemCore
2015-04-21 19:16:54 +02:00
Glowbal
89a1306605
Merge branch 'master' into KeyPressesWhileUnconscious
2015-04-20 22:19:40 +02:00
Glowbal
362051e2db
Merge pull request #717 from acemod/medicalFixes
...
Medical fixes
2015-04-20 22:16:57 +02:00
commy2
ea368511b7
ace extensions class for modularity
2015-04-20 18:48:58 +02:00
commy2
14214090dc
manual merge
2015-04-20 18:22:17 +02:00
Glowbal
b71ac1485d
Merge branch 'master' into medicalFixes
2015-04-19 12:06:54 +02:00
commy2
c9a2505031
Merge pull request #755 from acemod/fixoptics2
...
Fix for PIP scopes, fix #547
2015-04-19 07:46:41 +02:00
jaynus
dccc869a6a
Merge pull request #753 from acemod/fixSettingsLocalization
...
Fix settings localization is done by the server instead of client
2015-04-18 20:09:56 -07:00
commy2
7ac7bc3f29
eventhandler for creating and deleting cameras
2015-04-18 22:06:42 +02:00
Glowbal
9825d030e3
Merge pull request #714 from acemod/localMedicalGarbage
...
ACE JIP data and event synchronization (Tested with Litter change)
2015-04-18 21:25:53 +02:00
jaynus
f5705a91e6
oops.
2015-04-18 12:04:48 -07:00
jaynus
c438d9e790
Merge remote-tracking branch 'origin/master' into localMedicalGarbage
2015-04-18 11:12:22 -07:00
Glowbal
54a70f26b1
Moved to own function.
2015-04-18 20:06:01 +02:00
Glowbal
85e5293c37
Fix settings localization is done by the server instead of client #744
2015-04-18 19:59:41 +02:00
FreeZbe
f55bd5a629
French: updates / fixes stringtable
2015-04-18 18:49:46 +02:00
PabstMirror
d7da259c11
Merge pull request #688 from acemod/optionMenuStuff
...
Option menu stuff
2015-04-17 23:49:37 -05:00
PabstMirror
71e62711c6
#731 - stop error if target offscreen
2015-04-17 22:02:23 -05:00
jaynus
93d03b404f
JIP Sync events complete.
2015-04-17 19:26:27 -07:00
jaynus
da09b74fe4
Don't JIP check server side, but still have it fire for HC.
2015-04-17 18:27:35 -07:00
jaynus
8fa0c91632
Added PlayerJIP event, handled full requests on JIP.
2015-04-17 18:23:26 -07:00
commy2
708a2aa374
check if ddls are present on mission start
2015-04-18 01:44:53 +02:00
commy2
3ec5acbdb0
stuff
2015-04-18 01:05:30 +02:00
commy2
25d8c6c93e
function to show error message box
2015-04-17 23:24:43 +02:00
Glowbal
31bc09a9a3
fixed AI standing up before being killed
...
Doesn't matter if we enable AI again on dead units
2015-04-17 21:06:30 +02:00
jaynus
2be38c493c
ACE JIP synchronized event infastructure.
2015-04-17 10:21:41 -07:00
PabstMirror
bb2383cffd
#700 - ProgressBar Visual Improvement
2015-04-17 09:51:47 -05:00
PabstMirror
53af014eab
Fix Localization in value[] array
2015-04-16 19:29:39 -05:00
jaynus
6a942ac820
Fixed: ACE_Fake**** Was showing in arsenal. Fixes #670
2015-04-16 10:10:24 -07:00
Tachii
2466d83cac
Update stringtable.xml
2015-04-16 18:19:11 +03:00
commy2
8d8ae3dadb
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-16 02:00:55 +02:00
commy2
4169351b1a
fix addActionEH didn't work after respawn
2015-04-16 02:00:37 +02:00
PabstMirror
361efe4147
Missing NoVoice words
...
Protocol bin\config.bin/ACE_RadioProtocolNoRadio/: Missing word RallyUp
/ UnderFireE
2015-04-15 17:04:03 -05:00
PabstMirror
e54d8dc827
ProgressBar - Fixed Alignment
2015-04-15 12:55:20 -05: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
Nicolás Badano
10b1587453
Merge pull request #592 from gienkov/master
...
PL translation
2015-04-14 20:36:25 -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
jaynus
85c10328ae
missed one.
2015-04-14 14:58:19 -07:00
jaynus
df3c8155a0
Merge branch 'master' of github.com:acemod/ACE3
2015-04-14 14:45:30 -07:00
jaynus
c6943fbdaf
fixes to ACRE volume, and this transform should really be in set/get global volume. Closes #588
2015-04-14 14:45:21 -07:00
KoffeinFlummi
ebcdafe610
Fix spelling of "isClientSetable"
2015-04-14 21:43:19 +02:00
KoffeinFlummi
b563bf8a8e
Merge branch 'Update-Stringtable-Common' of https://github.com/licht-im-Norden87/ACE3 into german-merge
2015-04-14 15:04:42 +02:00
KoffeinFlummi
63fe4118d4
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
KoffeinFlummi
96319c8799
Merge https://github.com/ruPaladin/ACE3 into russian-merge
2015-04-14 12:50:14 +02:00
Kllrt
1c611ba2db
Added another new CZ strings
2015-04-13 21:15:04 +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
bux578
0e6eb46bb4
Merge pull request #560 from gienkov/master
...
Further PL translation fixes
2015-04-13 19:18:54 +02:00
commy2
fa64225e55
Merge pull request #505 from acemod/muteunit
...
Muteunit framework, fix #473
2015-04-13 19:18:45 +02:00
Grzegorz Sikora
ac886828b0
Fixes
2015-04-13 18:02:48 +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
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
commy2
39500110b5
remove disable command menu option - it does nothing
2015-03-25 15:14:22 +01:00
bux578
c44b944044
add missing icons
2015-03-25 06:32:08 +01:00
commy2
12062c0e25
deleting obsolete stuff in common
2015-03-24 20:32:13 +01:00
commy2
34df28d938
cleaning up common
2015-03-24 20:28:44 +01:00
commy2
53a61eb001
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into mediccarry
2015-03-24 20:10:11 +01:00
bux578
60c50e0daf
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ModuleIcons
2015-03-24 19:12:23 +01:00
commy2
749352f0a8
animations, onUnconscious events
2015-03-24 19:07:39 +01:00
commy2
941d98a88d
disable all self actions inside vehicles on default
2015-03-24 16:45:10 +01:00
commy2
bdc60c074a
cleaning up in common
2015-03-24 16:01:53 +01:00
Nicolás Badano
5e79970740
Switching nicknames
2015-03-24 01:18:00 -03:00
bux578
ba42ec831b
second batch of icons
2015-03-23 20:02:35 +01:00
Nicolás Badano
1e5a194bf6
Optimize ace_common_fnc_toHex
2015-03-23 12:16:50 -03:00
commy2
f734aeee95
reload launcher mag progress bar
2015-03-22 14:05:31 +01:00
Nicolás Badano
71c79e7785
Merge pull request #214 from KoffeinFlummi/clearCacheOnEvents
...
Added to cachedCall an option to clear the cache on an event
2015-03-21 20:15:10 -03:00
commy2
1bf13cea34
remove obsolete camera eh from agm
2015-03-21 22:13:36 +01:00
Nicolás Badano
87b1458dc0
Fix debug stuff
2015-03-21 18:09:42 -03:00
commy2
1b8a9290cd
remove obsolete custom eh from agm
2015-03-21 21:56:22 +01:00
Nicolás Badano
213b817947
Added to cachedCall an option to clear the cache on an event
2015-03-21 17:50:35 -03:00
Nicolás Badano
e7d7fa8e6c
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-03-21 00:27:41 -03:00
Nicolás Badano
14566c783b
Prevent canInteractWith from throwing errors if third parameter is not supplied
2015-03-21 00:27:19 -03:00
PabstMirror
8840284309
Fix progressBar
2015-03-20 17:46:21 -05:00
commy2
330fc5658f
fake weapon had mass > 0, fix #205
2015-03-18 16:47:04 +01:00
commy2
4ea6b91e47
use eventhandlers instead of PFH
2015-03-18 15:42:33 +01:00
commy2
c23c0788f6
tweaks, carry static weapons
2015-03-18 13:36:22 +01:00
commy2
ac8ff45d44
lock / unlock events
2015-03-18 11:29:58 +01:00
commy2
ab39608e4d
change height when carrying, fix most cases of floating objects
2015-03-18 01:36:56 +01:00
commy2
5f39cf213b
some fixes for MP
2015-03-17 12:20:46 +01:00
commy2
6d868d1bd1
fix collisions when releasing, fix crate fliping in buildings
2015-03-17 11:44:41 +01:00
commy2
fef150cff2
attempt to fix collisions
2015-03-17 00:24:25 +01:00
commy2
27404fed1b
function to drop object, fix position event
2015-03-16 19:25:29 +01:00
commy2
2744f46bd2
spelling
2015-03-15 16:12:37 +01:00
commy2
b5f307919e
replace canInteract with canInteractWith
2015-03-15 13:00:10 +01:00
commy2
0064f5739c
manual merge
2015-03-15 09:30:26 +01:00
commy2
4dab0b73d5
add conditions on post init
2015-03-15 09:26:16 +01:00
commy2
876424695e
solve canInteract conflicts, fix #198
2015-03-15 09:02:11 +01:00
Nicolás Badano
80e7117ead
Tweak ambientBrightness to take into acount the cloud coverage
2015-03-13 22:27:14 -03:00
Nicolás Badano
722f49acc4
Execute statement when hovering over actions that open submenus
2015-03-11 00:21:05 -03:00
Nicolás Badano
fab81c8701
Added helper function to cache generic function calls for a given time
2015-03-10 23:20:05 -03:00
commy2
cad5456010
function to check if an object is alive
2015-03-10 23:35:05 +01:00
jaynus
59db61e192
Performance counter macros
2015-03-10 12:59:40 -07:00
Nicolás Badano
6b43c7bc20
Merge branch 'master' into linkBelt
...
Conflicts:
addons/common/XEH_preInit.sqf
addons/interact_menu/functions/fnc_renderMenu.sqf
2015-03-05 22:48:31 -03:00
Nicolás Badano
12c0a77f86
Add functions to common for converting between "position" and ASL
2015-03-03 01:37:00 -03:00
Glowbal
5b50910ef6
Fixed incorrect size
2015-02-25 11:23:35 +01:00
Glowbal
5883c673e4
Merge branch 'displayTextRemoteClients' of github.com:KoffeinFlummi/ACE3 into displayTextRemoteClients
2015-02-24 20:25:43 +01:00
Glowbal
e10c907454
Added missing header arguments
2015-02-24 20:25:34 +01:00
PabstMirror
97d1889971
Shift Display to Right if Zeus Interface is open
2015-02-24 12:40:22 -06:00
Glowbal
37031b5002
Replaced execRemoteFnc by ACE event system
2015-02-24 18:10:40 +01:00
Glowbal
278f0ab889
Fixed indentation
...
Added check for AI units
2015-02-24 18:02:41 +01:00
Glowbal
6fde2de40f
Improved localization support and sendDisplayText to remote client objects.
2015-02-24 17:14:19 +01:00
Glowbal
40d98b04a4
Merge pull request #145 from KoffeinFlummi/standardize_ui
...
Standardize UI
2015-02-23 18:11:11 +01:00
Glowbal
82c181cd7c
Fixed header
2015-02-22 14:54:54 +01:00
Glowbal
5e0eb7323a
Added option to toggle between progressbar top and bottom
2015-02-22 14:38:48 +01:00
Glowbal
dd51037c5e
Added support for image color
2015-02-22 13:44:17 +01:00
Glowbal
9d44ec18b8
Added a default text color setting
2015-02-22 13:35:05 +01:00
Glowbal
323d673eec
Removed deprecated config entries (DisplayMessage and DisplayInformation)
2015-02-22 13:20:17 +01:00
Glowbal
14411a5ef0
Fixed weird fix for getNumber for Array bug in setSettingFromConfig.
2015-02-22 11:36:21 +01:00
Glowbal
1ed50bfe3e
Fixed font size
2015-02-22 11:35:52 +01:00
Glowbal
47e27d7be3
Merge branch 'standardize_ui' of github.com:KoffeinFlummi/ACE3 into standardize_ui
2015-02-22 11:19:46 +01:00
Glowbal
8393645df9
Changed position to be inline with the weapon selector UI element by default
2015-02-22 11:19:32 +01:00
Glowbal
a574487166
Added localization support for displayText
2015-02-22 11:19:10 +01:00
Glowbal
9f3a0fe8d4
Removed displayInfo and displayMessage functions.
2015-02-22 11:18:37 +01:00
PabstMirror
8945f99be1
Fix CurrentChannel
...
GVAR -> FUNC
onEachFrame exits when channel control is closed
2015-02-21 21:19:54 -06:00
Nicolás Badano
96abddc31b
Ability to link a belt of ammo to an AR's machinegun while he's firing. Non stop suppresion!
2015-02-20 02:45:17 -03:00
Glowbal
b58abaa2c0
Added a transparant background
2015-02-19 22:01:09 +01:00
Glowbal
ab6879845c
Merge branch 'master' into standardize_ui
2015-02-19 21:42:47 +01:00
Glowbal
a81c1fbef5
Overhauled AGM hint.
2015-02-19 21:38:51 +01:00
Glowbal
21199a4ee6
Now uses BIS_fnc_rscLayer
2015-02-19 19:32:49 +01:00
Glowbal
c8d4acfc81
Refactored displayText to no longer use spawn.
2015-02-19 19:29:54 +01:00
Glowbal
b0373de576
Tabs to spaces
2015-02-19 19:14:52 +01:00
Glowbal
612fa69c1c
Renamed string_removeWhiteSpace to stringRemoveWhiteSpace.
2015-02-19 19:12:14 +01:00
Glowbal
c3cd9d281d
Removed isHC function. #139
2015-02-14 20:31:44 +01:00
Glowbal
13c2127574
Clean up of old CSE code
...
Removed all _F suffixes
Reorganized the RPEP list.
Removed unnecessary functions.
2015-02-14 20:29:07 +01:00
Glowbal
155503d4a1
Merged GUI into common.
...
Removed unnecessary GUI functions.
Updated displayIcon function to be more dynamic
Added client side settings for displaying icons.
2015-02-14 20:06:55 +01:00
PabstMirror
f83d83a820
Fix from AGM FFV-holster bug
2015-02-13 22:09:37 -06:00
PabstMirror
d0b0a0e066
Missing =
2015-02-12 20:43:50 -06:00
commy2
a41299b05a
Merge pull request #135 from KoffeinFlummi/syncedScopeAdjustment
...
Synced scope adjustment
2015-02-12 16:24:41 +01:00
Nicolás Badano
a3dc1df109
scopes: moved getWeaponIndex to common
2015-02-12 11:57:55 -03:00
commy2
7c8840df56
transfer value even if it changed
2015-02-12 15:56:57 +01:00
commy2
ff0348a169
add common_fnc_setVariablePublic
2015-02-12 13:23:38 +01:00
commy2
3f8f08cc8b
no holding key with fcs
2015-02-11 14:51:21 +01:00
Nicolás Badano
ff5c5a5bac
scopes: Code cleaned up, removed spawns, added standard headers.
2015-02-10 01:22:10 -03:00
Nicolás Badano
f163e307c8
ace_common: throttledPublicVariable function
2015-02-09 22:59:43 -03:00
Nicolás Badano
8a26fbc957
ace_settings: remove debug stuff
2015-02-08 18:36:00 -03:00
Nicolás Badano
1b9d0aa635
ACE_Settings: do not load client settings on dedi servers or HC
2015-02-08 18:29:49 -03:00
Nicolás Badano
1717d75a20
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into aceSettings
2015-02-07 10:49:26 -03:00
commy2
49f0b79962
fcs for turrets
2015-02-04 03:20:55 +01:00
Nicolás Badano
e57a135750
Missing prep
2015-02-03 16:49:40 -03:00
Nicolás Badano
b119d5246b
fix in setsettings
2015-02-03 15:46:33 -03:00
Nicolás Badano
92d21af8c6
ACE_Settings: function for updating settings from modules
2015-02-03 02:52:07 -03:00
Nicolás Badano
66045b8d51
ACE_Settings: setSettings tab to space, casting
2015-02-03 02:51:41 -03:00
Nicolás Badano
051ad00806
ACE_Settings: added function to add settings at runtime
2015-02-03 02:37:38 -03:00
Nicolás Badano
658f30b9a2
ACE_Settings: various fixes
2015-02-03 02:37:13 -03:00
Nicolás Badano
2c0d2013d4
ACE_Settings: Added a function to change settings on runtime (e.g. for modules)
2015-02-03 01:45:04 -03:00
Nicolás Badano
857b45453a
ACE_Settings: fix option to reset user setable settings to default
2015-02-03 01:03:26 -03:00
Nicolás Badano
99cf0a75ee
Merge branch 'master' of git@github.com:KoffeinFlummi/ACE3.git into aceSettings
2015-02-03 00:45:29 -03:00
Nicolás Badano
354b261677
ACE_Settings: added sample setting entry for documentation
2015-02-03 00:43:53 -03:00
Nicolás Badano
67f7842722
ACE_Settings: store settings data on a list
2015-02-03 00:43:23 -03:00
Nicolás Badano
37199f2ba2
Load client setable settings from profile
2015-02-02 21:14:16 -03:00
Nicolás Badano
0600a72147
Fixes
2015-02-02 21:13:31 -03:00
PabstMirror
1921c73ee8
Merge pull request #99 from KoffeinFlummi/agmUAVRechargePort
...
Port AGM: Logistics-UAV refuel/recharage
2015-02-01 11:59:40 -06:00
Nicolás Badano
e277b05aff
ace_settings: first draft
2015-01-30 18:56:45 -03:00
PabstMirror
9631154926
Set ADDON variable in XEH_preInit
2015-01-29 01:38:46 -06:00
PabstMirror
9a616a85fc
VehicleSetFuel event
...
setFuel says it needs to be local, so switching to event.
Put event in common
2015-01-28 14:38:04 -06:00
PabstMirror
3b3944b56c
ProgressBar - Check canInteract (w/ exceptions)
2015-01-27 20:51:12 -06:00
PabstMirror
bf791e32c4
Merge pull request #93 from KoffeinFlummi/progresBarNew
...
#87 - New Progress Bar
2015-01-27 19:28:51 -06:00
Nicolás Badano
d42be7b5f8
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-01-27 19:26:32 -03:00
Nicolás Badano
7a08bd3722
common: fixed fnc_addLineToDebugDraw
2015-01-27 19:26:09 -03:00
Nicolás Badano
8bc92482f3
common: function for drawing debug lines
2015-01-27 19:26:06 -03:00
Glowbal
c57cf88965
Merge pull request #85 from KoffeinFlummi/cse_medical_port
...
PORT: CSE Medical
2015-01-27 17:06:22 +01:00
Felix Wiegand
8d24c9fdbd
Create README.md
2015-01-26 13:35:31 +01:00
PabstMirror
5e932f8c71
Replace calls to progressBar
...
Mag repack
Defuse
Swap Barrel
2015-01-26 00:24:33 -06:00
PabstMirror
7c9dd335e7
Formating
2015-01-25 18:53:08 -06:00
PabstMirror
ce8e0fd938
New Progress Bar
2015-01-25 18:48:32 -06:00
Thomas Kooi
b28fa367cb
Fixed unconscious. Now functions properly again after move from common to medical.
2015-01-25 16:40:47 +01:00
Nicolás Badano
fc7f778d3e
Reverted deletion of HintConfig.hpp
2015-01-24 15:35:58 -03:00
Nicolás Badano
b8abc85051
Merge branch 'byebyeAgmKeys' of github.com:KoffeinFlummi/ACE3 into byebyeAgmKeys
2015-01-24 15:34:48 -03:00
Nicolás Badano
30b97d7b6b
common: removed commented stuff
2015-01-24 15:34:27 -03:00
Nicolás Badano
33485f6d3f
common: remove AGM key handling routines and remaining stuff from AGM options menu
2015-01-24 15:32:06 -03:00
Nicolás Badano
be550836ea
common: remove AGM key handling routines and remaining stuff from AGM options menu
2015-01-24 15:25:03 -03:00
Thomas Kooi
8d34f98909
Moved relevant functions from common to medical.
...
Removed unnecessary event function.
2015-01-24 17:18:38 +01:00
PabstMirror
75c87dfd9b
Option Menu Tweaks
2015-01-23 02:43:43 -06:00
Thomas Kooi
5234bb984f
Fixed default debug values
2015-01-22 23:49:04 +01:00
PabstMirror
cb561a2d93
Convert Old Ace_Options
2015-01-21 18:19:10 -06:00
PabstMirror
2b62c170fd
Read from config
2015-01-21 17:29:42 -06:00
Thomas Kooi
bbf9ce61f0
Changed QGVAR(isDead) to ACE_isDead
...
Minor improvements to debug function
2015-01-21 15:52:11 +01:00
Thomas Kooi
a92430b701
Added events to carry object.
2015-01-20 18:57:53 +01:00
PabstMirror
aec687f007
#78 - targetEvent working in SP
2015-01-20 03:54:34 -06:00
Nicolás Badano
06743bef52
interaction: fix canInteract and exceptions in agm menu
2015-01-20 02:58:06 -03:00
commy2
97ee63a349
getting PFH to work on briefing screen, review
2015-01-19 17:47:52 +01:00
Glowbal
b80cec4c18
Merge pull request #45 from KoffeinFlummi/csePort_fixed
...
Port from CSE Common.
2015-01-18 20:12:18 +01:00
Thomas Kooi
8dfdd11f3c
Changed tabs to 4 spaces
2015-01-18 20:09:19 +01:00
Thomas Kooi
86663e8a8e
Changed disableUserInput_f to setDisableUserInputStatus.
2015-01-18 19:54:43 +01:00
Nicolás Badano
d532caf1a0
fix execNextFrame ( #56 )
2015-01-18 15:26:26 -03:00
Thomas Kooi
63c024bc79
Fixed undefined variable script error
2015-01-18 16:31:40 +01:00
commy2
e67602d76e
port movement
2015-01-18 06:45:28 +01:00
Nicolás Badano
c851a14da9
common: added execNextFrame function
2015-01-17 13:56:24 -03:00
Nicolás Badano
4926b6970b
fixes typos
2015-01-17 13:45:56 -03:00
Nicolás Badano
f165030e3b
common: remove the support for code as string
2015-01-17 12:23:03 -03:00
Thomas Kooi
748f4f30be
Removed throw for consistency. Not used anywhere else.
2015-01-17 14:26:50 +01:00
Thomas Kooi
42c90074cb
Removed duplicate limitSpeed. Already present in vehicles pbo
2015-01-17 14:20:49 +01:00
Thomas Kooi
cdc2373872
Removed foreachDo
2015-01-17 14:14:12 +01:00
Thomas Kooi
781ebaca95
Changed StateUnconscious to "ACE_isUnconscious"
2015-01-17 14:13:37 +01:00
Thomas Kooi
7345cf91cf
Minor code clean up
2015-01-17 13:54:44 +01:00
Thomas Kooi
eaa44fce6f
Changed some spawns to call
2015-01-17 13:38:26 +01:00
Thomas Kooi
a8e257f7ab
Changed setDead to no longer use spawn.
2015-01-17 13:35:15 +01:00
Thomas Kooi
d42b83947d
Fixed script errors in limit speed functions (missing [)
2015-01-17 13:35:03 +01:00
Thomas Kooi
38947ba669
Moved sendDisplay & sendMessage functions to GUI instead of common.
2015-01-17 13:03:51 +01:00
Thomas Kooi
e5579f1c32
Removed spawn usage from limit movement speed functions
2015-01-17 12:53:23 +01:00
Glowbal
041a4fccc5
Removed CSE text
...
Changed set count to pushback.
2015-01-17 12:42:10 +01:00
Glowbal
31f0b80659
Fixed CBA macro mistake
2015-01-17 12:40:06 +01:00
Glowbal
6e4a12ff4d
Fixed CBA macro mistake
...
Fixed an CBA macro mistake.
2015-01-17 12:39:33 +01:00
Thomas Kooi
83128ad3d2
Fixed minor issues with unconscious & blackout effect.
...
Fixed error in XEH_postInit
2015-01-17 12:35:59 +01:00
Thomas Kooi
8a61f5fbb5
Changed setUnconsciousState to no longer use spawn.
2015-01-17 12:08:11 +01:00
Thomas Kooi
a77082e4f7
Made functions compatible with removed/renamed functions.
2015-01-17 12:07:41 +01:00
Thomas Kooi
45284c7855
Changed customEventHandler_f to raiseScriptedEvent_f
...
Should be replaced by the ACE eventhandler at a later stage.
2015-01-17 12:07:03 +01:00
Thomas Kooi
6509491c19
Removed duplicate functions
2015-01-17 12:06:03 +01:00
Nicolás Badano
2f4f6f3161
common: add waitAndExecute function
2015-01-17 02:58:24 -03:00
Nou
82d7f4bd5c
Typo! Closes #46
2015-01-16 17:12:37 -08:00
Thomas Kooi
afc103a946
Added CSE common port.
2015-01-17 00:21:47 +01:00
commy2
7678193ca1
remove obsolete stuff
2015-01-16 23:49:29 +01:00
commy2
cd533abd6f
inventoryDisplayLoaded eh
2015-01-16 23:48:30 +01:00
commy2
d66b78bdd5
infoDisplayChanged via addEventHandler
2015-01-16 23:13:51 +01:00
Nicolás Badano
5f1a6c40e3
common: raise more local ACE events
2015-01-16 17:16:42 -03:00
Nicolás Badano
9654d3b36d
ACE events fixes
2015-01-16 16:30:48 -03:00
Nicolás Badano
26325bb943
Throw the zeusDisplayChanged ACE event
2015-01-16 15:39:38 -03:00
Nicolás Badano
223600e689
Throw the playerVisionModeChanged ACE event
2015-01-16 15:39:19 -03:00
Nicolás Badano
8b3c70a16d
Add PFH to throw the playerInventoryChanged ACE event
2015-01-16 15:28:37 -03:00
Nicolás Badano
8467013c1a
Moved getAllGear function to common module
2015-01-16 15:24:25 -03:00
Nicolás Badano
34135ffdd4
common: ACE local event for playerChanged
2015-01-16 12:14:18 -03:00
Nicolás Badano
60270d5415
Change the loop that updates ACE_player from BIS to PFH
2015-01-16 11:30:49 -03:00
commy2
fac9b2f4f4
menu fixes
2015-01-16 14:35:19 +01:00
Nicolás Badano
8f31dea752
common: various fixes. Fix #33
2015-01-15 14:41:22 -03:00
Nou
d281caffbe
Added ACRE2's hash and hash lists.
2015-01-14 13:29:52 -08:00
Nou
5c039a4ffd
Variable misnamed for event holder!
2015-01-14 12:55:44 -08:00
Nou
9a37538d50
More event handler changes! Added removeEventHandler and removeAllEventHandler, changed name from addNetEventHandler to addEventHandler, and added a localEvent function.
2015-01-14 12:44:32 -08:00
PabstMirror
614dced0fa
DEBUG_SETTINGS in script comps
2015-01-14 12:34:24 -06:00
commy2
9c99eee461
port ballistics
2015-01-14 04:02:48 +01:00
Nou
f275969465
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-01-13 15:27:49 -08:00
Nou
f90b23b4f6
Added network event handlers, ref ticket #12 .
2015-01-13 15:27:42 -08:00
commy2
46a0fc5631
more macros for common
2015-01-13 22:32:56 +01:00
commy2
e071b2f684
fix macros in common' config
2015-01-13 20:56:02 +01:00
commy2
b7050a4a92
fixing macros
2015-01-13 19:31:26 +01:00
commy2
2336b51e5b
fix key input not working
2015-01-13 17:42:56 +01:00
commy2
039ae01594
fix some sqf errors
2015-01-13 17:08:49 +01:00
jaynus
3fb2a8e245
big code clean up
2015-01-12 21:14:27 -08:00
commy2
cf8259882e
formating
2015-01-12 22:34:01 +01:00
commy2
72e3d7519b
formating
2015-01-12 20:27:43 +01:00
commy2
1ea2afaec5
some macros
2015-01-12 20:11:36 +01:00
commy2
7954988130
rename core to common
2015-01-12 19:22:58 +01:00
