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

7182 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glowbal
23d45c53cf Merge branch 'master' into medical-adjustments2 2015-09-05 12:47:32 +02:00
Glowbal
c673ea2cbb Restored uniqueIds 2015-09-05 12:38:12 +02:00
Glowbal
17648739dd Removed more deprecated wound sync code 2015-09-05 12:37:01 +02:00
Glowbal
25a75b9f69 fixed incorrect macro usage 2015-09-05 12:35:48 +02:00
Glowbal
6b73eafcce Allow users to disable medical 3d interaction. 2015-09-05 12:31:52 +02:00
Glowbal
268220bbae Possible fix for weird unconscious behavior in basic medical 2015-09-05 12:20:40 +02:00
Glowbal
4122b32dba Removed deprecated wound sync code 2015-09-05 12:02:09 +02:00
Glowbal
e0db571e13 Minor adjustment to fatality change on torso damage 2015-09-05 12:00:45 +02:00
Glowbal
883b9ab545 Removed blur screen for medical menu #2069 2015-09-05 11:58:34 +02:00
Glowbal
85dc59d66c Fixed: should only display "no injuries" when there are no injuries. Not the other way around 2015-09-05 11:57:41 +02:00
Glowbal
130569c485 Made basic medical bleeding information work with new damage system 2015-09-05 11:57:17 +02:00
Glowbal
39ff82e764 fixes for CPR condition in basic medical and improvements to lethalDamage 2015-09-05 11:52:12 +02:00
Glowbal
4514812523 Basic bandaging now works with new damage system 2015-09-05 11:51:46 +02:00
Glowbal
cd9e5df782 Clean up of handleDamage. Fixes some debug code 2015-09-05 11:25:56 +02:00
Glowbal
df3dbc9772 Removed deprecated fire handling 2015-09-05 11:25:31 +02:00
Glowbal
a25f640614 fixes #2114 No CPR available in basic medical when revive is enabled 2015-09-05 11:07:10 +02:00
Glowbal
3d342ece20 Fixes #2156 Animation is still played even if you cancel any treatment 2015-09-05 11:04:11 +02:00
Glowbal
a02f95ae06 Merge pull request #2355 from acemod/settingInitDelayFunctions 
Setting init delay functions
 2015-09-05 11:01:44 +02:00
ViperMaul
4c0c7bc290 debug change 2015-09-04 10:21:10 -07:00
ViperMaul
7f58d5a94d Revert "Adding same ADV special case to BASIC handle damage." -Not Needed 
This reverts commit bf267246bf.
 2015-09-04 10:20:34 -07:00
ViperMaul
bf267246bf Adding same ADV special case to BASIC handle damage. 2015-09-04 07:48:16 -07:00
ViperMaul
2bc20501bc Adding more debug 2015-09-04 07:46:35 -07:00
ViperMaul
813e54a668 Fixing Debug for object variable hasPain 2015-09-04 07:37:20 -07:00
ViperMaul
89b0c05929 Fixed a debug statement. 2015-09-03 13:17:59 -07:00
commy2
b737f42777 fix error when opening triage card 2015-09-03 18:30:29 +02:00
bux578
9e1ae58f4f fix restore gear 2015-09-03 18:17:53 +02:00
PabstMirror
f63e652636 Merge pull request #2334 from acemod/mapToolsAspectRatio 
MapTools - Handle Bad Aspect Ratio
 2015-09-03 10:44:34 -05:00
commy2
795b7a893f Merge branch 'medical-adjustments2' of https://github.com/acemod/ACE3 into medical-adjustments2 2015-09-03 17:18:32 +02:00
ViperMaul
6d28214287 Add some debug values. 2015-09-03 08:18:37 -07:00
commy2
0bd92af072 fix variables not inited, csat armor scaleing 2015-09-03 17:17:54 +02:00
commy2
e753131f2d arms and legs to vulnerable, better scaling for pilots and csat 2015-09-03 16:17:48 +02:00
commy2
a84be46ed4 fix errors from cleanup 2015-09-03 15:49:49 +02:00
commy2
0436209dae Merge branch 'master' of https://github.com/acemod/ACE3 into medical-adjustments 2015-09-03 15:33:53 +02:00
commy2
736be74c2b Merge pull request #2344 from acemod/322hideclock 
hide clock on map if no watch in inventory, #414
 2015-09-03 13:44:20 +02:00
commy2
36b42f2780 Merge pull request #2343 from acemod/322flares 
scripted approach to hand flares, fix #1079
 2015-09-03 13:44:04 +02:00
commy2
529c85df58 Merge pull request #2338 from acemod/322sit 
Sitting improvements
 2015-09-03 13:43:53 +02:00
commy2
6b7f84b297 add missing ; 2015-09-03 13:39:17 +02:00
commy2
76bb2bd2b8 replace function with FUNC macro 2015-09-03 13:37:36 +02:00
commy2
a187be7255 sort flashbang under explosive grenades 2015-09-03 13:23:15 +02:00
PabstMirror
024dc3effe Cleanup 2015-09-03 00:16:48 -05:00
PabstMirror
789de9d111 runAfterSettingsInit helper func 2015-09-03 00:11:49 -05:00
PabstMirror
cbccd898ea Run functions after setting init 2015-09-02 23:58:24 -05:00
commy2
fbf00b9aa5 correct comment 2015-09-03 02:55:40 +02:00
PabstMirror
c213c0e05a Merge pull request #2352 from jonpas/slideshowPrivates 
Cleaned up Slideshow privates
 2015-09-02 16:10:31 -05:00
jonpas
def2d29501 Cleaned up slideshow privates 2015-09-02 22:51:31 +02:00
jonpas
0bbf4d4128 Prevent Cargo opening if vehicle is locked 2015-09-02 22:24:46 +02:00
Glowbal
f38d245771 fixed bloodloss for basic medical 2015-09-02 21:56:00 +02:00
commy2
f939f9215e stop flickering of wounds, fix #346 2015-09-02 20:49:17 +02:00
commy2
7d2f1f52a4 remove protection, hitpoint config (fix ubc), some debug stuff 2015-09-02 20:13:51 +02:00
commy2
dc5e6b7c3c Merge branch '323medicalstrcturaldamage' into medical-adjustments 2015-09-02 20:02:19 +02:00