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
PabstMirror
8d2b612570
Remove nametags and actions on hidden units
...
Fix #2596
2015-11-28 21:35:25 -06: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
gienkov
b091b73e24
fixes
2015-11-27 21:54:04 +01:00
gienkov
3250245587
3.4.0 translations and fixes
2015-11-27 21:50:57 +01:00
PabstMirror
7b526a99a3
Cleanup
2015-11-20 14:53:16 -06:00
PabstMirror
69b53af1d3
1.54 - Replace typeName with isEqualType
2015-11-20 11:40:31 -06:00
PabstMirror
3ec9fca73e
local -> private
2015-11-17 14:06:12 -06:00
PabstMirror
554c303be0
InteractionMenu - Auto Expand First Level
2015-10-20 13:31:09 -05:00
PabstMirror
7db5a34b24
Interaction Menu - Add setting for animation speed
2015-10-20 13:26:42 -05:00
PabstMirror
4a935eb129
Remove debug
2015-09-26 22:02:44 -05:00
PabstMirror
174d8ac306
#2486 - Run color setup on settingsInit
2015-09-26 22:02:05 -05:00
PabstMirror
45e44251b6
Merge branch 'release'
...
Conflicts:
addons/repair/stringtable.xml
2015-09-21 17:14:53 -05:00
PabstMirror
6702a1faa4
Fix warnings for WeaponHolderSimulated
2015-09-21 16:34:02 -05:00
