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
10,571 Commits 73 Branches 88 Tags 752 MiB
a6ae9047f6
Commit Graph

221 Commits

Author SHA1 Message Date
PabstMirror
eb08149946 Merge branch 'master' into doAnimEvents 2016-02-22 12:27:07 -06:00
commy2
f43e88ff25 replace zeusDisplayChanged with DisplayLoad event 2016-02-21 22:16:12 +01:00
commy2
e9808bf20b remove unused PFH check 2016-02-21 20:42:06 +01:00
commy2
5e486869c0 replace mainDisplayLoaded event with DisplayLoad XEH and add ACE version to main menu (CBA help) 2016-02-21 20:26:30 +01:00
PabstMirror
cb33666091 ObjectEvent Func, swap execRemoteFnc in doAnim 
#3370
 2016-02-21 11:08:07 -06:00
esteldunedain
88eae19646 Replace execRemoteFnc in ace_medical 2016-02-17 22:54:43 -03:00
PabstMirror
7e84a9d9b0 Add getter, readd old public funcs, add blockSprint 2016-01-19 09:39:06 -06:00
PabstMirror
9a3972de76 Unified Status Effect Handler 2016-01-19 09:39:05 -06:00
commy2
abf516aeb1 manual merge 2016-01-06 15:57:09 +01:00
PabstMirror
586449eef9 Merge pull request #3084 from acemod/cbaZeusIntegration 
CBA zeus integration
 2015-12-31 15:15:23 -06:00
PabstMirror
72fe95c797 Add "isNotInZeus" to canInteractWith 
Re-fix #1951 (CTRL+V from climb blocking paste in zeus)
 2015-12-30 01:48:43 -06:00
PabstMirror
1e29c0286f Remove Keybinds/Events for Zeus now handeld in CBA 
Close #2937
 2015-12-30 01:07:55 -06:00
PabstMirror
9b0641c06f Add nil return for count 2015-12-19 21:17:36 -06:00
PabstMirror
c53a0541a4 Add support for non local Zeus RC in common-isPlayer 2015-12-18 11:08:10 -06:00
commy2
e6be1537cd replace more private with private keyword in common 2015-12-14 13:17:48 +01:00
PabstMirror
91ace4fc9b Fix whitelist string -> array error in checkPbo 
Fix #2913
Use splitString instead of call compile to convert string into an array
 2015-12-02 23:58:41 -06:00
SilentSpike
c731d83642 Merge pull request #2848 from acemod/fixForEachDeleteAt 
fix Issue with forEach Loops and deleteAt Index
 2015-11-25 14:00:37 +00:00
PabstMirror
36bf2d9cb5 Merge pull request #2803 from BaerMitUmlaut/remove-team-synching 
Remove manual team synching
 2015-11-24 21:37:50 -06:00
SilentSpike
d1dff4a24a Merge branch 'master' into fixForEachDeleteAt 
# Conflicts:
#	addons/common/XEH_postInit.sqf
 2015-11-18 13:27:04 +00:00
SilentSpike
49d4f233d9 Revert commit a718c82780 2015-11-18 13:19:12 +00:00
PabstMirror
896615beb1 Merge pull request #2826 from acemod/settingsParamsArray 
Read settings from paramsArray (params in description.ext)
 2015-11-17 14:01:16 -06:00
PabstMirror
5823749f0c Merge branch 'master' into settingsErrorChecking 2015-11-17 14:00:22 -06:00
commy2
a57d1bca75 replace local keyword with private 2015-11-17 17:43:07 +01:00
SilentSpike
a718c82780 Implement nice index deletion iteration solution 
Previously when iterating over an array and modifying the same array via deletion of the current index, incorrect means was used to account for the change in index resulting in any further deletions being applied to the wrong elements.

This solution does not require duplication of the array or the use of external variables to track the number of deleted elements. We simply lower the `_forEachIndex` by 1 whenever an element is removed.
 2015-11-17 16:02:56 +00:00
jokoho48
561f6126dc fix missing bracket 2015-11-17 13:34:34 +01:00
jokoho48
f3c5c64390 fix Issue with forEach Loops and deleteAt Index 2015-11-17 04:31:17 +01:00
PabstMirror
e0506f29bc Read settings from paramsArray (params in description.ext) 
for now just limited to SCALAR/BOOL
 2015-11-06 20:46:06 -06:00
