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
4,909 Commits 73 Branches 88 Tags 752 MiB
9a07a9bfd6
Commit Graph

4050 Commits

Author SHA1 Message Date
ViperMaul
9a07a9bfd6 modify unloadPerson to use unloadPersonLocal 
#1375
 2015-05-25 09:43:29 -07:00
ViperMaul
7141d251c7 create unloadPersonLocal 
#1375
 2015-05-25 09:41:24 -07:00
ViperMaul
cafaef9612 revert missing actionDragUnit file 
#1375
 2015-05-25 09:39:12 -07:00
ViperMaul
06932f0c03 Restore missing actionDragUnit function file 
#1375
 2015-05-24 15:14:11 -07:00
ulteq
ee022e1dea Fixes broken scope config (#1312) 2015-05-23 17:06:46 +02:00
Glowbal
7170db5dc2 Merge pull request #1368 from acemod/medicalBloodBags 
Medical blood bags size matters
 2015-05-23 10:07:58 +02:00
PabstMirror
d82fcd1f96 Advanced - Bloodbag lookup by treatment not item 2015-05-23 01:26:13 -05:00
PabstMirror
d752dd50d0 Basic - Bloodbag size matters 2015-05-23 01:16:18 -05:00
bux578
04dd791374 Merge pull request #1367 from jonpas/stringtableABfix 
Fixed missing close tag in Advanced Ballistics stringtable
 2015-05-23 07:48:56 +02:00
PabstMirror
437db22ab8 #1364 - Prevent script error if bad muzzle 2015-05-22 23:38:16 -05:00
jonpas
030b509ec5 Fixed missing close tag in Advanced Ballistics stringtable 2015-05-23 03:34:11 +02:00
PabstMirror
8fd0aef7d4 Medical - Fix Handle Damage 
{} were unmatched so nothing ran.
I think this is just leftover from a merge.
 2015-05-22 16:35:48 -05:00
Glowbal
48ed51b03c Merge pull request #1361 from acemod/FixUnconsciousCondition 
Medical - Fix Unconscious Condition
 2015-05-22 22:39:18 +02:00
PabstMirror
f785fcc0d4 Merge pull request #1362 from acemod/timeHasComeToday 
Fix Time Calc
 2015-05-22 14:32:56 -05:00
PabstMirror
f4bf6ea26d Fix Time Calc 2015-05-22 14:29:56 -05:00
PabstMirror
537bba1382 Medical - Fix Unconscious Condition 2015-05-22 13:56:45 -05:00
ulteq
308b0aa0f9 Fixed incorrect barrel length. 2015-05-22 20:41:36 +02:00
ulteq
9536423f2e Merge pull request #1353 from acemod/cleanup_ATragMX_AB 
Removed a deprecated function and fixed some typos.
 2015-05-22 18:42:20 +02:00
ulteq
e88c570ef2 Removed a deprecated function and fixed some typos. 2015-05-22 18:42:09 +02:00
jaynus
582ea318d4 Merge remote-tracking branch 'origin/superTime' 
Conflicts:
	addons/frag/functions/fnc_fired.sqf
	addons/frag/functions/fnc_trackFragRound.sqf
 2015-05-22 07:24:55 -07:00
PabstMirror
72020a43f1 Privates / Remove Debug 2015-05-21 17:53:15 -05:00
PabstMirror
4e92a51cf8 Create Defuse Helpers for spawned Explosives 2015-05-21 17:47:54 -05:00
jaynus
46751fd912 Merge pull request #1163 from acemod/fragSpallOptimization 
Frag spall optimization
 2015-05-21 15:08:07 -07:00
jaynus
3cb4094429 Merge branch 'fragSpallOptimization' of github.com:acemod/ACE3 into fragSpallOptimization 2015-05-21 15:07:12 -07:00
jaynus
c297257421 Disable frag by default. Add @pabstmirror fix closes #1339 closes #820 2015-05-21 15:06:55 -07:00
Felix Wiegand
fd2676c7b9 Merge pull request #1135 from acemod/fcsPrivates 
FCS - Privates
 2015-05-21 22:18:14 +02:00
Glowbal
8b69b3b1b1 Merge pull request #1332 from acemod/medicalBinocTreatment 
Fix Script Error when treating with bincos
 2015-05-21 20:20:41 +02:00
ulteq
24b2fea303 Persistent reference heading for the Kestrel 4500. 2015-05-21 19:28:59 +02:00
ulteq
1816208997 Proper Min/Max storing of negative tailwind values. 2015-05-21 19:18:15 +02:00
jaynus
c924baefd7 All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07:00
ulteq
db7c2a19e6 Tailwinds are displayed as negative values. 2015-05-21 11:14:37 +02:00
PabstMirror
1aa9520adb Fix Script Error when treating with bincos 2015-05-20 23:24:44 -05:00
Nicolás Badano
72d955bc0c Merge pull request #1328 from alef/master 
Fixed: Removed § typo at the end of EH call
 2015-05-20 19:01:52 -03:00
Kavinsky
4b048553e2 wops... corrected wrong path 2015-05-20 23:44:50 +02:00
Kavinsky
8e9b35c757 Fixed Capitalized folders on include paths 2015-05-20 23:28:10 +02:00
ulteq
7d3bb526dd Merge pull request #1263 from acemod/bulletTraceTweak 
Slightly increased the bullet trace effect size
 2015-05-20 22:12:37 +02:00
ulteq
149e3ae8b0 Slightly decreased the visibility of the bullet trace effect. 2015-05-20 22:12:02 +02:00
Alessandro Foresi
67319b6808 Fixed: Removed § at the end of EH call 2015-05-20 22:04:19 +02:00
jaynus
e6270f6e39 Fixed: Font config breaking checkPBO 2015-05-20 10:42:24 -07:00
KoffeinFlummi
f16f282abd Merge remote-tracking branch 'origin/release' into master-fix 
Conflicts:
	addons/medical/functions/fnc_handleDamage.sqf
	extensions/common/p3d/animation.cpp
	extensions/common/p3d/compressed.cpp
	extensions/common/p3d/compressed.hpp
	extensions/common/pbo/archive.cpp
	extensions/common/pbo/search.cpp
	extensions/common/pbo/search.hpp
	extensions/common/shared.hpp
	extensions/common/simplepipe_win32.cpp
	extensions/common/simplepipe_win32.hpp
	extensions/common/simulation/object.cpp
	extensions/common/simulation/object.hpp
	extensions/common/targetver.h
	extensions/common/vector.hpp
 2015-05-20 19:31:55 +02:00
PabstMirror
64a401ee8c #1241 closed - Add Editor placeable item 2015-05-20 17:17:10 +02:00
PabstMirror
0d00894d9f #1318 - isInMedicalVehicle - medicClass is number 2015-05-20 17:17:09 +02:00
Garth L-H de Wet
8edeb45d6d Changed the animation from medic to put when placing an explosive. Added a put animation when setting the trigger for an explosive. 2015-05-20 17:17:09 +02:00
esteldunedain
23117db401 - Default viewDistance to video settings - Add 500m and 100m as optional view distances 2015-05-20 17:17:08 +02:00
Grzegorz
96322fe689 PL translation for new advanced ballistics option 2015-05-20 17:17:08 +02:00
esteldunedain
22b83826f0 Bandaid for #1281, until we properly solve unreliable init handlers. 1- Menus for CAManBase are precomputed on preInit 2- Class action menus for all men are supposed to be equal to those of CAManBase Note: we loose the capability of defining actions for specific classes from config (which we don't do on ACE annyway) 2015-05-20 17:15:25 +02:00
Glowbal
694a24c970 Only change the color if bleeding (adv) 2015-05-20 17:15:25 +02:00
Glowbal
0a2679846c Changed: morphine works 15 minutes 2015-05-20 17:15:24 +02:00
Glowbal
e8d169248f Made atropine less effective 2015-05-20 17:15:23 +02:00
Glowbal
82260e5090 Changed: Made Morphine suppress more pain 2015-05-20 17:15:23 +02:00