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

5948 Commits

Author SHA1 Message Date
Glowbal
9c0288cd3f Removed debug message 2015-09-05 12:55:49 +02:00
Glowbal
c8a7b94777 Merge pull request #2363 from acemod/MedicalMenuBlackoutBlur 
Add Screen Blur and Blackout for Medical Menu by Interact_menu setting
 2015-09-05 12:53:04 +02:00
Glowbal
d617fba6c6 Merge branch 'master' into medical-adjustments2 2015-09-05 12:51:18 +02:00
Glowbal
c828544d02 Added init stacking 2015-09-05 12:50:32 +02:00
jokoho48
c70c9cdee6 Add Screen Blur and Blackout for Medical Menu by Interact_menu setting 2015-09-05 12:49:23 +02:00
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
[OMCB]kaban
cc9a566c15 Fix due to review 2015-09-05 05:23:27 +03:00
[OMCB]kaban
298b475433 Fix due to review 2015-09-05 05:15:29 +03:00
[OMCB]kaban
ce49f752f1 Fix due to review 2015-09-05 05:14:34 +03:00
[OMCB]kaban
1bad390dba Fix due to review 2015-09-05 05:09:47 +03:00
[OMCB]kaban
8ef007b727 Fix due to review 2015-09-05 05:08:16 +03:00
[OMCB]kaban
6c48a4a0de Fix due to review 2015-09-05 05:07:18 +03:00
[OMCB]kaban
85b0127f56 Fix due to review 2015-09-05 05:00:18 +03:00
[OMCB]kaban
6f7437bb80 Fix due to review 2015-09-05 04:57:07 +03:00
[OMCB]kaban
f69b94af98 Fix due to review 2015-09-05 04:53:30 +03:00
[OMCB]kaban
421f7bc6f8 Fix due to review 2015-09-05 04:38:39 +03:00
[OMCB]kaban
9f416b796c Fix due ti review 2015-09-05 02:07:26 +03: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
kaban
15fe2c32b8 Russian Translations - Update 2015-09-03 04:58:08 +03:00
kaban
08b7110e58 Russian Translations - Update 2015-09-03 04:54:52 +03:00
kaban
50b05fcdf0 Russian Translations - Update 2015-09-03 04:38:38 +03:00
commy2
fbf00b9aa5 correct comment 2015-09-03 02:55:40 +02:00
kaban
91cae690c0 Russian Translations - Update 2015-09-03 03:36:15 +03:00
ProfessorCZ
44fa520bdd Czech Translations - Update 2015-09-03 01:20:24 +02: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
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
471d54f674 better saling for tracer sizes, fix #1008 2015-09-01 21:48:40 +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
dd788342fe remove commented debug messages 2015-09-01 16:37:46 +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
PabstMirror
c97e0eb500 MapTools - Handle Bad Aspect Ratio 2015-08-31 22:50:01 -05: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
commy2
aa1ad1bc2a Merge pull request #2313 from acemod/322ffvweaponselect 
fix weapon select in ffv slots not working
 2015-08-31 21:32:26 +02:00
commy2
9b6bc73c1a Merge pull request #2314 from acemod/322spottingscope 
better animation for spotting scope, fix #1638
 2015-08-31 21:32:17 +02:00
commy2
591327aaf3 Merge pull request #2315 from acemod/3220xgrenadebug 
fix autoriflemen spawning with 0x frag grenade bug
 2015-08-31 21:32:09 +02:00
commy2
80a0c93bdc Merge pull request #2316 from acemod/322customcamera 
fix custom cameras (for intros) being broken with ACE, fix #2248
 2015-08-31 21:32:02 +02:00
commy2
d85f96eac0 Merge pull request #2320 from acemod/322notonladder 
disable all actions while being on a ladder by default, close #2289
 2015-08-31 21:31:54 +02:00
commy2
e241c70a78 Merge pull request #2318 from acemod/322tripotmagsize 
tripod hmgs should have 100rnd mags instead of 500rnd mags, fix #1190
 2015-08-31 21:31:44 +02:00
commy2
2a82b97b5a Merge pull request #2328 from acemod/322laserpointer 
laserpointer with new command lineintersectssurface
 2015-08-31 21:31:35 +02:00