Commit Graph

10065 Commits

Author SHA1 Message Date
Glowbal
e298f5c71b Merge pull request #3970 from acemod/fixMineUBC
fix mine ubc
2016-06-21 19:40:04 +02:00
PabstMirror
af6aaf6e7d fix mine ubc 2016-06-21 12:24:31 -05:00
Glowbal
6abe937488 Update extensions 2016-06-21 18:17:24 +02:00
Glowbal
eef2bb060a Update readme version mentions 2016-06-21 18:09:15 +02:00
Glowbal
284231fe21 3.6.0 2016-06-21 18:07:27 +02:00
Glowbal
e357ca3ca8 Merge pull request #3963 from acemod/fix_ace_requiring_patched_stock_classes
fix some rogue mission dependencies
2016-06-21 17:59:25 +02:00
Glowbal
ee58df9c34 bump minor version 2016-06-21 17:57:50 +02:00
Glowbal
cd3d7c8e24 Merge pull request #3961 from acemod/undefinedCleanup
Cleanup some undefined functions and strings
2016-06-21 17:57:02 +02:00
commy2
bf098ec70e fix some rogue mission dependencies, fix #3954 2016-06-20 21:07:10 +02:00
PabstMirror
fe5dd3fe76 Cleanup some undefined functions and strings 2016-06-20 13:58:37 -05:00
commy2
3fdc0dd521 Merge pull request #3955 from acemod/add_name
add 'name' to components
2016-06-20 19:25:58 +02:00
Glowbal
38df85bccc Merge pull request #3958 from acemod/fix3950
Fix freeing prisoners after they've switched locality
2016-06-20 17:21:11 +02:00
commy2
653a371652 Merge pull request #3960 from acemod/beautify-names
Added beautified component names
2016-06-20 12:38:38 +02:00
commy2
750efbfdd8 fix spelling "Name Tags" 2016-06-20 12:34:30 +02:00
commy2
2249ef5e1c fix spelling "Laser Pointer" 2016-06-20 12:34:03 +02:00
commy2
ae5fe8af3c fix spelling "Wire Cutter" 2016-06-20 12:33:10 +02:00
BaerMitUmlaut
88b58216ee Added beautified component names 2016-06-20 11:44:36 +02:00
commy2
2dbcd5c183 Merge pull request #3959 from acemod/shorter-component-name
Change component name to ACE3
2016-06-20 10:54:58 +02:00
Glowbal
e540134de1 Change component name to ACE3 2016-06-20 09:57:27 +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
Glowbal
8549d4402e Merge pull request #3919 from acemod/fixSpottingScopePlacement
Fix the placement of spotting scopes on slopes
2016-06-20 09:54:24 +02:00
Glowbal
dac7e54165 Merge pull request #3957 from acemod/fixComancheGuidance
Fix Comanche's weapon lock and guidance
2016-06-20 09:53:33 +02:00
Glowbal
3e01661f32 Merge pull request #3941 from sargken/master
RHS Ballistic Glasses Tint - Fix
2016-06-20 09:53:01 +02:00
esteldunedain
dc1c312288 Also handle the surrendering AnimChanged EH 2016-06-19 20:15:51 -03:00
esteldunedain
ac144ca248 Move the AnimChanged EH to its own function to avoid duplication 2016-06-19 19:30:36 -03:00
esteldunedain
8042b888d4 Close #3950 2016-06-19 19:17:49 -03:00
esteldunedain
394832ef40 Completely restore the Comanche's DAGRs to vanilla. Close #3671 2016-06-19 18:26:09 -03:00
Nicolás Badano
618d14555a Merge pull request #3952 from alganthe/french_translation_update
French translation update
2016-06-19 10:18:47 -03:00
Josuan Albin
a04dec0c63 Update french translation 2016-06-19 15:16:43 +02:00
Josuan Albin
19da369887 Add back missing portuguese strings in inventory 2016-06-19 13:27:26 +02:00
commy2
c481ddedaf add 'name' to components 2016-06-19 09:38:39 +02:00
Glowbal
ca4741245b Merge pull request #3951 from acemod/iconMineDetectorActions
Add icons for mine detector actions
2016-06-19 09:36:35 +02:00
Josuan Albin
d26f133733 Add missing french entries in stringtables and update older ones
Take changes from #3480 and completed empty entries
2016-06-19 01:18:12 +02:00
esteldunedain
cc9e5f4631 Add icons for mine detector actions. Close #3935 2016-06-18 20:05:14 -03:00
commy2
ddbdf116ab Merge pull request #3949 from acemod/remove_unused_files
remove unused files
2016-06-18 20:17:42 +02:00
commy2
2d38ae62d2 remove another unused file 2016-06-18 20:12:17 +02:00
jonpas
ffd207dcf7 Merge pull request #3947 from acemod/fixCarrySitting
Fix ability to carry a chair someone is sitting on
2016-06-18 19:55:03 +02:00
commy2
9b6441b3c1 remove unused files 2016-06-18 19:54:39 +02:00
Glowbal
c7bb1ee9a4 Merge pull request #3948 from acemod/zeusScriptedXEH
Improve zeus auto-add XEH behaviour
2016-06-18 19:53:56 +02:00
jonpas
2b56d0c0dd Use claim system - fix possibility to carry while someone is sitting 2016-06-18 19:53:44 +02:00
SilentSpike
ca01f31b52 Improve zeus auto-add XEH behaviour
The XEH InitPost event only needs to be added if the `GVAR(autoAddObjects)` setting is enabled. This change will save on overhead when the setting is disabled and also removes some complexity from the function that runs in response to the event.
2016-06-18 15:41:13 +01: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
Glowbal
72092d6464 Merge pull request #3946 from acemod/fix-fullheal-anim
Fix strange animation played when using PAK
2016-06-18 13:34:25 +02:00
Glowbal
74da8cc36c Fix strange animation played when using PAK
Fixes #1695
2016-06-18 13:12:49 +02:00
Glowbal
f6b744e741 Merge pull request #3945 from acemod/fix-gray-screen-medical
Fix no gray screen for advanced medical
2016-06-18 11:59:14 +02:00
Glowbal
12a1f10a29 Merge pull request #3944 from acemod/funcHeaders
Cleanup Function Headers Titles
2016-06-18 11:57:43 +02:00
Glowbal
2b4dfb4b54 Merge pull request #3943 from acemod/rearmRemoteFncEvents
Replace execRemoteFnc with CBA events in rearm
2016-06-18 11:56:49 +02:00
Glowbal
7dc76dee78 Fix no gray screen for advanced medical
Advanced medical was never displaying the gray screen on low blood volume. This is because for advanced medical, the blood volume minimum level is around 40 before death. For basic medical, this is 0.
2016-06-18 11:55:03 +02:00
jonpas
03e923aa68 Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
Githawk
0723df7dea Replace execRemoteFnc with CBA events in rearm 2016-06-18 11:44:36 +02:00