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
13,599 Commits 73 Branches 88 Tags 752 MiB
12cb0993cf
Commit Graph

152 Commits

Author SHA1 Message Date
commy2
89ecc81111 convert common events to CBA playerEvents 2016-06-22 01:39:20 +02:00
BaerMitUmlaut
88b58216ee Added beautified component names 2016-06-20 11:44:36 +02:00
commy2
c481ddedaf add 'name' to components 2016-06-19 09:38:39 +02:00
SilentSpike
90ebf9638b Update common event names to meet new standard 2016-06-04 11:12:56 +01:00
SilentSpike
9e4fd77745 Update common event names to meet new standard 2016-06-03 22:39:43 +01:00
PabstMirror
d7f9c52c2f Merge branch 'master' into cbaEventSystem 2016-06-02 19:29:30 -05:00
PabstMirror
b949440eb1 Goggles - Fix script error from CBA_fnc_waitAndExecute 2016-06-01 17:27:55 -05:00
jonpas
95573ee711 Stringtable URL (#3855) 
* Move url into stringtable to display it properly, Add some missing author and url entries

* Fix main

* Remove duplicate author
 2016-06-01 23:45:51 +02:00
jonpas
1354826d56 Put semi-colon to the correct place 2016-06-01 14:11:32 +02:00
jonpas
1331265e65 Move url into a macro 2016-06-01 13:49:10 +02:00
jonpas
6730d016c2 Convert CfgPatches to new Eden format and CBA 2.4.1 compatibility 2016-06-01 13:27:02 +02:00
jonpas
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +02:00
commy2
fd26e2e44e Merge pull request #3516 from acemod/cbamissiontime 
replace timePFH with CBA_missionTime
 2016-05-30 21:23:57 +02:00
commy2
7512c4e52e manual merge 2016-05-30 21:14:34 +02:00
jonpas
7a307393a4 Merge branch 'master' into useQuotedPathMacros 2016-05-30 21:14:17 +02:00
jonpas
b54d1985f1 QGVAR and fix gforces, goggles, grenades, hearing, interact_menu 2016-05-25 01:57:41 +02:00
SilentSpike
207d6612da Remove duplicate ACE_newEvents entries 2016-05-24 15:06:17 +01:00
SilentSpike
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01:00
SilentSpike
108ff4f644 Replace ACE event system calls with CBA counterparts 
Regex used:

\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent

E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event

E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
 2016-05-22 16:47:39 +01:00
jonpas
e7dbcd7b58 Replace delayed execution functions with new CBA counterparts 2016-05-22 15:29:01 +02:00
commy2
da70854568 manual merge 2016-05-18 11:48:27 +02:00
commy2
473149b8ca revert changes from other PR to make it compatible 2016-05-16 15:22:37 +02:00
commy2
c5275813a4 use 'getUnitLoadout' instead of 'FUNC(getAllGear)' and deprecate it 2016-05-14 10:49:09 +02:00
BaerMitUmlaut
7fcbe93b71 Cleaned up excessive whitespace 2016-05-03 02:32:44 +02:00
PabstMirror
2869a53e6d Googles - Only play wipe anim for primary weapon 
Close #3638
Animation only makes sense for primary weapon, so skip for others.
 2016-04-12 00:19:24 -05:00
jonpas
85b4366368 Use new QPATHTOF and QPATHTOEF macros 2016-04-08 20:34:50 +02:00
Alessandro Foresi
e97c7c0f65 Translation: IT completed (with BOM) 2016-03-27 21:22:15 +02:00
commy2
467075ad67 replace timePFH with CBA_missionTime 2016-03-02 11:01:39 +01:00
jonpas
7f022eda00 Replace Purista with Roboto - everywhere, close #3401 2016-02-24 15:06:27 +01:00
commy2
46a239f9f6 precompile on game start 2016-02-22 15:20:36 +01:00
ChairborneIT
0021bc08df Added translation for most Italian stringtable entries 2016-02-20 21:39:05 +01:00
esteldunedain
0b9695ce70 Apply the ufeh to ACE_Grenades 2016-02-06 17:20:30 -03:00
esteldunedain
ac3f75c8b4 Apply the ufeh to ACE_Goggles 2016-02-06 17:16:10 -03:00
esteldunedain
c87f19c8da Fix #3258 2016-02-04 10:04:26 -03:00
PabstMirror
46d6e92bca Add quick debug defines to all script_components 2016-01-28 23:26:02 -06:00
Glowbal
c042703786 Merge branch 'release' 2016-01-05 22:55:34 +01:00
PabstMirror
a72e07fcaa Goggles - change some events to be client only 
all these events have `if (_unit != ACE_player) exitWith {true};`
 2016-01-03 11:01:14 -06:00
commy2
3974c255a0 fix usage of deprectated fired XEH, fix #3088 2016-01-03 15:27:16 +01:00
PabstMirror
dc60860421 Fix Third Person Goggle Effect Not Displaying 
#3074
 2015-12-26 23:31:49 -06:00
PabstMirror
c2564de5ef Fix UBC for 1.54 
Soldiers no longer inherit hitpoints from CaManBase
Adds a macro to deal with them
 2015-11-20 23:27:29 -06:00
PabstMirror
ebbf2b373a goggles - prevent CBA PFEH warning 
fix "x\cba\addons\common\fnc_removePerFrameHandler.sqf:30","WARNING:
Invalid or not existing PFH ID."
 2015-11-17 23:44:50 -06:00
commy2
a57d1bca75 replace local keyword with private 2015-11-17 17:43:07 +01:00
commy2
945ec7a388 more goggles code cleanup 2015-09-30 01:31:45 +02:00
commy2
dc882a3c66 more goggles code cleanup 2015-09-30 01:26:08 +02:00
commy2
8d5ce1dbe2 more goggles code cleanup 2015-09-29 22:24:25 +02:00
commy2
62349f685c more goggles code cleanup 2015-09-29 22:01:40 +02:00
commy2
b7ce315240 more goggles code cleanup 2015-09-29 21:28:57 +02:00
commy2
d1aacf3fef more goggles code cleanup 2015-09-29 19:51:41 +02:00
commy2
53bfcdb61e more goggles code cleanup 2015-09-29 18:51:24 +02:00
commy2
d051d4c208 more goggles code cleanup 2015-09-29 17:57:09 +02:00
commy2
477e9f06b6 more goggles code cleanup 2015-09-29 17:09:23 +02:00
commy2
2731ac360a more goggles code cleanup 2015-09-29 16:56:10 +02:00
commy2
d25d79c485 Goggles Code refactoring initial commit 2015-09-29 16:22:57 +02:00
PabstMirror
9996aa22ab Replace googles - isTurnedOut 2015-09-21 15:03:34 -05:00
jokoho48
b7e02da1cc remove if (!hasInterface) from PFH 
move ! in ()
 2015-09-11 16:58:26 +02:00
jokoho48
defbdf1b1a fix that HC throw a issue if PPEffect was used/applyed 2015-09-09 17:05:48 +02:00
SilentSpike
397d77e5b5 Remove special goggles treatment of vehicle units 
The condition to disable the overlay for gunners introduces more problems (and inconsistencies for that matter) than it was worth. Vehicle gunners using camera based weapons should probably consider not wearing a pair of glasses/goggles before doing so.
 2015-08-31 15:25:40 +01:00
SilentSpike
543e829278 Fix goggles overlay for FFV seats 
When aiming down sights, view is considered to be "gunner" and so the overlay would be disabled. Introduces addition canUseWeapon check if view is "gunner" to differentiate FFV seats from regular gunner seats
 2015-08-31 14:56:51 +01:00
PabstMirror
b3741f4036 Capitalization for macro CBA_fnc_addPerFrameHandler 2015-08-04 02:34:38 -05:00
PabstMirror
fba457999e #1899 - Remove AV_ESS_blk config 2015-07-25 14:32:24 -05:00
jonpas
d934c25b78 Merge branch 'master' into macroSTR 
Conflicts:
	addons/interact_menu/ACE_Settings.hpp
 2015-05-30 19:54:32 +02:00
jonpas
763cb07629 Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
PabstMirror
236ae767b5 Goggles - Cache Surface Dust 2015-05-28 00:18:45 -05:00
jonpas
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
jaynus
c924baefd7 All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07:00
SAM
31adb5a9fc Second batch of settings files 2015-05-14 20:59:25 +02:00
commy2
b859956604 rename category ace <blank> to ace common 2015-05-01 10:19:47 +02:00
KoffeinFlummi
b472292b20 Remove tabler comments. 
sed is awesome.
 2015-04-26 21:05:41 +02:00
PabstMirror
caef5c105f More Privates 2015-04-17 22:40:37 -05:00
KoffeinFlummi
8b915380b7 Merge branch 'hungarian-merge' 2015-04-15 13:55:02 +02:00
KoffeinFlummi
ebcdafe610 Fix spelling of "isClientSetable" 2015-04-14 21:43:19 +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
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
KoffeinFlummi
c6efd4e546 Merge https://github.com/EpMAK/ACE3 into russian-merge 2015-04-12 05:39:46 +02: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
Kllrt
38adfbcb70 Added missing CZ strings and made little revision 2015-04-11 16:33:00 +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
Tenga
eec5f458db Count the commander camera as a 3rd person camera 2015-04-10 20:05:33 +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
EpMAK
fab5605ad5 Translation 
Russian translation of the texts
 2015-04-10 17:51:48 +03:00
jaynus
1bb6be5654 Cleaning up of all tabs in source code files. 2015-04-06 09:22:43 -07:00
PabstMirror
7173037cb0 Fix 2 broken keybinds 2015-03-10 12:45:08 -05:00
PabstMirror
4018742f26 Return False on keyUp Code 2015-03-05 02:51:24 -06:00
PabstMirror
0919e59719 Key Bind Redo (except vector) 2015-03-05 01:32:26 -06:00
Nicolás Badano
18fa6f9850 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into aceSettings 2015-02-03 17:48:24 -03:00
Nicolás Badano
173169bc3d Fix in goggles 2015-02-03 00:44:06 -03:00
Garth L-H de Wet
7acd7854b7 Updated headers of the goggles to be as required. 2015-02-02 11:04:53 +02:00
Nicolás Badano
96b7c0d30c ACE_Settings: replace all ACE_Options 2015-01-30 19:19:45 -03:00
PabstMirror
9631154926 Set ADDON variable in XEH_preInit 2015-01-29 01:38:46 -06:00
KoffeinFlummi
c407553d49 Add remaining READMEs, add helper script 2015-01-26 14:34:48 +01:00
PabstMirror
c07120c439 Fix Googles Macros 2015-01-25 00:55:35 -06:00
PabstMirror
8a27a49d31 #84 - goggles option error 2015-01-22 16:58:11 -06:00
PabstMirror
cb561a2d93 Convert Old Ace_Options 2015-01-21 18:19:10 -06:00
Garth L-H de Wet
2fe155f990 Converted a couple PFHs to use the waitAndExecute function as that is what they were doing. 
Fixed a couple bugs.
 2015-01-19 10:34:49 +02:00
Garth L-H de Wet
ef19ffad0c Glasses conditions are local to each unit. No longer global scope on each client. 2015-01-19 01:38:54 +02:00
Garth L-H de Wet
b499cc9a1d Rain effect is working as expected. 2015-01-19 01:12:45 +02:00
Garth L-H de Wet
10cdbeb4dd Made the glasses effects slowly fade (not completely away) over 30 seconds. 2015-01-19 01:04:32 +02:00
Garth L-H de Wet
49e19610c2 Removed a bunch of spawns and used PFH's in their place. 2015-01-19 00:57:39 +02:00