BaerMitUmlaut
8f473b4a27 Removed all assignTeam occurrences 2015-10-30 16:50:13 +01:00
PabstMirror
16180686d2 PV GVAR(settings) after modules, add error debug 2015-10-18 18:49:03 -05:00
PabstMirror
616bc9f8a0 local-private waitAndXX PFEH 2015-10-04 11:38:31 -05:00
commy2
040a63bd8f Merge pull request #2254 from acemod/waitUntilAndExecute 
Add WaitUntilAndExecute Function
 2015-10-04 11:45:54 +02:00
commy2
a2b6166aa0 optimization waitUntilAndExecute, add comments 2015-10-04 11:43:13 +02:00
commy2
1fdedb5785 delay scroll wheel init 2015-09-30 19:29:17 +02:00
PabstMirror
6e24d2868c Fix playerChanged event 2015-09-28 22:41:45 -05:00
commy2
bc8cefa5e7 manual merge 2015-09-28 21:06:40 +02:00
commy2
34793ce044 Merge pull request #2635 from acemod/340interactcleanup 
Code Cleanup Interaction
 2015-09-28 21:04:28 +02:00
commy2
9189148b3f more interaction cleanup 2015-09-28 15:37:18 +02:00
commy2
4b536425b1 Code Cleanup Interaction 2015-09-28 14:36:51 +02:00
commy2
a078d73230 Code Cleanup WeaponSelect 2015-09-27 08:51:42 +02:00
commy2
2fe142032e rework modifier key, cleanup sandbags, tripod, ladder, fix #2590 2015-09-26 03:16:55 +02:00
jokoho48
998fbcc403 Merge remote-tracking branch 'remotes/acemod/master' into waitUntilAndExecute 
Conflicts:
	addons/common/XEH_postInit.sqf
 2015-09-25 13:19:19 +02:00
commy2
8503d15c9b more common code cleanup 2015-09-21 18:37:19 +02:00
commy2
1a4ebdac51 more common code cleanup 2015-09-21 17:32:21 +02:00
commy2
13b487e13b fix missing ; 2015-09-21 17:13:28 +02:00
commy2
b5b5c761c4 fix missing '' in info log macro 2015-09-21 17:09:10 +02:00
commy2
3037181fc2 more common code cleanup 2015-09-21 17:00:53 +02:00
Michael Braun
a5fb09a7e1 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros 
Conflicts:
	addons/repair/functions/fnc_moduleRepairSettings.sqf
 2015-09-09 02:55:12 +02:00
PabstMirror
024dc3effe Cleanup 2015-09-03 00:16:48 -05:00
PabstMirror
789de9d111 runAfterSettingsInit helper func 2015-09-03 00:11:49 -05:00
PabstMirror
cbccd898ea Run functions after setting init 2015-09-02 23:58:24 -05:00
Michael Braun
035b3432c5 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros 
Conflicts:
	addons/common/XEH_postInit.sqf
 2015-09-01 08:45:59 +02:00
commy2
80a0c93bdc Merge pull request #2316 from acemod/322customcamera 
fix custom cameras (for intros) being broken with ACE, fix #2248
 2015-08-31 21:32:02 +02:00
PabstMirror
4be7411a05 Use "visibleMapChanged" event 2015-08-30 15:26:43 -05:00
commy2
74dfd73167 fix issues with pip optics camera in virtual arsenal 2015-08-30 19:05:35 +02:00
PabstMirror
f67809b18c Merge branch 'master' into mapOpenCloseEvents 2015-08-29 16:43:24 -05:00
Michael Braun
657157d767 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros 
Conflicts:
	addons/hearing/functions/fnc_moduleHearing.sqf
 2015-08-29 22:38:26 +02:00
