Commit Graph

6417 Commits

Author SHA1 Message Date
Michael Braun
93acdbcb4d Replaced custom mapping implementation with ACE Hash 2015-08-24 22:45:59 +02:00
Michael Braun
2b0ef7bc6d Removed explicitly stated isClientSettable in Map Gestures ace settings 2015-08-24 22:10:02 +02:00
Michael Braun
3cbe6a3ebc Fixed multiple group settings not applying properly.
Added client configuration options for default colors.
2015-08-24 22:03:47 +02:00
Michael Braun
0ff5e86b52 Another missing semi-colon 2015-08-24 21:00:24 +02:00
Michael Braun
ee2cc22801 Added missing semicolon 2015-08-24 17:28:08 +02:00
Michael Braun
7217d5ec10 Various code cleanups and switch to player UIDs instead of sanitized names 2015-08-24 17:03:47 +02:00
Michael Braun
3646654ff3 Added module icons 2015-08-15 12:21:40 +02:00
Michael Braun
c3c39150a3 Improved handling of accessing dynamic variable names 2015-08-15 12:12:41 +02:00
Michael Braun
a315596c5a Fixed isValidColorArray returning true when array had the right size, but wrong datatypes/value ranges 2015-08-10 20:32:26 +02:00
Michael Braun
3e82391a36 Added validation and various fixes 2015-08-10 19:04:49 +02:00
Michael Braun
5287455c0b Fixed aborting data transmission on no owner id encounter 2015-08-10 17:07:01 +02:00
Michael Braun
5e4316d0e2 Fixed missing semi-colon 2015-08-10 16:43:33 +02:00
Michael Braun
5788705821 Fixed code style issues and added missing variable initialization in map_gestures 2015-08-10 15:24:57 +02:00
Michael Braun
b1d3654a97 Fixed owner id not getting assigned in map gestures 2015-08-10 14:54:28 +02:00
Michael Braun
90e4d005ee Give credit where credit is due 2015-08-10 08:45:43 +02:00
Michael Braun
a38cdda8e3 First iteration on implementing Dslyecxi's ST Map Gestures 2015-08-10 04:40:30 +02:00
Glowbal
2b3c936e99 count should be a foreach 2015-08-09 00:41:43 +02:00
Glowbal
02fdbe6fc2 Merge pull request #2053 from acemod/require-surrender-captive
Require surrender before arresting a unit
2015-08-09 00:26:05 +02:00
Glowbal
c7ac190f58 Finalized settings 2015-08-09 00:21:59 +02:00
Glowbal
54ad9d1444 Merge branch 'master' into require-surrender-captive 2015-08-08 23:21:00 +02:00
Glowbal
493254619c Merge pull request #2039 from acemod/medical-menu
Medical menu
2015-08-08 23:11:11 +02:00
Glowbal
f02a00ae69 Merge pull request #2058 from acemod/add-category-optionsmenu
Add category optionsmenu #852
2015-08-08 22:59:19 +02:00
PabstMirror
d5a3c66b89 Minor Spelllings Fixes 2015-08-08 14:17:03 -05:00
PabstMirror
3664afcf90 search_privates.py: use new params command 2015-08-08 13:42:05 -05:00
Glowbal
c0562aaf6c clean up debug messages 2015-08-08 20:31:19 +02:00
Glowbal
696546de5c Finalized ACE medical menu settings 2015-08-08 20:22:19 +02:00
PabstMirror
c6be0bbb8c Merge branch 'master' into add-category-optionsmenu
Conflicts:
	addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateList.sqf
	addons/optionsmenu/functions/fnc_settingsMenuUpdateList.sqf
2015-08-08 12:39:14 -05:00
PabstMirror
feceff2746 Polish the stringtable 2015-08-08 12:36:42 -05:00
PabstMirror
0719a3c1c6 Merge pull request #2055 from MikeMatrix/codeCleanupScopes
Code cleanup Scopes module
2015-08-08 11:42:40 -05:00
Glowbal
4c7bcbb6fe Added triage card display 2015-08-08 18:29:30 +02:00
PabstMirror
7fe6c2fe1b Merge pull request #2063 from jonpas/fixMissingString
Fixed missing string
2015-08-08 11:19:27 -05:00
PabstMirror
8e905af444 Merge pull request #1977 from acemod/attachClickCooldown
Mouse cooldown for click to interact option
2015-08-08 11:18:20 -05:00
Glowbal
31a5f8899b Changed default keybinding value to be H 2015-08-08 18:16:25 +02:00
PabstMirror
451c88c601 Merge pull request #2027 from acemod/joinGroupTeamManagement
EnableTeamManagement setting for joinGroup
2015-08-08 11:16:20 -05:00
Glowbal
bb79feeaf1 Clean up duplicate files 2015-08-08 18:16:11 +02:00
jonpas
8e3a961ee3 Fixed missing string 2015-08-08 18:11:28 +02:00
PabstMirror
7c7fb35cee Merge pull request #2036 from acemod/mapToolsOnOtherMaps
MapTools work on children of itemMap
2015-08-08 11:10:32 -05:00
Glowbal
054ac3443d Merge pull request #2062 from jonpas/removeDuplicatedStrings
Removed duplicated strings
2015-08-08 18:04:44 +02:00
jonpas
1aecd54fc3 Removed duplicated Enabled/Disabled/Yes/No/DoNotForce strings as they were moved to common 2015-08-08 18:02:20 +02:00
Glowbal
364e0455ee Merge branch 'master' into medical-menu 2015-08-08 17:55:43 +02:00
Glowbal
bd0593f8f4 fixed missing semi-column 2015-08-08 17:49:43 +02:00
Glowbal
be9726ba52 Merge pull request #1985 from acemod/hearingRingingModule
Add Ear Ringing setting to module
2015-08-08 17:44:11 +02:00
Glowbal
12f0808784 Merge branch 'master' into hearingRingingModule
Conflicts:
	addons/common/stringtable.xml
2015-08-08 17:42:18 +02:00
Glowbal
c69aa09d55 Merge pull request #2054 from MikeMatrix/codeCleanupSitting
Code cleanup of Sitting module
2015-08-08 17:00:07 +02:00
Glowbal
9fc94eefd9 Merge pull request #2006 from jokoho48/codeCleanupWinddeflection
Code cleanup Winddeflection module
2015-08-08 15:03:26 +02:00
Glowbal
a65495fb14 Merge pull request #2011 from jokoho48/codeCleanupBallistic
Code cleanup Ballistics module.
2015-08-08 15:00:08 +02:00
Glowbal
ff421db3df Merge pull request #1980 from MikeMatrix/headDirBasedWindIndication
Headdirection based wind indication
2015-08-08 14:51:37 +02:00
Glowbal
66f2dfa31e Merge pull request #2059 from MikeMatrix/documentationFixWeaponselect
Updated function documentation of Weaponselect
2015-08-08 14:45:28 +02:00
Michael Braun
e4a4a942d0 Updated function documentation of Weaponselect 2015-08-08 14:40:23 +02:00
Glowbal
65c06551a5 Merge pull request #1652 from gienkov/patch-22
Fix checking vitals anim
2015-08-08 14:32:36 +02:00