Commit Graph

10262 Commits

Author SHA1 Message Date
J3aLeiNe
08aa518e68 Update config.cpp
Add correct requiredAddons entries since the last @R3F_ARMES update
2016-06-22 16:55:19 +02:00
J3aLeiNe
6a92b43b1d Update fnc_getMapData.sqf
Add maps and fix latitude :
 - Kidal, latitude 18° (default latitude 0°)
 - Governor´s Island, latitude 41° (default latitude -34°)
 - Doung island (Unsung Mod), latitude 10° (default latitude -10°)
 - Dakrong (Unsung Mod), latitude 16° (default latitude -16°)
 - Pecher map, latitude 43° (default latitude -34°)

Remove obsolete Arma2 Lingor map

and fix my illiterate mistakes ...
2016-06-22 16:36:53 +02:00
commy2
08886f413c change remaining ace events to CBA 'addPlayerEventHandler' 2016-06-22 11:16:55 +02:00
commy2
047ac8c3f2 Merge pull request #3973 from acemod/eventWrappers
Convert state checking to CBA playerEH
2016-06-22 10:53:47 +02:00
commy2
bd41260fa8 add a missing 'private' 2016-06-22 10:46:04 +02:00
Glowbal
cea77fb331 Merge pull request #3974 from acemod/master
Move towards 3.6.0 release
2016-06-22 09:51:15 +02:00
PabstMirror
fad44e38a6 Convert state checking to CBA playerEH 2016-06-21 19:31:25 -05:00
Nicolás Badano
3fa17580c4 Merge pull request #3971 from acemod/dogtags-player-ssn
Generate SSN of unit from their name
2016-06-21 20:46:57 -03:00
commy2
89ecc81111 convert common events to CBA playerEvents 2016-06-22 01:39:20 +02: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
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
PabstMirror
3972504d4a Add dogtag actions to body bags 2016-06-21 12:13:32 -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
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
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
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
commy2
3fdc0dd521 Merge pull request #3955 from acemod/add_name
add 'name' to components
2016-06-20 19:25:58 +02: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
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