jokoho48
588f5adce8 fix math issue 2015-08-29 14:54:42 +02:00
PabstMirror
bc016eac4c 1.50 - use new didJip command (Ref #2241) 2015-08-26 22:39:27 -05:00
Michael Braun
5047d4de1c Switched to ACE_LOG<LEVEL>_# variation 2015-08-26 17:39:44 +02:00
Michael Braun
097506076f Fixed format usage in macros requiring ARR_# for it to work 2015-08-26 16:48:55 +02:00
Michael Braun
9e10aa86d7 Standardize logging format through ACE_LOG macros 2015-08-26 15:32:54 +02:00
Glowbal
13740c06e4 Merge pull request #1816 from voiperr/ace_map_dev 
Flashlight simulation on map
 2015-08-26 09:01:30 +02:00
PabstMirror
275f04d876 preInit defines and fix func name 2015-08-25 13:18:59 -05:00
voiper
9de7953345 More cba capitalisation. 2015-08-24 14:12:04 -07:00
voiper
79e6ce3803 Fixed CBA capitalisation. 2015-08-24 14:02:55 -07:00
jokoho48
203c4d8a6c add WaitUntilAndExecute 2015-08-24 17:10:54 +02:00
PabstMirror
4a245bd935 Remove Spawn for CBA_fnc_addPerFrameHandler 2015-08-17 22:21:18 -05:00
PabstMirror
980fc7a235 Merge branch 'master' into mapOpenCloseEvents 2015-08-17 21:08:07 -05:00
PabstMirror
a7ad6dafc9 Remove PFEH hack 2015-08-13 14:09:25 -05:00
voiper
f676f605f3 Fix 00000101. 2015-08-11 11:18:54 -07:00
voiper
4aa28368ad Git fix numero 5. 2015-08-11 11:10:42 -07:00
Michael Braun
d9eb7a3d2c Added localizations for keybinding categories 2015-08-07 05:48:51 +02:00
PabstMirror
e45bd43e5e CreateLitter / syncEvents performance fixes 2015-08-06 00:28:43 -05:00
Glowbal
275b0c4300 Merge branch 'release' 
Conflicts:
	README.md
	addons/finger/stringtable.xml
 2015-08-04 22:29:05 +02:00
PabstMirror
b3741f4036 Capitalization for macro CBA_fnc_addPerFrameHandler 2015-08-04 02:34:38 -05:00
ViperMaul
876a039e36 Disable headbugfix for Handcuffed/Surrender,unconscious,water surface and log the situation locally and on server. 2015-08-01 18:01:35 -07:00
PabstMirror
b47a17230b Merge branch 'master' into 10digitGrids2 2015-07-16 17:26:19 -05:00
SilentSpike
d036639b46 Adding hideUnit functions to ace_common 2015-07-03 02:14:58 +01:00
PabstMirror
c1dd2df57a Move grid funcs and map long,lat,altitude to common 2015-06-30 12:26:51 -05:00
PabstMirror
fde8f7383f Map Opened/Closed Events + use in maptools 2015-06-28 13:08:47 -05:00
jonpas
f61066f11a Fixed checkPBO function not executing on server 2015-06-15 19:55:30 +02:00
ViperMaul
1322da5537 Merge pull request #1587 from acemod/fixVehicleUnconcious 
fix animation and consistently unload units from vehicle
 2015-06-13 12:44:34 -07:00
PabstMirror
6ab8b129fa Merge branch 'master' into multipleDevices 
Conflicts:
	addons/common/XEH_postInit.sqf
 2015-06-13 12:30:35 -05:00
PabstMirror
177f590dda Make "InitSettingsFromModules" pfeh run on dedicated 2015-06-12 22:57:01 -05:00
PabstMirror
1804c6ceab Merge branch 'master' into serverModulesFirst 2015-06-12 22:40:04 -05:00
ViperMaul
072f2cc3a7 fix animation and consistently unload units from vehicle 
#1575 and #1577
 2015-06-11 15:56:11 -07:00
PabstMirror
3e396b416a One PFEH for execNextFrame and waitAndExec 2015-06-11 02:45:42 -05:00
PabstMirror
8abd488a43 Read server modules before "SettingsInitialized" on clients 2015-06-09 01:27:59 -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
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
PabstMirror
d7d225cebc Send waiting debug msg only once 2015-05-30 01:28:15 -05: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
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
esteldunedain
39fec12528 Merge branch 'master' into reliableSettings 2015-05-27 12:09:06 -03:00
jaynus
c924baefd7 All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07: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