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
15,567 Commits 73 Branches 88 Tags 752 MiB
9d429b8be5
Commit Graph

207 Commits

Author SHA1 Message Date
PabstMirror
e7b7219bd9
Repair - Handle changes to getAllHitPointsDamage (#6250) 
Since 1.82 `getAllHitPointsDamage` returns lower case
Fix track repair and hit point groups being case sensitive
Part of #6248
 2018-04-12 09:15:57 -05:00
PabstMirror
5ea2069b76
Arma 1.82 compat (#6201) 
* Arma 1.82 compat

* Add tank to required addons
 2018-04-11 15:18:05 -05:00
Dystopian
64384280d0 Fix repair sound (#5706) 
* Fix repair sound

* tabs
 2017-11-29 13:36:48 -06:00
PabstMirror
cd30b09b4f Convert ACE_settings to CBA_settings (#4895) 
* Convert ACE_settings to CBA_settings

* Run Modules Globaly, BWC for SetSetting

* Add support for string settings

* ACE_ServerSettings warning

* Add handler for global setting being changed

* Add deprecated and replaced not to Settings Framework doc

* Remove options menu UI, Move Debug and HeadBug Fix to Options in Pause Menu

* Change modules scope to 1

* Disable debug
 2017-11-11 20:21:55 +01:00
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
711e1fc026 Fix Underwater interactions (magrepack, loading, refuel, medical legs, dragging) (#5521) 
* Fix Magazine Repack underwater - fix #5513
Also prevent common goKneeling function underwater

* Fix loading patients underwater - fix #5515

* Fix load object underwater

* Fix take nozzle on jerry can underwater

* Fix refuel underwater conditions further

* Use isTouchingGround, Make refuel semi-compatible
 reports false if head is out of the water, we want true even if we are not diving

* Less interact exceptions duplication

* Use animationState to determine if unit is swimming, create common function and use it instead of isTouchingGround

* Fix condition

* Support dragging underwater
No carrying due to animation timing issues and other misc things

* Allow Medical Legs SelfActions underwater

* Fix fixPosition function underwater (use getPosATL instead of getPos)

* Fix fixPosition's slope adjustment for non-gravity objects, Do the same for objects without simulation as well
 2017-10-01 13:38:11 -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
Vdauphin
c3986b0a04 Add optional parameter useEffects for damage (#5318) 
Since 1.67, you can  skip destruction effects if you want to. see  :
https://community.bistudio.com/wiki/setDamage and
https://community.bistudio.com/wiki/setHitPointDamage
This add an optional parameter  to ace_repair_fnc_setHitPointDamage to
allow this new choice
 2017-08-22 12:56:14 -05:00
Ozan Eğitmen
ff1247daef Change "Remove Wheel" Action's Color Based on Damage (#5415) 
* Change repair action's colors on wheels

* Add dots.
 2017-08-10 13:32:55 +02:00
PabstMirror
cb911c91ef Allow repairing from slingload pods (#5316) 2017-07-08 14:01:05 -05:00
PabstMirror
f33ff4e767 Repair - Handle depends = "0" (#5283) 
* Repair - Handle depends = "0"

* quote
 2017-06-22 22:58:00 -05:00
SilentSpike
a53f68a347 Use getUnitTrait for medics, engineers and EOD (#5246) 2017-06-10 11:41:01 +01:00
Ozan Eğitmen
225d15dcca Add Ability to Change Repair Times of Vehicles (#5205) 
* Add ability to change repair time based on vehicle

* Much better

* Unary command not function

* Allow changing of track or wheel object per vehicle

* Lot more complicated than I thought
 2017-06-08 13:31:25 -05:00
Phyma
55df8bca53 Repair specialist rename, fixes #3186 (#5248) 
* Changed name

* Fixed Enginner only german and removed big letters

* Added docs + PR fixes #3186

* Removed other languages

* Fixed request and added comment

* Replace all usage of term "Specialist"
 2017-06-08 12:10:35 -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
bfd3695868 SQF Lint Cleanup Pass (#5157) 
* SQF Lint Cleanup Pass

* Fix var in TRACE

* Add basic python tool

* Simplify

* Hit space key 6 times

* Fix error in dropNozzle

* handle error message exceptions

* Fix py
 2017-05-14 14:48:05 -05:00
PabstMirror
0cdb2ce238 Increase max weapon index for large modsets (#5054) 2017-05-12 13:12:39 -05:00
PabstMirror
2df4a28145 Remove repair locization warning (#4607) 2016-10-28 12:16:23 -05:00
commy2
05d30c5573 convert log macros to cba versions (#4282) 
* convert log macros to cba versions

* Add changes to AB

* remove obsolete macro
 2016-10-02 12:55:31 +02:00
commy2
e7bc2e9d62 remove deprecated code for 3.8.0 (#4457) 
* remove deprecated scroll wheel event handler

* remove deprecated ace hash functions

* remove deprecated execNextFrame

* remove deprecated insertionSort

* remove deprecated getConfigType

* remove deprecated binocularMagazine

* remove deprecated wait(Until)AndExecute

* remove old ass and deprecated alternative syntax setHitPointDamage

* remove deprecated event handlers (#4459)

* remove deprecated event handlers#

* remove ACE_newEvents

* Remove old ACE PlayerEventHandler wrappers
 2016-09-24 22:31:10 +02:00
PabstMirror
9451716a44 Show damage on repair items interaction point (#4448) 
* Show damage on repair items interaction point

* Fix dot size

* Change scaling
 2016-09-24 15:15:02 -05: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
PabstMirror
afe3e5ccd3 Fix repair cargo not added to zeus created objects (#4201) 
- Fix #4200 (add delay for units created via zeus)
- Use ace_settingsInitialized to add events
 2016-08-03 13:44:04 -05:00
PabstMirror
787a57c12b Fix track repair selection placement 2016-08-01 21:19:48 -05:00
Ozan Eğitmen
8f80cd59c8 Use GVAR where applicable 2016-07-20 07:15:18 +03:00
PabstMirror
d15330d245 Fix cargo event name - spare parts not being added 2016-07-01 23:14:20 -05:00
jonpas
b97ba4990d Normalize 2 more files 2016-06-09 14:25:57 +02:00
SilentSpike
90ebf9638b Update common event names to meet new standard 2016-06-04 11:12:56 +01:00
PabstMirror
db78dd53a8 Cleanup Merge and remoteFnc events 2016-06-02 19:59:18 -05:00
PabstMirror
d7f9c52c2f Merge branch 'master' into cbaEventSystem 2016-06-02 19:29:30 -05:00
jonpas
590d4fa70b Merge branch 'master' into abolishExecRemoteFnc 2016-06-02 14:28:43 +02:00
jonpas
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +02:00
commy2
272775445f Merge pull request #3670 from acemod/useQuotedFuncMacros 
Use new quoted function macros
 2016-05-30 21:00:23 +02:00
jonpas
331c3c70cb Verify and fix cargo, nametags, rearm, reload, repair, ui, Convert infoDisplayChanged in common and mk6mortar Rsc's 2016-05-24 18:58:27 +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
d902d1182a Replace ace_common_fnc_execRemoteFunc with events 2016-05-21 23:55:48 +02:00
jonpas
58cc686aac Remove initial spare part adding for classes not Car or Tank, Improve addSpareParts 2016-05-12 21:49:45 +02:00
PabstMirror
2a5ec42148 Repair - Improve wheel detection for RHS (#3760) 
* Repair - Improve backup wheel detection

Fix #3759

* Cleanup
 2016-05-07 16:04:27 -05:00
PabstMirror
4f6b11c2a6 Clarify repair while engine is running 
#3348
- Show action, but exit and show warning when selected
- Optional (default off) setting to auto shut off engine to keep
compatibility with missions
 2016-04-12 20:04:12 -05:00
jonpas
ccaec31a90 Use new QFUNC and QEFUNC macros 2016-04-08 20:43:26 +02:00
PabstMirror
2467fa7b0c Fix empty callbacks in medical/repair 2016-02-21 11:34:25 -06:00
PabstMirror
8b932fd5a0 Fix some undefined functions / strings 2016-02-20 16:58:45 -06:00
PabstMirror
c0eccc67c3 Change all SCALAR to NUMBER in headers 2016-01-28 18:19:15 -06:00
PabstMirror
fb0738bd30 Merge branch 'master' into release 2015-12-31 20:27:26 -06:00
PabstMirror
e964b2c135 Fix PostRepairDamage and toolkit consumtion setting 
Fix #2982
 2015-12-08 20:31:40 -06:00
PabstMirror
cae9f436f6 Merge branch 'release' 2015-12-08 15:14:33 -06:00
PabstMirror
419af195e9 #2902 - Remove error and don't exit if veh has no hit points 
B_UAV_01_F has no hitpoints and would throw error
Don't exit so "fullRepair" action still gets added
 2015-12-01 13:43:27 -06:00
commy2
411a8d58f3 fix more setVariable and getVariable capitalization 2015-11-30 17:53:57 +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
a8228f60c2 fix configFile capitalization 2015-11-30 17:23:02 +01:00
commy2
2b05f6f451 fix isNil capitalization 2015-11-30 17:22:16 +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
f676e6d9c9 Add some more typeNames replacements 2015-11-27 21:23:27 -06:00
PabstMirror
5850f78c1f Merge branch 'master' into isEqualTypeRepalcement 2015-11-27 21:08:21 -06:00
PabstMirror
ab769757d9 Skip Depends Hitpoints - Use HitPoints selPos for wheels 
Stuff

Normalize Depends - Skip Glass Repair

Fix spawned wheel/track not having correct damage

getHitpointString robustness, hatchback fuelHitpoint, fix count errors

-

Formatting

local -> private

Fix Stuff
 2015-11-20 21:11:50 -06:00
SilentSpike
839c022b84 Fix broken repair point selection code 
Only valid hit selection + hit point combinations are usable for repair points:

- Empty hit points mean there isn't enough information to display to the user
- Empty hit selections mean that the hit point doesn't actually exist
 2015-11-20 21:11:23 -06:00
PabstMirror
4e93b9c72d 2307 - Repair sub-turrets 
Privates

Cleanup debug

Add repair actions for sub turrets

Cleanup

Fix Header

Error Handling

Cleanup setHitpointDamage

Fix common ACE_isEngineer to handle scalar or bool

Claim and release repair objects (wheel/track)

Repair sub-turrets
 2015-11-20 21:11:05 -06:00
PabstMirror
69b53af1d3 1.54 - Replace typeName with isEqualType 2015-11-20 11:40:31 -06:00
jonpas
db2572acfd Merge branch 'master' into parseList 
Conflicts:
	addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
 2015-09-28 16:06:32 +02:00
jonpas
2e3014daa3 Merge branch 'master' into parseList 
Conflicts:
	addons/common/functions/fnc_assignObjectsInList.sqf
 2015-09-21 22:46:01 +02:00
Glowbal
bbed98fbef Merge pull request #2394 from jonpas/cleanupRepairRelease 
Minor Repair Cleanup for release
 2015-09-21 22:25:58 +02:00
PabstMirror
3c93c2c95c #2525 - Add CanInteractWith checks for repair 2015-09-19 11:07:03 -05:00
PabstMirror
c50c53e5bb remove debug 2015-09-15 09:57:53 -05:00
PabstMirror
9cd470b849 Add Setting for toolkit requirement for wheel repair 2015-09-15 09:54:55 -05:00
jonpas
3de783d3a7 Cleanup for branch release, picked from #2366 2015-09-11 19:57:21 +02:00
jonpas
e07b71faf0 Merge branch 'master' into parseList 
Conflicts:
	addons/medical/functions/fnc_moduleAssignMedicRoles.sqf
	addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
 2015-09-09 19:13:04 +02:00
Michael Braun
a5fb09a7e1 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros 
Conflicts:
	addons/repair/functions/fnc_moduleRepairSettings.sqf
 2015-09-09 02:55:12 +02:00
jonpas
06baa5e4d3 Fixed nilCheck, changed moduleAddSpareParts to use new parseList 2015-09-05 20:51:48 +02:00
jonpas
8fc061bfd6 Merge branch 'master' into parseList 2015-09-05 20:16:59 +02:00
jonpas
a8412361bd Use setting init delay function for addSpareParts 2015-09-05 19:33:25 +02:00
Glowbal
a4b4c5d2a3 Merge pull request #2187 from jonpas/trackToTrackedVehicles 
Added Spare Parts module handling
 2015-09-05 13:36:42 +02:00
jonpas
644460ed96 Merge branch 'master' into parseList 
Conflicts:
	addons/slideshow/functions/fnc_makeList.sqf
 2015-09-04 18:40:35 +02:00
Michael Braun
035b3432c5 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros 
Conflicts:
	addons/common/XEH_postInit.sqf
 2015-09-01 08:45:59 +02:00
commy2
37aec2b3c3 enable repairing while on ladder 2015-08-31 21:22:22 +02:00
Michael Braun
657157d767 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros 
Conflicts:
	addons/hearing/functions/fnc_moduleHearing.sqf
 2015-08-29 22:38:26 +02:00
jonpas
6d27299883 Cleaned up spare parts collection after SettingsInitialized, Check if vehicle already in collection 2015-08-26 23:43:06 +02:00
jonpas
48e0f5757d Merge branch 'master' into trackToTrackedVehicles 
Conflicts:
	addons/repair/stringtable.xml
 2015-08-26 23:38:51 +02:00
jonpas
ef1b4cbd26 Merge branch 'master' into trackToTrackedVehicles 
Conflicts:
	addons/repair/XEH_preInit.sqf
 2015-08-26 23:33:05 +02:00
jonpas
6a6c5008c0 Merge branch 'master' into repairHitpointStrings 
Conflicts:
	addons/repair/functions/fnc_doRepair.sqf
 2015-08-26 23:29:36 +02:00
Glowbal
f7679b45ad Merge pull request #2246 from jonpas/repairHitpointGroups 
Repair Hitpoint Groups Framework
 2015-08-26 23:27:08 +02:00
jonpas
b6d5db9157 Reverted IGNORED_HITPOINTS, Added Taru glasses to it 2015-08-26 23:09:04 +02:00
jonpas
cc70580a93 Improved comments 2015-08-26 22:51:41 +02:00
jonpas
e4123c9730 Added 2 strings, changed 1 2015-08-26 22:44:30 +02:00
jonpas
8529e5c9b7 Merge branch 'master' into trackToTrackedVehicles 2015-08-26 21:25:08 +02:00
Michael Braun
5047d4de1c Switched to ACE_LOG<LEVEL>_# variation 2015-08-26 17:39:44 +02:00
jonpas
dc2e146e8b Merge branch 'master' into repairHitpointStrings 
Conflicts:
	addons/repair/functions/fnc_addRepairActions.sqf
 2015-08-26 17:04:05 +02:00
jonpas
c0379c7809 Updated with correct cargo events and settings category 2015-08-26 17:02:29 +02:00
Michael Braun
097506076f Fixed format usage in macros requiring ARR_# for it to work 2015-08-26 16:48:55 +02:00
Michael Braun
9e10aa86d7 Standardize logging format through ACE_LOG macros 2015-08-26 15:32:54 +02:00
jonpas
5b6429f23e Made more modules use assignObjectsInList common function 2015-08-24 21:55:48 +02:00
jonpas
9718883599 Consolidated into 1 function 2015-08-24 20:58:54 +02:00
jonpas
3f0909ddd5 Fixed typo 2015-08-24 20:12:45 +02:00
jonpas
78e7565121 Added support for multiple groups, Fixed check group damage returning true even if hitpoint not in a group 2015-08-24 20:03:11 +02:00
jonpas
cb6efc7c9a Removed copy/paste minuses 2015-08-24 18:18:54 +02:00
jonpas
04da19190f Changed custom hitpoint positions config entry to 2d array 2015-08-24 18:17:56 +02:00
jonpas
449af180c7 Moved check for zero position in it's own line 2015-08-24 17:58:19 +02:00
jonpas
32d5ac99d9 Readded ignored hitpoints 2015-08-24 17:56:34 +02:00