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
11,781 Commits 73 Branches 88 Tags 752 MiB
7cfb2b865c
Commit Graph

51 Commits

Author SHA1 Message Date
Dedmen Miller
81e02a7336 Refactor private ARRAY to private keyword (#5598) 
* Everything

* Fixed missing ;

* Fix missing ; and double private

* Fixed cannot isNull on number

* Turn _temparture back to isNil

* Fix error from merge
 2017-10-10 09:39:59 -05:00
jonpas
e11e102a76 Underwater actions support (#4984) 
* Enable majority of actions underwater

* Remove log

* Add logistics_wirecutter support (don't play kneel animations underwater - looks silly)

* Don't perform kneel animations when repairing or medicaling underwater

* Fix interaction menu rendering underwater (was moving based on player eye level due to height max used for large vehicles)

* Fix attach underwater (LIW does not work underwater, LIS does), Add attach scan drawing define

* Remove left-over systemChat

* Remove vehiclelock from Plane, Disallow linking belt underwater, Allow checking ammo when sitting via action (was already possible via keybind), Use param for LIS
 2017-08-22 13:30:56 -05:00
Phyma
ffaa195fe5 Conform function headers to coding guidelines (#5255) 
* Fixed headers to work with silentspike python script

* Fixed rest of the files

* Fixed ace-team
 2017-06-08 15:31:51 +02:00
PabstMirror
a320a56813 Fix blood bags not showing in medical menu (#4351) 
fix #4306
 2016-09-06 21:52:22 +02:00
Glowbal
b489750d5b Minor optimizations using private, params, and isEqualType (#4323) 
* Optimizations with private, params, and isEqualType

* Fixed tab being used instead of space

* Fixed tabs inserted by notepad++

* More usage of new private syntax and params

- changed a few checks for an array being empty to `_arr isEqualTo []`
rather than `count _arr == 0`
- added more uses of `private` on the same line as the variable is
declared
- added more uses of params to assign variables passed as parameters
- removed unnecessary parentheses
- removed several unnecessary variable declarations with private array
syntax

* clean up and formatting
 2016-09-04 16:44:22 +02:00
Glowbal
295ad3b037 Merge branch 'medical-impr' into merge-basic-and-advanced 2016-06-13 14:32:15 +02:00
Glowbal
fd108478fe Clean up medical menu privates 2016-06-13 12:49:35 +02:00
Glowbal
d568041838 Change medical menu to work with basic medical injury overhaul 2016-06-13 12:19:19 +02:00
SilentSpike
90ebf9638b Update common event names to meet new standard 2016-06-04 11:12:56 +01:00
Glowbal
694503c01b Fix medical events 2016-06-03 20:57:21 +02:00
Glowbal
fa2cf55156 Fix medical related events 2016-06-03 20:22:34 +02:00
jonpas
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +02:00
commy2
7512c4e52e manual merge 2016-05-30 21:14:34 +02:00
SilentSpike
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01:00
SilentSpike
108ff4f644 Replace ACE event system calls with CBA counterparts 
Regex used:

\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent

E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event

E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
 2016-05-22 16:47:39 +01:00
jonpas
e7dbcd7b58 Replace delayed execution functions with new CBA counterparts 2016-05-22 15:29:01 +02:00
commy2
467075ad67 replace timePFH with CBA_missionTime 2016-03-02 11:01:39 +01:00
Thomas Kooi
4f10d551d6 Merge pull request #2949 from gienkov/fixWoundCount 
ceil number of wounds
 2016-02-20 16:56:17 +01:00
PabstMirror
fb0738bd30 Merge branch 'master' into release 2015-12-31 20:27:26 -06:00
PabstMirror
74aec45921 Fix medical menu not closing on range, litter dir 
- Medical Menu didn't close when target moved out of range
- Litter was always created in the same direction
 2015-12-19 20:50:57 -06:00
gienkov
1132efaf48 ceil number of wounds 2015-12-06 02:57:21 +01:00
commy2
5a1aae6028 manual merge 2015-11-30 17:44:15 +01:00
commy2
a9ebcf8543 fix setVariable and getVariable capitalization 2015-11-30 17:27:09 +01:00
commy2
b3950bd7f0 fix forEach capitalization 2015-11-30 17:23:48 +01:00
commy2
5e41643cff fix pushBack capitalization 2015-11-30 17:21:28 +01:00
commy2
34d351c652 fix exitWith capitalization 2015-11-30 17:14:05 +01:00
PabstMirror
69b53af1d3 1.54 - Replace typeName with isEqualType 2015-11-20 11:40:31 -06:00
commy2
a57d1bca75 replace local keyword with private 2015-11-17 17:43:07 +01:00
PabstMirror
c326bc2f87 #2772 - Display basicMed wounds for AI in mixed mode 2015-11-06 01:05:25 -06:00
PabstMirror
680f52cd27 Handle Distance when mounted 2015-10-13 13:40:16 -05:00
PabstMirror
8ffe1b4e01 #2528 (2) - Integrate Dragging 2015-10-13 02:20:19 -05:00
PabstMirror
ad1191cdd5 #2528 - Medical Menu Work 
(1) Verify target is valid and in reasonable range
 2015-10-13 02:01:59 -05:00
PabstMirror
b0b755720c #2672 - Use ACE_gameTime for triage card 2015-10-03 12:28:54 -05:00
PabstMirror
c62ea5e406 Fix some nil functions 2015-09-18 13:47:19 -05:00
jokoho48
c70c9cdee6 Add Screen Blur and Blackout for Medical Menu by Interact_menu setting 2015-09-05 12:49:23 +02:00
Glowbal
25a75b9f69 fixed incorrect macro usage 2015-09-05 12:35:48 +02:00
Glowbal
85dc59d66c Fixed: should only display "no injuries" when there are no injuries. Not the other way around 2015-09-05 11:57:41 +02:00
Glowbal
130569c485 Made basic medical bleeding information work with new damage system 2015-09-05 11:57:17 +02:00
jokoho48
4d81e4a99e Code Cleanup Medical Menu Module. 2015-08-22 22:33:15 +02:00
Glowbal
bf8318530e Merge pull request #2081 from acemod/close-med-menus-distance 
Fixed #1893 - Menu closes when patient is more as 10 meters away
 2015-08-21 14:20:41 +02:00
nsgundy
3aab62fa7c Return true / false if event was handled so that CBA keybinding doesn't have a reason to complain. 
Converted tabs to spaces
 2015-08-19 15:32:46 -03: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
Glowbal
3cac137851 Fixed #1893 - Menu closes when patient is more as 10 meters away 2015-08-09 09:14:42 +02:00
Glowbal
696546de5c Finalized ACE medical menu settings 2015-08-08 20:22:19 +02:00
Glowbal
4c7bcbb6fe Added triage card display 2015-08-08 18:29:30 +02:00
Glowbal
d7db2e159c Split up into activity and quick view logs 2015-08-07 19:11:27 +02:00
Glowbal
471e8d27df Fixed clean up 2015-08-07 19:11:10 +02:00
Michael Braun
5f313c75d5 Cleanup of medical_menu 2015-08-07 05:37:41 +02:00
Glowbal
9b380315e5 First working version of the medical menu 2015-08-06 23:51:17 +02:00