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
15,574 Commits 73 Branches 88 Tags 752 MiB
0983c9b3bb
Commit Graph

1607 Commits

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