Commit Graph

43 Commits

Author SHA1 Message Date
lambdatiger
eedbb0b5bc Revert to 60a0dae, merge conflict wasn't resolved properly 2024-06-20 00:04:34 -05:00
jonpas
742626ff1a
General - Relative script_component.hpp includes (#9378)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-12 20:58:10 +02:00
JonBons
8b60fae23a
Magazine Repack - Add idle animation when a player starts repacking magazines (#8825)
* Added Gear gesture animation when a player starts repacking magazines

(previously you'd just sit there doing nothing for X seconds)

* Added Repack Animation ACE Setting for allow for disabling of idle animation during repacking

* Corrected Polish translation for setting name

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* Corrected German translation for setting name

* Removed French translation until someone can provide one

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2022-03-07 12:35:26 -06:00
PabstMirror
7bc6fdfa66
Cleanup - Trim all trailing whitespace (#8651) 2021-10-30 16:42:03 -05:00
GhostIsSpooky
bbe4b488e0
Magazine Repack - Add setting & hint for repacking loaded magazines (#8475)
* add setting to repack equipped magazines

* derp

* derpderp

* always show hint, remove setting
2021-10-12 12:54:50 -05:00
Dystopian
b151148542
Replace canAdd with CBA_fnc_canAddItem (#8012) 2021-02-27 10:26:12 -06:00
mharis001
a7260c6974
Magazine Repack - Add inventory context menu action (#7631) 2020-04-09 03:52:54 +02:00
Dedmen Miller
e2ac18a05d [WIP] Fix script errors reporting wrong line numbers (#6407)
* advanced_ballistics

* advanced_fatigue

* advanced_throwing

* ai

* aircraft

* arsenal

* atragmx

* attach

* backpacks

* ballistics

* captives

* cargo

* chemlights

* common

* concertina_wire

* cookoff

* dagr

* disarming

* disposable

* dogtags

* dragging

* explosives

* fastroping

* fcs

* finger

* frag

* gestures

* gforces

* goggles

* grenades

* gunbag

* hearing

* hitreactions

* huntir

* interact_menu

* interaction

* inventory

* kestrel4500

* laser

* laserpointer

* logistics_uavbattery

* logistics_wirecutter

* magazinerepack

* map

* map_gestures

* maptools

* markers

* medical

* medical_ai

* medical_blood

* medical_menu

* microdagr

* minedetector

* missileguidance

* missionmodules

* mk6mortar

* modules

* movement

* nametags

* nightvision

* nlaw

* optics

* optionsmenu

* overheating

* overpressure

* parachute

* pylons

* quickmount

* rangecard

* rearm

* recoil

* refuel

* reload

* reloadlaunchers

* repair

* respawn

* safemode

* sandbag

* scopes

* slideshow

* spectator

* spottingscope

* switchunits

* tacticalladder

* tagging

* trenches

* tripod

* ui

* vector

* vehiclelock

* vehicles

* viewdistance

* weaponselect

* weather

* winddeflection

* yardage450

* zeus

* arsenal defines.hpp

* optionals

* DEBUG_MODE_FULL 1

* DEBUG_MODE_FULL 2

* Manual fixes

* Add SQF Validator check for #include after block comment

* explosives fnc_openTimerUI

* fix uniqueItems
2018-09-17 14:19:29 -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
shukari
a783e6319f magazinerepack stringtable fix #5390 (#5392)
* fix #5390

stringtable optimization

* Dont use the same wort twice - magazinerepack stringtable

* [magazinerepack] get bulletsLeft in last partial mag as optional param

* [magrepack] remove unused entries

* [magrepack] entry is needed for interrupt event

* [magrepack] finish msg

successful -> full mags + left rounds
Interrupted -> full mags + partial mags

* [magrepack] final translation change

* space fix
2017-09-21 20:42:01 +02: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
00b91bed45 Minor fixes, cleanup, add lint ignore directives (#5176)
- Fix bug in getNumberMagazinesIn (func not used)
- Fix bug in seekerFindLaserSpot (func not used yet)
- Everything else is just cleanup
2017-05-31 22:09:36 +01: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
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
jonpas
03e923aa68 Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
jonpas
8ff4a2ecaf Add size parameter to displayTextPicture, Improve parameter checking in displayText functions, Cleanup magazine repack (privates, deprecated macros, style) 2016-06-04 20:40:55 +02:00
commy2
a8228f60c2 fix configFile capitalization 2015-11-30 17:23:02 +01:00
commy2
34d351c652 fix exitWith capitalization 2015-11-30 17:14:05 +01:00
VKing
069169cc72 Changed ACE_time back to time in comments where appropriate 2015-10-21 22:52:21 +02:00
jokoho48
4478be096e Code Cleanup Magazine Repack Module. 2015-08-16 00:30:24 +02:00
jonpas
1eeca28a3d Enabled DAGR, Kestrel4500, Laser switching, Mag Repack, Markers, MicroDAGR, NVG Adjusting and Check Ammo while Sitting 2015-06-13 22:08:13 +02:00
jonpas
763cb07629 Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
jonpas
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
jaynus
c924baefd7 All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07:00
PabstMirror
5f43cffecd Sort for mag repack 2015-05-05 20:35:08 -05:00
Glowbal
0146439925 increasing the text box height #834
Temporary solution until we get something properly done.

Ideally we would calculate the height of the box through the amount of characters. For that we would need a font with a consistent width across each character, or figure out the width for each character ourselves.
2015-04-24 07:46:01 +02:00
PabstMirror
caef5c105f More Privates 2015-04-17 22:40:37 -05:00
PabstMirror
6cd7ab2f7d Fix getChildren - condition/only show inv mags 2015-04-03 22:37:48 -05:00
PabstMirror
a92a541234 Headers 2015-04-01 23:05:41 -05:00
PabstMirror
c9352e1970 And This 2015-04-01 15:18:39 -05:00
PabstMirror
4e66aea25d Make it work 2015-04-01 15:09:05 -05:00
PabstMirror
1303f59cd8 opps 2015-04-01 13:09:22 -05:00
PabstMirror
0d27806571 Repack Mag Child Actions 2015-04-01 13:09:03 -05:00
PabstMirror
43a9e7bfc8 #176 - Belt Repacking 2015-04-01 11:21:30 -05:00
Nicolás Badano
2b0cfac8e4 Removed obsolote code from ace_interaction (#109) 2015-02-28 23:00:24 -03:00
PabstMirror
7545a6c3d8 Code cleanup 2015-02-11 15:43:08 -06:00
PabstMirror
24bd515814 Commenting and some stringtables 2015-02-08 22:44:23 -06:00
PabstMirror
da9fc39103 Headers and Finish Notice 2015-02-08 17:35:21 -06:00
PabstMirror
e770a74630 Headers 2015-02-08 16:36:58 -06:00
PabstMirror
3f6ffa6ac2 Mag Repack - Keep Progress prototype
Ideas from AGM and CSE
Keeps Progress While Repacking if interrupted
Added sounds from CSE
2015-02-08 13:48:53 -06:00
PabstMirror
5e932f8c71 Replace calls to progressBar
Mag repack
Defuse
Swap Barrel
2015-01-26 00:24:33 -06:00
commy2
7cd2bc24c8 port magazinerepack 2015-01-16 15:37:32 +01:00