Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,409 Commits 73 Branches 88 Tags 752 MiB
a315596c5a
Commit Graph

565 Commits

Author SHA1 Message Date
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