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
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
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
jonpas
ed15d99915
Fix basic UI being overwritten on RscDiary unload ( #3920 )
...
* Display disabled message when basic config set by mission showHud
* Set showHud on RscDiary unload - fix #3907 , Remove redundant force parameter from basic setElements
* Log forced source to RPT
* Add source to scripted element setter
2016-06-18 11:32:56 +02:00
Glowbal
5d9def3874
Merge pull request #3927 from acemod/use-proper-undefs
...
Fix for MikeRo Tools strict requirement for #undef usage
2016-06-18 11:25:25 +02:00
Glowbal
4c2c647842
Fix change in behaviour of QFUNC
...
When using QFUNC, the intend most often is to have the name of the variable referencing the function as a string. This behaviour works when compiling without debug enabled. However if debug is enabled, QFUNC compiles in with the debug wrapper, becoming a code string instead of a string representation of a variable reference.
A good example where this change of behaviour can be a problem is config attributes that refer to a call back (used a lot within ACE). In normal build, you will use a getvar to get the relevant code, as it is expected to point to the function. When using debug, you will need to do a compile instead, as it's a string representing a code block.
2016-06-17 21:44:04 +02:00
Glowbal
a63f496bf6
Merge pull request #3936 from acemod/fixMineDetector
...
fix mine detector not picking up fused explosives
2016-06-17 09:17:49 +02:00
bux578
04c9b628c4
exit the loop properly
2016-06-16 17:36:37 +02:00
bux578
2d029401f5
fix capitalization
2016-06-16 17:33:21 +02:00
bux578
5f52101b26
fix mine detector not picking up fused explosives
2016-06-16 17:20:15 +02:00
Glowbal
eedb406ae5
Merge pull request #3930 from acemod/wireCuttersLOS
...
Fix Line Of Sight check for wire cutter helper
2016-06-16 15:03:05 +02:00
Glowbal
fc241479fe
Merge pull request #3924 from voiperr/remove_attached_chemlights
...
On Detach, Delete Used Chemlights
2016-06-16 15:02:29 +02:00
Glowbal
66450ad36a
Merge pull request #3755 from acemod/add-mine-detector
...
Add mine detector port from ACE2
2016-06-16 14:59:35 +02:00
Glowbal
05aac2d223
Add store new helper object
...
Fixes an issue were you end up with many helper objects that are not cleaned up
2016-06-16 14:57:26 +02:00
PabstMirror
2bcc82cea7
Fix Line Of Sight check for wire cutter helper
...
Fix #2976
2016-06-14 19:32:30 -05:00
ViperMaul
99d08d988a
Merge branch 'master' of https://github.com/acemod/ACE3 into use-proper-undefs
2016-06-14 08:27:47 -07:00
ViperMaul
d5750a6c40
Remove Tab
2016-06-14 08:12:29 -07:00
ViperMaul
b79a00d8d1
These 2 can be removed, since they are in CBA since 2.4.0 as Note from jonpas
2016-06-14 08:11:28 -07:00
voiper
b69aa8571e
Chemlights no longer re-add to inventory on remove.
...
Items are detached prior to being deleted, to avoid objNull attaches.
2016-06-13 18:06:05 -07:00
commy2
11dc3bd71a
Merge pull request #3911 from acemod/gunbagCleanup
...
Gunbag cleanup
2016-06-13 20:39:46 +02:00
PabstMirror
a6766b611f
Always add finger keybind so it is changeable ( #3914 )
2016-06-13 12:14:35 -05:00
ViperMaul
2242f7c622
Fix for MikeRo Tools strict requirement for #undef usage
2016-06-13 09:20:09 -07:00
Glowbal
2870944067
Merge pull request #3915 from acemod/medical-impr
...
Minor improvements to ACE medical code part 2
2016-06-13 17:06:10 +02:00
jonpas
6644a89fbf
More isModLoaded
2016-06-13 15:58:42 +02:00
Glowbal
38cdd523f0
Clean up medical function private declares
2016-06-13 14:27:43 +02:00
Glowbal
fd108478fe
Clean up medical menu privates
2016-06-13 12:49:35 +02:00
Glowbal
8e59993d7a
Change clean up medical code
2016-06-13 10:55:19 +02:00
Glowbal
a18af7c207
Merge pull request #3912 from acemod/medical-impr
...
Small clean up to medical
2016-06-13 09:49:45 +02:00
