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
14,734 Commits 73 Branches 88 Tags 752 MiB
d64c09cbdd
Commit Graph

283 Commits

Author SHA1 Message Date
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
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
c27d84e382 Common Privates Redo 2015-05-14 17:12:40 -05:00
PabstMirror
043fee03bd Return Valid bool for keybind 2015-05-11 22:48:03 -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
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
67370f3340 Handles waking up 2015-04-30 20:49:38 +02: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
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
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
jaynus
f5705a91e6 oops. 2015-04-18 12:04:48 -07:00
Glowbal
54a70f26b1 Moved to own function. 2015-04-18 20:06:01 +02: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
jaynus
2be38c493c ACE JIP synchronized event infastructure. 2015-04-17 10:21:41 -07:00
commy2
54f29d75f5 functions to mute unit 2015-04-12 10:05:49 +02: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
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
PabstMirror
ec59397e4f Fix playerTurretChanged event 2015-04-02 11:15:31 -05:00
Nicolás Badano
1def2bd2b4 Fix bugs with interaction with vehicles and passengers 2015-03-31 18:09:29 -03:00
commy2
66c026d4a0 refueling the uav didn't work on UAVs local to server or HC 2015-03-28 00:30:51 +01:00
commy2
53a61eb001 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into mediccarry 2015-03-24 20:10:11 +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
commy2
4ea6b91e47 use eventhandlers instead of PFH 2015-03-18 15:42:33 +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
6d868d1bd1 fix collisions when releasing, fix crate fliping in buildings 2015-03-17 11:44:41 +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
4dab0b73d5 add conditions on post init 2015-03-15 09:26:16 +01:00
Glowbal
37031b5002 Replaced execRemoteFnc by ACE event system 2015-02-24 18:10:40 +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
1b9d0aa635 ACE_Settings: do not load client settings on dedi servers or HC 2015-02-08 18:29:49 -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
99cf0a75ee Merge branch 'master' of git@github.com:KoffeinFlummi/ACE3.git into aceSettings 2015-02-03 00:45:29 -03:00
Nicolás Badano
37199f2ba2 Load client setable settings from profile 2015-02-02 21:14:16 -03: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
Glowbal
c57cf88965 Merge pull request #85 from KoffeinFlummi/cse_medical_port 
PORT: CSE Medical
 2015-01-27 17:06:22 +01: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
Thomas Kooi
8d34f98909 Moved relevant functions from common to medical. 
Removed unnecessary event function.
 2015-01-24 17:18:38 +01:00
Thomas Kooi
bbf9ce61f0 Changed QGVAR(isDead) to ACE_isDead 
Minor improvements to debug function
 2015-01-21 15:52:11 +01: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
commy2
e67602d76e port movement 2015-01-18 06:45:28 +01:00
Thomas Kooi
781ebaca95 Changed StateUnconscious to "ACE_isUnconscious" 2015-01-17 14:13:37 +01:00
Thomas Kooi
a8e257f7ab Changed setDead to no longer use spawn. 2015-01-17 13:35:15 +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
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
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
34135ffdd4 common: ACE local event for playerChanged 2015-01-16 12:14:18 -03:00
Nou
f90b23b4f6 Added network event handlers, ref ticket #12. 2015-01-13 15:27:42 -08:00
commy2
e071b2f684 fix macros in common' config 2015-01-13 20:56:02 +01:00
commy2
cf8259882e formating 2015-01-12 22:34:01 +01:00
commy2
7954988130 rename core to common 2015-01-12 19:22:58 +01:00