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,372 Commits 73 Branches 88 Tags 752 MiB
2231464087
Commit Graph

10372 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
voiper
3070b2ac6e Sounds are sourced from configs. 
Used impactGroundSoft[] as shortcut.
 2016-06-15 18:16:28 -07:00
Nicolás Badano
2660c9974e Merge pull request #3932 from acemod/viTweaks 
getVehPos - Tweak heli width, and put at eye level
 2016-06-15 08:02:29 -03:00
PabstMirror
81c8ea54c3 getVehPos - Tweak heli width, and put at eye level 2016-06-14 23:30:58 -05:00
PabstMirror
cfc046ce71 Fix Merge 2016-06-14 19:37:22 -05:00
PabstMirror
d46c596cc4 Merge remote-tracking branch 'refs/remotes/origin/master' into vehicleInteractionDistance 2016-06-14 19:36:45 -05: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
c0e412211e More realistic chemlight impact sounds. 2016-06-13 18:07:46 -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
esteldunedain
a12d9dc2fb Attempt aof fixing the placement of spotting scopes on slopes 2016-06-13 16:51:28 -03: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
295ad3b037 Merge branch 'medical-impr' into merge-basic-and-advanced 2016-06-13 14:32:15 +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
58f43f8a51 Remove unneeded and deprecated functions from medical 2016-06-13 12:24:28 +02:00
Glowbal
d568041838 Change medical menu to work with basic medical injury overhaul 2016-06-13 12:19:19 +02:00
Glowbal
6657bde921 Change basic medical to use advanced medical injury system 2016-06-13 12:18:56 +02:00
Glowbal
792dbcd009 Change clean up privates in handleDamage code 2016-06-13 11:05:21 +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
Glowbal
73bd684b65 Change formatting and private keywords in medical 2016-06-13 02:34:56 +02:00
Glowbal
3ba2396db7 Change minor clean up of handleUnitVitals 2016-06-13 02:11:21 +02:00
jonpas
b80b7e5265 Shorten more GVARs 2016-06-13 00:08:28 +02:00
jonpas
323555d9a4 Prefix model, Fix indentation of model.cfg, Remove redundant CLASSNAME macro 2016-06-13 00:03:33 +02:00
jonpas
b40915dd12 Cealnup quotes, capitalization, function headers 2016-06-12 23:56:00 +02:00
voiper
b45a17001c Merge remote-tracking branch 'origin/master' into grenadesounds 2016-06-12 14:54:14 -07:00
Glowbal
f0b0b49f3c Merge pull request #3908 from acemod/funBag 
Only do gunbag things when target has a gunbag
 2016-06-12 23:25:55 +02:00
Glowbal
43a2b0ea29 Merge pull request #3909 from acemod/fix-bandaging-configuration 
Adjust bandage configuration
 2016-06-12 23:25:16 +02:00
Glowbal
4c71974855 Merge pull request #3910 from acemod/fixVelWounds 
Add maxDam for medium velocity wounds
 2016-06-12 23:25:03 +02:00
PabstMirror
1997cb5199 Add maxDam for medium velocity wounds 
Ensures that velocity wounds from a major hit will use the "Large" type
of wound
 2016-06-12 14:47:59 -05:00
Glowbal
fa1282406f Change bandage configurations 
- Field dressing is average treatment
- Packing bandage is average treatment, higher reopen change, longer reopening delay
- Elastic bandage is higher treatment, higher reopen change, shorter reopen delay
- QuikClot is lower treatment, lower reopen change, longer reopening delay
 2016-06-12 20:40:45 +02:00
PabstMirror
e8a403a9ad Only do gunbag things when target has a gunbag 2016-06-12 12:58:39 -05:00
Glowbal
b16f444795 Merge pull request #3905 from acemod/fix-c4996 
Fix c4996
 2016-06-12 17:42:38 +02:00
Glowbal
b52c1c8ce3 Merge branch 'master' into fix-c4996 
Conflicts:
	extensions/clipboard/ace_clipboard.cpp
 2016-06-12 17:35:19 +02:00
Glowbal
8dc8926960 Merge branch 'master' into fix-c4996 
Conflicts:
	extensions/parse_imagepath/ace_parse_imagepath.cpp
 2016-06-12 17:30:29 +02:00
VKing
d5f8d965f3 Change ace_time to cba_missionTime 2016-06-12 17:22:44 +02:00
VKing
6b62436cfb Delete unused animation files 2016-06-12 16:29:00 +02:00
VKing
fe18107077 Fix cfgPatches entries 2016-06-12 16:28:42 +02:00
commy2
1136a57e42 Merge pull request #3903 from acemod/gunbag_ace 
Gunbag ace
 2016-06-12 14:03:02 +02:00
commy2
3c6de5ad6f remove misc box from gunbag CfgPatches 2016-06-12 14:00:55 +02:00
commy2
000e4a68e6 gunbag improvements 2016-06-12 13:51:23 +02:00
VKing
7f3aacb4d6 Add mass to metal detectors 
Based on values from the manufacturer's pamphlet (vallon.de)
 2016-06-12 12:41:59 +02:00
commy2
7a0b9a1a16 Merge branch 'gunbag' of https://github.com/ir0n1e/ACE3 into ir0n1e-gunbag 2016-06-12 11:02:23 +02:00