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
7,522 Commits 73 Branches 88 Tags 752 MiB
50046decf3
Commit Graph

7522 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SilentSpike
c30cb45bd6 Optimize spectator UI held key prevention system 2015-08-09 20:59:57 +01:00
PabstMirror
dc06927418 missing ; 2015-08-09 13:57:39 -05:00
PabstMirror
b57ca91f69 Merge branch 'master' into virtualExplosivesPlace 2015-08-09 13:45:51 -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
PabstMirror
207c002f3a params 2015-08-09 13:02:08 -05:00
PabstMirror
5723c5eaac Merge branch 'master' into addMainAction 2015-08-09 13:00:56 -05:00
jokoho48
fb56517099 Merge branch 'master' of https://github.com/acemod/ACE3 into repair 2015-08-09 18:58:02 +02:00
Glowbal
e4abf7c8cc added spare wheel to config 2015-08-09 18:26:49 +02:00
Glowbal
ed6a53a402 Attempt at repairing tracks. Improved repair wheel actions 2015-08-09 18:08:53 +02:00
Glowbal
872d026cd0 All repair actions are now functional 2015-08-09 17:23:32 +02:00
Glowbal
9adbb07367 Moved replace and repair wheel actions into the repair action framework 2015-08-09 15:53:52 +02:00
jokoho48
fab0eee5dd corrected some small point 2015-08-09 15:28:11 +02:00
jokoho48
79cf8dd98e Fixing Some Spelling 
Remove Some forgotten Commands
 2015-08-09 15:20:50 +02:00
jokoho48
323832474f Code cleanup of Dragging module 2015-08-09 14:53:13 +02:00
Glowbal
3cac137851 Fixed #1893 - Menu closes when patient is more as 10 meters away 2015-08-09 09:14:42 +02:00
Glowbal
58fc69c2a6 Updated litter configuration. Closes #2002 2015-08-09 08:59:04 +02:00
PabstMirror
ec97cd2edd Fix wheel texture 2015-08-09 01:58:49 -05:00
PabstMirror
4b603ff46f Localization, params 2015-08-09 01:54:44 -05:00
PabstMirror
0e17bebd23 Merge branch 'master' into repair 2015-08-09 00:33:08 -05:00
jokoho48
b23f9c0de2 Code cleanup of Disposable module 2015-08-09 05:25:19 +02:00
jokoho48
156609aab2 Code cleanup of Disarming module 2015-08-09 05:18:26 +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
gienkov
ce99404200 move english strings from original to english, remove original 2015-08-09 01:52:22 +02:00
gienkov
1c0a6fb457 PL translation of common, medical_menu, optionsmenu 2015-08-09 01:47:55 +02: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
gienkov
6bd4fcc4fd Fix stringtable error 2015-08-08 23:39:29 +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
SilentSpike
416d559354 Expand common isFeatureCameraActive function 
The function is currently only used by ace_goggles and it makes sense to expand it to detect if any common feature camera is active rather than just BI cameras
 2015-08-08 20:51:24 +01:00
PabstMirror
a6acff9178 Setting to disable hearing for zeus RC 2015-08-08 14:40:19 -05: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
SilentSpike
d294989cb0 Allow chat use on input disabled listen server 
Listen server technically doesn't have serverCommandAvailable.
 2015-08-08 19:11:41 +01:00
SilentSpike
182eef39de Adjust spectator camera pan and tilt with zoom 2015-08-08 18:41:38 +01: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