Commit Graph

107 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