Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,502 Commits 73 Branches 88 Tags 752 MiB
e85abbe746
Commit Graph

10502 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
BaerMitUmlaut
f0e4e5d2e8 Tweaked particles, added macros, tweaked burn times 2016-06-19 23:48:23 +02:00
BaerMitUmlaut
58c061553c Added readme and author 2016-06-19 23:46:41 +02: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