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,175 Commits 73 Branches 88 Tags 752 MiB
80ff709676
Commit Graph

545 Commits

Author SHA1 Message Date
Dystopian
559a498e6d Add fast mouse actions to refuel, add refuel eden attributes (#5418) 
* Add fast mouse actions to refuel

* nobody seen that

* Add interaction condition and refuel on ladder

* Add car hit, fix change weapon on uncon

* Replace objNull with nil in setVar, unify var names

* Delete *ConnectNozzle functions

* Delete reset* functions

* Add public function and eden attributes

* Remove static actions from RHS compat

* Remove statusEffect_set on respawn

* Fix dual menu, add deprecating message

* Optimize fnc_takeNozzle

* Cleanup
 2017-09-10 14:43:03 -05:00
PabstMirror
74fd0f507f Add EH for UAV control, Add Hellfire support (#5305) 
* Add EH for UAV control, Add Hellfire support

* cycle guidance keybind

* Handle broken PlayerViewChanged

* humps

* UAV Self-interactions (#5379)

* Switch ACE_Player to uav AI on valid seat change

* Different approach to UAV interactions

* Forgot to remove a variable

* Changed param to select
 2017-08-22 16:07:45 -05:00
PabstMirror
accaf9fd01 Compatibility with newest mikro tools (#5442) 
* Compatibility with newest mikro tools

- Remove all use of `access` in configs
- Add skeleton cfg for rtms
- Remove use of `-L` in makePbo for non-bin

* Tabs in model.cfg
 2017-08-22 12:53:58 -05:00
jonpas
5cf7569711 Correct new Chinese stringtable identifiers (#5334) 2017-07-08 09:48:39 -05:00
GodofMonkeys
60131ee589 Add Chinese Traditional & Simplified Localization (#5295) 
Add Chinese Traditional & Simplified Localization
 2017-06-22 16:46:00 +02: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
bdab342548 Handle escape menu with toggle iteractMenu (#5144) 
* Handle escape menu with toggle iteractMenu

* Work on non-cursor menu

* Close cursor menu if open when switching

* Update fnc_handleEscapeMenu.sqf
 2017-05-31 11:41:53 -05:00
PabstMirror
c001be5b09 Add keybind to toggle interaction menu (#5095) 2017-05-05 13:20:54 -05:00
PabstMirror
dfca4fdcf8 Pass functions by "reference" to bis event handlers (#4898) 
* Pass functions by "reference" to bis event handlers

* Add Doc

* Fix
 2017-02-14 10:54:37 -06:00
PabstMirror
70f4dd3e6b Fix passenger actions - Ensure order of MainActions (#4883) 2017-02-10 12:49:10 -06:00
jtj5283449
d4855a7ff3 Korean Translation v1.0 (#4794) 
* Add files via upload

* Add files via upload

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

japanese translation caused error while translating process, had to remove some duplicated keys in stringtable.xml.

* Fix encoding
 2017-01-02 17:52:01 -06:00
PabstMirror
a3c50a6c76 Add dev macro to quickly recompile functions (#4699) 2016-11-23 13:35:25 -06:00
PabstMirror
e32bca3d14 Don't compile action menu for playable logics (#4666) 
Fix #4664
 2016-11-12 19:39:40 -06: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
KoffeinFlummi
72899643bd Merge branch 'master' into japanesestringtables 2016-09-27 20:54:17 +02:00
classicarma
fd069c48d4 translate interact_menu 2016-09-28 01:12:22 +09:00
PabstMirror
257f1a1b4c Fix interaction addActionToX return values (#4461) 
* Fix interaction addActionToX return values

Fix #4460
Fix returning number from pushBack

* Retrun empty array on error
 2016-09-27 11:09:06 -05: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
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
df7aa38a7a Allow inheritance for addActionToClass (#4272) 
* Allow inheritance for addActionToClass

* Update Headers

* Use inline code for inheritance example
 2016-08-27 10:35:21 +02:00
PabstMirror
919c8469de Add interaction action on demand (#4079) 
* Only use addActionEventHandler when needed

-Only install addActionEventHandler when the interaction menu is
actually open
-Less SQF running each frame,
-it should help with issue #4066

* Cleanup debug
 2016-08-05 12:05:15 -05:00
PabstMirror
fa7d0df2df Improve creation time of house actions dummy (#4159) 2016-07-26 00:03:29 -05:00
PabstMirror
1213c08e4b Fix cached call events 2016-07-14 13:06:45 -05:00
PabstMirror
bbc708e3e0 Less aggressive overlap detection 
Ensure the 2d screen pos distance is significant.
 2016-07-02 22:46:36 -05:00
commy2
89ecc81111 convert common events to CBA playerEvents 2016-06-22 01:39:20 +02:00
commy2
3fdc0dd521 Merge pull request #3955 from acemod/add_name 
add 'name' to components
 2016-06-20 19:25:58 +02:00
BaerMitUmlaut
88b58216ee Added beautified component names 2016-06-20 11:44:36 +02:00
Glowbal
afb9eb3084 Merge pull request #3342 from acemod/vehicleInteractionDistance 
Uniformize interaction distance for vehicle based on bounding box
 2016-06-20 09:55:55 +02:00
commy2
c481ddedaf add 'name' to components 2016-06-19 09:38:39 +02:00
Josuan Albin
7c9dcf6bdb Merge branch 'pr/3480' 
Conflicts:
	addons/advanced_ballistics/stringtable.xml
	addons/cargo/stringtable.xml
	addons/flashlights/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/main/stringtable.xml
	addons/map/stringtable.xml
 2016-06-18 16:26:46 +02:00
jonpas
03e923aa68 Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
PabstMirror
d46c596cc4 Merge remote-tracking branch 'refs/remotes/origin/master' into vehicleInteractionDistance 2016-06-14 19:36:45 -05:00
jonpas
bd5f6107a0 Merge branch 'master' into eol-lf 2016-06-09 14:24:45 +02:00
SilentSpike
90ebf9638b Update common event names to meet new standard 2016-06-04 11:12:56 +01:00
SilentSpike
9e4fd77745 Update common event names to meet new standard 2016-06-03 22:39:43 +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
PabstMirror
d7f9c52c2f Merge branch 'master' into cbaEventSystem 2016-06-02 19:29:30 -05:00
jonpas
b0352fdeb9 Merge branch 'master' into eol-lf 2016-06-02 17:02:09 +02:00
jonpas
95573ee711 Stringtable URL (#3855) 
* Move url into stringtable to display it properly, Add some missing author and url entries

* Fix main

* Remove duplicate author
 2016-06-01 23:45:51 +02:00
jonpas
1354826d56 Put semi-colon to the correct place 2016-06-01 14:11:32 +02:00
jonpas
1331265e65 Move url into a macro 2016-06-01 13:49:10 +02:00
jonpas
6730d016c2 Convert CfgPatches to new Eden format and CBA 2.4.1 compatibility 2016-06-01 13:27:02 +02:00
jonpas
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +02:00
commy2
fd26e2e44e Merge pull request #3516 from acemod/cbamissiontime 
replace timePFH with CBA_missionTime
 2016-05-30 21:23:57 +02:00
jonpas
7a307393a4 Merge branch 'master' into useQuotedPathMacros 2016-05-30 21:14:17 +02:00
jonpas
816da2aef1 Normalize to LF line endings 2016-05-30 18:37:03 +02:00
jonpas
b54d1985f1 QGVAR and fix gforces, goggles, grenades, hearing, interact_menu 2016-05-25 01:57:41 +02:00
SilentSpike
207d6612da Remove duplicate ACE_newEvents entries 2016-05-24 15:06:17 +01: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
commy2
da70854568 manual merge 2016-05-18 11:48:27 +02:00
Ozan Eğitmen
b8abec0c61 Fix Capitalization of ACE Settings classes. (#3627) 2016-05-07 22:14:56 +02:00
jonpas
85b4366368 Use new QPATHTOF and QPATHTOEF macros 2016-04-08 20:34:50 +02:00
commy2
7c2977ed47 Merge pull request #3150 from acemod/fixinteractmenusavegame 
reset interaction menu time variables on save game load
 2016-03-10 23:46:37 +01:00
commy2
6a58af5b33 fix save game crash?, ref #3397 2016-03-06 06:22:38 +01:00
commy2
467075ad67 replace timePFH with CBA_missionTime 2016-03-02 11:01:39 +01:00
NorXAengell
772c4cc100 Another batch of translations and corrections (Fr) 2016-03-01 02:27:19 +01:00
BlackWindowS
c61e7b5104 Tweaked & added translations 
Translation of almost every STR to French
 2016-02-28 14:48:04 +01:00
esteldunedain
a86bbdb162 Prevent the interact menu from closing when moving the mouse during animations 2016-02-27 15:47:23 -03:00
esteldunedain
121663226c Make the auto-expanding of SelfActions and ZeusActions work at all animation speeds, but keep the animation in all cases. 2016-02-27 15:44:53 -03:00
esteldunedain
71707bc81a Some spanish translations for 3.5.0 2016-02-25 10:54:19 -03:00
commy2
a09cb1612b fix error when loading save game, fix #3391 2016-02-22 17:43:34 +01:00
commy2
ac3385fb83 manual merge 2016-02-22 16:08:24 +01:00
commy2
c45523475f manual merge 2016-02-22 16:06:30 +01:00
commy2
46a239f9f6 precompile on game start 2016-02-22 15:20:36 +01:00
commy2
f5ef7b6b2d displayLoad xeh for imenu 2016-02-21 00:36:46 +01:00
ChairborneIT
0021bc08df Added translation for most Italian stringtable entries 2016-02-20 21:39:05 +01:00
PabstMirror
ed653456e5 Merge pull request #3338 from acemod/translations156merge 
Fix Merge Conflicts on More Italian Translations
 2016-02-19 15:09:40 -06:00
esteldunedain
ff04ca8981 Uniformize interaction distance for vehicle. Distance is now aprox 4m from the bounding box of the vehicle, consistent with interaction with people. 2016-02-18 20:20:02 -03:00
bux
49f565f541 fix merging errors 2016-02-18 20:05:30 +01:00
PabstMirror
c456e1a631 Merge pull request #3214 from acemod/cba23 
Changes for CBA 2.3
 2016-02-17 15:33:42 -06:00
PabstMirror
dccc1d33fd Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge 2016-02-17 12:30:03 -06:00
licht-im-Norden87
61bd04a390 Interact menu 2016-02-10 16:49:00 +01:00
esteldunedain
cebc8a2d07 Slightly reduce the distance for which the LOS check is skipped. Fix #3270 2016-02-08 19:19:10 -03:00
ProfessorCZ
61611d0ec7 Czech Translation - Update 
Update
 2016-02-03 18:31:31 +01:00
PabstMirror
46d6e92bca Add quick debug defines to all script_components 2016-01-28 23:26:02 -06:00
PabstMirror
276aea04c1 Changes for CBA 2.3 2016-01-24 11:41:10 -06:00
commy2
80ea079827 reset interaction menu time variables on save game load 2016-01-12 19:32:26 +01:00
PabstMirror
dd979676fd Remove use of CAManBase for all mans 
End use of bandaid from #1294
 2016-01-09 22:05:40 -06:00
PabstMirror
a161008eb7 Fix count/forEach 2016-01-09 01:15:09 -06:00
PabstMirror
ed4cc42897 Cleanup Interaction Menu 2016-01-08 23:29:32 -06:00
Alessandro Foresi
c16d97cad0 Merge branch 'master' into translation/15bn/alef 2016-01-03 12:23:27 +01:00
PabstMirror
fb0738bd30 Merge branch 'master' into release 2015-12-31 20:27:26 -06:00
PabstMirror
8bdd5d0597 Merge remote-tracking branch 'brGuy/Translations-December' into fixStringtablesMerge 2015-12-31 14:30:29 -06:00
PabstMirror
cf27571b5a Merge pull request #3007 from dudakov/master 
Russian Translations - Update
 2015-12-31 14:11:45 -06:00
PabstMirror
1e29c0286f Remove Keybinds/Events for Zeus now handeld in CBA 
Close #2937
 2015-12-30 01:07:55 -06:00
Glowbal
c1fa81f28b Fix tabs in sqf files 2015-12-21 17:05:48 +01:00
Jonathan Pereira
ad48f51ec7 Added PT-BR translations 
All remaining translations of gestures, hearing, interact_menu,
interaction, nightvision, rearm, refuel, viewdistance were done!
 2015-12-18 15:14:19 -02:00
PabstMirror
ff3ddbe287 Building Interact - Dummy object instead of hiding 
Fix #3038
InteractiMenu now checks `isObjectHidden`,
So now use dummy object instead of hiding a real one
 2015-12-15 12:04:03 -06:00
kaban
fd06472f4d Russian Translations - Update 2015-12-10 20:32:16 +03:00
commy2
5a1aae6028 manual merge 2015-11-30 17:44:15 +01:00
commy2
d037f00a92 fix forEachIndex capitalization 2015-11-30 17:25:16 +01:00
commy2
b3950bd7f0 fix forEach capitalization 2015-11-30 17:23:48 +01:00
commy2
dcf0a68b80 Revert "fix Cfg capitalization" 
This reverts commit 43bda9c462.
 2015-11-30 17:00:32 +01:00
commy2
43bda9c462 fix Cfg capitalization 2015-11-30 16:52:20 +01:00
commy2
ca9b909e75 fix CBA_fnc capitalization 2015-11-30 16:45:20 +01:00
Thomas Kooi
081106d6a3 Merge pull request #2892 from acemod/TheHidden 
Remove nametags and actions on hidden units
 2015-11-29 12:38:27 +01:00
bux578
35ecef454f Merge pull request #2825 from gienkov/pl-translation 
pl translation
 2015-11-29 07:35:04 +01:00