Commit Graph

6434 Commits

Author SHA1 Message Date
IngoKauffmann
3eaaca84fb Added different rearm levels 2015-08-16 02:18:53 +02:00
IngoKauffmann
957756893c Updated module icon 2015-08-15 23:35:05 +02:00
IngoKauffmann
a8c263b6cc More fixes
Thanks guys
2015-08-15 19:23:02 +02:00
IngoKauffmann
26c54b352a Fixed some logistics remnants 2015-08-15 19:00:28 +02:00
IngoKauffmann
0c4924259d Initial code 2015-08-15 18:43:13 +02:00
Glowbal
1a2b99c76c Merge pull request #2124 from acemod/originalToEnglish
replace <Original> with <English>
2015-08-12 10:32:12 +02:00
bux
3dc53ec492 replace <Original> with <English> 2015-08-12 10:25:37 +02:00
Glowbal
a36471eb71 Merge pull request #2123 from MikeMatrix/medicalMenuStringtableFix
Medical Menu stringtable.xml space invalidating xml structure
2015-08-12 10:10:18 +02:00
Michael Braun
58b697e292 Fixed missing space invalidating some xml parsers. 2015-08-12 10:06:45 +02:00
Glowbal
3a3dad9688 Merge pull request #2118 from jonpas/extrasClean
Moved slideshow module icon to proper location
2015-08-11 21:43:46 +02:00
jonpas
d3fda398cb Moved slideshow module icon to proper location 2015-08-11 21:36:26 +02:00
Glowbal
e5eaefafdb fixed #2097 - script error because of global variable in params 2015-08-10 09:51:14 +02:00
bux578
416d8dca6a and remove height
d'oh
2015-08-10 09:04:05 +02:00
bux578
1e32132cf9 add width to logo 2015-08-10 09:01:44 +02:00
Glowbal
0c2c71e70e Merge pull request #2056 from MikeMatrix/codeCleanupSandbag
Code cleanup of Sandbag module
2015-08-09 23:56:25 +02:00
PabstMirror
dc06927418 missing ; 2015-08-09 13:57:39 -05:00
PabstMirror
6755b8766a Merge pull request #2085 from jokoho48/codeCleanupDisposable
Code cleanup of Disposable module
2015-08-09 13:24:18 -05:00
Glowbal
2d7e057acd Merge pull request #2088 from acemod/fixes-medical-menu
Fixes for the medical menu
2015-08-09 20:14:20 +02:00
Glowbal
9c8a03b0b3 fixes #2070 - medication is not translated on activity log 2015-08-09 20:12:31 +02:00
Glowbal
aa4840d860 fixes #2075 - menu doesn't show which bodypart is selected on Basic medical 2015-08-09 20:08:45 +02:00
Glowbal
298f64a7bf fixes #2078
1. Fixed incorrect activity string for tourniquet
2. Fixed incorrect macro usage, should have grabbed variables from medical module.
2015-08-09 20:07:06 +02:00
jokoho48
fab0eee5dd corrected some small point 2015-08-09 15:28:11 +02:00
Glowbal
58fc69c2a6 Updated litter configuration. Closes #2002 2015-08-09 08:59:04 +02:00
jokoho48
b23f9c0de2 Code cleanup of Disposable module 2015-08-09 05:25:19 +02:00
PabstMirror
7624a459eb Merge pull request #2010 from jokoho48/codeCleanupInteractMenu
Code cleanup Interact_menu module
2015-08-08 21:35:54 -05:00
PabstMirror
95d88b920e #2079 - RemoveTourniquet doesn't require any items 2015-08-08 21:25:36 -05:00
PabstMirror
5628ce1bcd #2074 - Medical Menu Module not unique 2015-08-08 20:27:56 -05:00
PabstMirror
879826de8b Merge pull request #2077 from jonpas/fixNametagsString
Fixed incorrect string path in nametags
2015-08-08 19:58:52 -05:00
PabstMirror
c949daae1f OptionMenu C->LStrings 2015-08-08 19:57:57 -05:00
jonpas
7d36d80072 Fixed incorrect string path in nametags 2015-08-09 01:23:20 +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