Nicolás Badano
6801954e1f
Merge pull request #3969 from acemod/dogtag-bodybag
...
Add dogtag actions to body bags
2016-06-22 21:35:00 -03:00
SilentSpike
6d8121b544
Improve unit name SSN generation
...
Names shorter than the required 9 characters are now reused until we have 9 characters - making for fully unique generation.
To keep things distributed as pleasantly as possible they're itterated over with a step of two - alternating between odd and even indexes every full loop.
Similarly, the slice of string used for names longer than 9 characters is now offset based on the length of the name.
2016-06-21 20:35:23 +01:00
SilentSpike
ebcf1687a7
Generate SSN of unit from their name
...
Similar to how we're handling blood types, uses the unit's name to generate a valid three/two/four format SSN.
For names less than 9 characters long this will currently generate a unique SSN only up to the length of the name and append valid digits as necessary.
2016-06-21 18:42:15 +01:00
PabstMirror
3972504d4a
Add dogtag actions to body bags
2016-06-21 12:13:32 -05:00
esteldunedain
7f39748ff0
Tidy up text position to properly acommodate two line names
2016-06-20 17:42:21 -03:00
esteldunedain
7e3e101508
Nah, they don't
2016-06-20 17:37:37 -03:00
esteldunedain
171e6b278c
Merge branch 'dogtags_blood_type' of github.com:KoffeinFlummi/ACE3 into dogtags
...
# Conflicts:
# addons/dogtags/functions/fnc_getDogtagData.sqf
2016-06-20 17:19:35 -03:00
Nicolás Badano
09fd2c4895
Merge pull request #3965 from acemod/fixDogtagRespawn
...
Fix issue with dogtag respawn/setVariable
2016-06-20 17:17:02 -03:00
PabstMirror
578477eae6
Fix issue with dogtag respawn/setVariable
...
Store object instead of bool to indicate when dogtags have been taken
When object respawns, the the old object reference won't apply (defacto
reset)
2016-06-20 15:12:23 -05:00
esteldunedain
c47898a624
Parse the first portion of the uid
2016-06-20 17:04:30 -03:00
commy2
c88313221f
add function to report a blood type which is fixed to the units name
2016-06-20 21:50:00 +02:00
esteldunedain
88cf6aad98
Attempt on making blood type and service number unique for players
2016-06-20 16:45:34 -03:00
esteldunedain
6df82aad55
I can't believe it happened to me.
2016-06-20 16:12:40 -03:00
esteldunedain
0d30bf1de8
- Add random service number and bloodtypes to all units.
...
- Leave up to CBA to decide if events should be local or remote
- Imp
2016-06-20 15:51:36 -03:00
esteldunedain
e58d829927
Restyle the dog tag text.
2016-06-20 14:54:16 -03:00
esteldunedain
1f74bfca17
Merge branch 'dogtags' of https://github.com/SzwedzikPL/ACE3 into SzwedzikPL-dogtags
2016-06-20 12:46:49 -03: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
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
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
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
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
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
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
