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

7056 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
commy2
9665f73fa3 Merge branch 'master' of https://github.com/acemod/ACE3 into medical-adjustments 2015-09-02 17:03:36 +02:00
SilentSpike
6aa191b788 Merge pull request #2327 from acemod/fixGunnerGoggles 
Fix gunner goggles
 2015-09-02 13:31:50 +01:00
commy2
07ab7d1c35 correct comment 2015-09-02 02:00:53 +02:00
commy2
29efc13556 hide clock, use eventhandler 2015-09-02 01:59:07 +02:00
commy2
43c54d51e8 hide clock on map if no watch in inventory, #414 2015-09-02 01:40:38 +02:00
commy2
83424cdcab header for fnc_flare 2015-09-02 00:03:16 +02:00
commy2
7ce606740c make flares work in mp 2015-09-01 23:56:25 +02:00
commy2
be56fd7d46 scripted approach to hand flares, fix #1079 2015-09-01 23:19:49 +02:00
commy2
237d5b6536 stand up action (uses get out shortcut) and less awkward standing animaton 2015-09-01 21:03:28 +02:00
commy2
acfc48efc2 animate head when surrendered and handcuffed 2015-09-01 20:00:28 +02:00
commy2
405d85eaaa fix leaning back through chair while sitting, fix #1795 2015-09-01 19:06:20 +02:00
PabstMirror
264091957a #1917 - Pointing Update Circle Icon 2015-09-01 10:09:14 -05:00
commy2
fb9ad6075f Merge pull request #2337 from acemod/322bouncym84 
bouncing flashbangs, fix #1907
 2015-09-01 17:05:36 +02:00
commy2
c0defe9204 Merge pull request #2336 from acemod/322hcmodule 
high command module breaks ace, fix #2134
 2015-09-01 17:05:24 +02:00
commy2
dd788342fe remove commented debug messages 2015-09-01 16:37:46 +02:00
bux578
de66c2be7b add commy's newest issue 2015-09-01 13:16:58 +02:00
commy2
b1fbbcc49f bouncing flashbangs, fix #1907 2015-09-01 12:46:15 +02:00
commy2
5e68486233 high command module breaks ace, fix #2134 2015-09-01 10:06:01 +02:00
commy2
73911f701d add debug messages for #2134 2015-09-01 08:53:11 +02:00
commy2
3362bbf0bf fix protection 1.50 ubc issues 2015-09-01 00:01:42 +02:00
commy2
5a164c5cdc fix UBC issues, simplify uniform hitpoint config 2015-08-31 23:36:59 +02:00
commy2
87cf7ded83 Merge pull request #2311 from acemod/322backpack 
objectParent command replacing fnc_getBackpackAssignedUnit
 2015-08-31 21:32:42 +02:00
commy2
e7d9e8c0dc Merge pull request #2312 from acemod/322opendoor3rdperson 
increase reach in 3rd person for opening doors, fix #2301
 2015-08-31 21:32:34 +02:00