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
6,443 Commits 73 Branches 88 Tags 752 MiB
539fc69275
Commit Graph

6443 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jonpas
539fc69275 Increased interaction distance to 7 (same as attach) to cover bigger vehicles 2015-08-17 01:58:52 +02:00
jonpas
9ad8718762 Added canCheckFuel for check fuel condition, removed extra spaces 2015-08-17 01:57:05 +02:00
jonpas
4dc8747430 Bypassed interaction menu subactions distance bug 2015-08-17 01:44:47 +02:00
jonpas
68370f63d7 Fixed returnNozzle function, Moved Return action up 2015-08-17 01:24:45 +02:00
jonpas
68489c456e Alphabetized PREPs 2015-08-17 01:12:47 +02:00
jonpas
40eb5a5ba9 Made return nozzle bypass connect-attach 2015-08-17 01:12:14 +02:00
jonpas
b717ff8dde Fixed interaction menu overwrapping, Moved all actions under one main Refuel action, Changed fuel nozzle pickup action to config 2015-08-17 00:55:26 +02:00
IngoKauffmann
214c639839 Added module icon 2015-08-15 23:38:08 +02:00
IngoKauffmann
a576ed82ee Fixed some macro stuff 2015-08-15 19:26:26 +02:00
IngoKauffmann
94a5b38cf6 Renamed an interaction 2015-08-15 17:24:11 +02:00
IngoKauffmann
67091a7aeb Added real fuel amounts 
Some are best guesses though
 2015-08-15 16:49:57 +02:00
IngoKauffmann
6dc5050dc3 Missed one return type 2015-08-14 03:21:16 +02:00
IngoKauffmann
de500fb80b First batch of fixes 2015-08-14 03:18:54 +02:00
IngoKauffmann
7d75f9cd2c Initial draft 2015-08-13 19:33:55 +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