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
14,901 Commits 73 Branches 88 Tags 752 MiB
94ceed201c
Commit Graph

50 Commits

Author SHA1 Message Date
jonpas
742626ff1a
General - Relative script_component.hpp includes (#9378) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-09-12 20:58:10 +02:00
GhostIsSpooky
68ed19911a
General - Change object config lookups to configOf (#8795) 
* configOf lookups

* forEach, missed configOf

* revert handcuff distance change

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

* optimize condition

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

* capitalization

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

* use object in getVehicleIcon

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

* add return comment

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

* remove extra brackets

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

* add missing brackets

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

* add return comment pt2

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

* revert to cursorTarget

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2022-03-08 21:41:21 -06:00
jonpas
b7f9aee2d7
Sitting - Fix ACEX Merge (#8577) 2021-10-22 15:16:42 +02:00
PabstMirror
f2b3fe3012
Tweak Field_rations/overheating merge (#8548) 2021-10-17 21:45:01 -05:00
jonpas
6ca9d59443
Merge ACEX (#8415) 
* Merge ACEX - first attempt
Backwards compatibility with XGVAR set of macros used on all settings and config entries
Public API functions not taken into account yet, many other things probably still missed

* Resolve issues

* Switch to addSetting, backward compatible CfgPatches, missed XGVAR.

* Remove unnecessary backwards compat

* Convert ACEX Categorised settings to initSettings / Fix Intel items magazine

* Apply suggestions from code review

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Remove maintainers from merged ACEX components

* Cleanup unused module and faction classes

* Sitting - Add more object configs by @Dystopian
https://github.com/acemod/ACEX/pull/255

* Translations - Add Japanese by @classicarma
https://github.com/acemod/ACEX/pull/259

* Kill Tracker - Add killtracker.inc public include file by @Freddo3000"
https://github.com/acemod/ACEX/pull/251

* Add ACEX authors and sort authors file

* acex - final tweaks (#8513)

* acex - handle old funcs

* replace thirst/hunger setvars to acex naming

fix macro

Revert "fix macro"

This reverts commit d807e5e804c43916eaa42d34a89af94c6d9a48ad.

Revert "replace thirst/hunger setvars to acex naming"

This reverts commit bafc607884932d6e339daedc7c22e25dddbdd868.

x

Co-authored-by: TyroneMF <TyroneMF@hotmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-10-14 10:46:43 -05:00
commy2
1219d3df23 remove deprecated sitting module (#4458) 
* remove deprecated sitting module

* Update sitting documentation for removal

* Remove ACE3 sitting doc, redirect to ACEX and add note

* Fix wording
 2016-09-28 13:14:50 +02:00
jonpas
2b56d0c0dd Use claim system - fix possibility to carry while someone is sitting 2016-06-18 19:53:44 +02:00
jonpas
85b4366368 Use new QPATHTOF and QPATHTOEF macros 2016-04-08 20:34:50 +02:00
commy2
82086efca0 manual merge 2016-02-10 10:11:33 +01:00
PabstMirror
d372111d3f Sitting Cleanup 
- Add modern privates
- Don't add actions, canInteractWith, or EH if not enabled
 2015-12-30 12:23:35 -06:00
commy2
ae1f35c042 remove superfluous private 2015-11-29 16:55:44 +01:00
commy2
caa5585044 simplify getRandomAnimation in sitting 2015-11-29 16:50:08 +01:00
commy2
e5c4d35969 1.55 use new selectRandom command 2015-11-29 16:33:25 +01:00
Glowbal
f57eb08ce5 Merge pull request #2620 from jonpas/sittingFramework 
Sitting Framework
 2015-10-18 12:26:53 +02:00
PabstMirror
f7fe0c08e0 #2391 - Use AGL for sitting setPos 2015-10-14 11:15:44 -05:00
jonpas
85cff04e0c Stored scroll-wheel action ID into already existing player setVariable instead of having 2 2015-09-27 01:37:19 +02:00
jonpas
dbd0beb514 Stored a global variable in player setVariable 2015-09-27 01:31:23 +02:00
jonpas
a7a716ca8d Better sitting framework in terms of interactions 2015-09-27 01:20:40 +02:00
jonpas
e3985dce3e Cleanup sitRotation as it's no longer needed 2015-09-27 00:40:59 +02:00
PabstMirror
1ea1094a73 Merge branch 'release' 2015-09-15 16:16:10 -05:00
jonpas
6fb22ebd11 Added isNull check to PFH for explicity 2015-09-11 17:55:28 +02:00
jonpas
efa8252b45 Remove debug 2015-09-11 17:43:29 +02:00
jonpas
2d3a02085e Improved comment 2015-09-11 17:27:08 +02:00
jonpas
d49798144c Replaced hasChairMoved with isEqualTo, fixed missing variable 2015-09-11 17:25:46 +02:00
jonpas
0b9c6254e4 Removed redundant rotation control - changed to config 2015-09-11 16:46:51 +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
commy2
237d5b6536 stand up action (uses get out shortcut) and less awkward standing animaton 2015-09-01 21:03:28 +02:00
Michael Braun
9e10aa86d7 Standardize logging format through ACE_LOG macros 2015-08-26 15:32:54 +02:00
Glowbal
c69aa09d55 Merge pull request #2054 from MikeMatrix/codeCleanupSitting 
Code cleanup of Sitting module
 2015-08-08 17:00:07 +02:00
jonpas
52ac13273c Fixed #1937 - Made use of CfgMoves to make free-look head movement visible, Fixed grenade throwing while sitting 2015-08-08 02:13:14 +02:00
Michael Braun
d192f7eea4 Added parentheses back 2015-08-07 15:35:52 +02:00
Michael Braun
60e4c2e601 Code cleanup of sitting module 2015-08-07 15:12:24 +02:00
PabstMirror
b3741f4036 Capitalization for macro CBA_fnc_addPerFrameHandler 2015-08-04 02:34:38 -05:00
jonpas
815b7984aa Fixed event statement arguments, reworded comment 2015-07-07 03:46:54 +02:00
jonpas
cb210f92a0 Prevented sitting on flipped chairs, Stand when chair gets knocked away/otherwise moves 2015-07-05 17:07:34 +02:00
jonpas
34dea7d971 Fixed #1796 sitting above ground level 2015-07-05 13:55:45 +02:00
jonpas
c8c1f76e7d Macro usage, privates fix 2015-06-26 21:31:48 +02:00
jonpas
922e88d31e Fixed handcuffing not breaking sitting animation 2015-06-22 15:25:10 +02:00
jonpas
083d34b62b Removed redundant GVAR 2015-06-18 00:21:56 +02:00
jonpas
b974a63947 Lowercased function, comment 2015-06-11 21:51:41 +02:00
jonpas
0a71bd6931 Restricted sitting rotation 2015-06-11 19:46:16 +02:00
jonpas
46020259fd Fixed typo 2015-06-11 16:48:08 +02:00
jonpas
51e83ba0fa Handle kileld and disconnect while sitting 2015-06-09 18:52:12 +02:00
jonpas
3a4cd99001 Changed setPos to setPosASL for reliability, Fixed module icon name 2015-06-09 18:33:07 +02:00
jonpas
3e0d4d1f7b Fixed Rattan Chair position, doAnimation before moving player 2015-06-09 16:48:58 +02:00
jonpas
f9d292e9c2 Missing privates 2015-06-09 15:52:41 +02:00
jonpas
95ec2ea1f9 Added isNotSitting exception, Renamed sitting QGVAR 2015-06-08 23:39:14 +02:00
jonpas
c6b5c705c7 Added Sitting Settings and Module 2015-06-08 23:25:15 +02:00
jonpas
2104e5b45f Optimized condition functions, Removed redundant toLower for animation names 2015-06-08 17:52:33 +02:00
jonpas
c3c2fd0074 Initial Sitting commit 2015-06-07 22:00:43 +02:00