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

6064 Commits

Author SHA1 Message Date
jonpas
efa8252b45 Remove debug 2015-09-11 17:43:29 +02:00
jonpas
2d3a02085e Improved comment 2015-09-11 17:27:08 +02:00
jonpas
d49798144c Replaced hasChairMoved with isEqualTo, fixed missing variable 2015-09-11 17:25:46 +02:00
jokoho48
b7e02da1cc remove if (!hasInterface) from PFH 
move ! in ()
 2015-09-11 16:58:26 +02:00
jonpas
c5f9f85d27 Updated comment 2015-09-11 16:53:09 +02:00
jonpas
0b9c6254e4 Removed redundant rotation control - changed to config 2015-09-11 16:46:51 +02:00
SilentSpike
aa7b6cf39f Improve angular behaviour of spectator camera 
Changes the position calculation of the external spectator camera to correctly retain the pan and tilt of the free camera. Makes transitioning between the two less disorienting for the user.
 2015-09-11 14:46:21 +01:00
SilentSpike
77c2b99ee5 Change spectator external camera behaviour 
Using the "external" view is limited by the server difficulty setting. Instead the spectator external camera has been replaced with an oribtal camera as was originally planned to be added alongside the default views.
 2015-09-11 14:46:21 +01:00
SilentSpike
17f9eab03a Improve display name of medical heal hitpoints setting 
ace_medical_healHitPointAfterAdvBandage had a slightly misleading display name that didn't quite convey what it is actually doing
 2015-09-11 12:33:18 +01:00
Glowbal
f60954a49b increased build number (3.3.0.1) 2015-09-10 22:18:13 +02:00
KoffeinFlummi
70dfbe2ec0 Fix some merging errors 2015-09-10 22:11:09 +02:00
KoffeinFlummi
63c2712360 Merge branch 'release' into portuguese 2015-09-10 21:59:30 +02:00
KoffeinFlummi
c2ffe7cad0 Merge branch 'release' into russian 2015-09-10 21:05:32 +02:00
KoffeinFlummi
a5621604fd Merge branch 'release' into czech 2015-09-10 20:51:33 +02:00
KoffeinFlummi
83aa2cc68c Merge branch 'release' into french 2015-09-10 19:36:56 +02:00
FreeZbe
fa7943c8be Update French translations 2015-09-10 19:14:51 +02:00
jokoho48
cc9cdae972 Merge branch 'release' of https://github.com/acemod/ACE3 into FixHCPPE 2015-09-09 20:25:48 +02:00
Glowbal
82d9e70c88 Merge pull request #2385 from jokoho48/BackBlastEnhanced 
Back blast enhanced
 2015-09-09 19:39:32 +02:00
jokoho48
defbdf1b1a fix that HC throw a issue if PPEffect was used/applyed 2015-09-09 17:05:48 +02:00
Michael Braun
a5fb09a7e1 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros 
Conflicts:
	addons/repair/functions/fnc_moduleRepairSettings.sqf
 2015-09-09 02:55:12 +02:00
jokoho48
1ed52e08bf fix missing default 2015-09-08 19:45:46 +02:00
Glowbal
6a31140f7d Version 3.3.0 2015-09-08 19:38:52 +02:00
Glowbal
d6b51b2138 Merge pull request #2374 from acemod/microDagr 
Move MicroDAGR 3D model from BFT branch to microdagr module reopen #2373
 2015-09-08 19:31:02 +02:00
Glowbal
0c371ddf37 disabled debug for medical 2015-09-08 19:06:01 +02:00
ProfessorCZ
a28e9d96c7 Czech Translations - Update 2015-09-07 17:40:14 +02:00
gienkov
ad50c1ab4b medical and repair translation 2015-09-07 16:15:18 +02:00
jokoho48
7f6e7de68c Add LoD 
Lower Poly in Shadow LoD
 2015-09-07 16:10:55 +02:00
gienkov
c4475ff5be Merge branch 'pl-translation-7' of https://github.com/gienkov/ACE3 into pl-translation-7 2015-09-07 16:06:17 +02:00
gienkov
1edcc320d1 Merge remote-tracking branch 'origin' into pl-translation-7 2015-09-07 16:05:45 +02:00
Glowbal
7b349ab388 Merge pull request #2361 from acemod/medical-adjustments2 
Medical adjustments2
 2015-09-07 15:51:27 +02:00
nsgundy
eee5664ec5 Move MicroDAGR 3D model from BFT branch to microdagr module 2015-09-07 11:05:18 +02:00
ViperMaul
2fc35338d5 Build number for Release Candidate 2015-09-06 21:37:20 -07:00
jokoho48
45eb8c4822 Add Code for CBA update 2.1 2015-09-06 19:34:46 +02:00
commy2
adb1a11211 increase leg and arm armor value, more TRACE debug 2015-09-06 11:49:08 +02:00
[OMCB]kaban
78084f271a Changed "Effect Zeus RC" to "Affects Zeus RC" 2015-09-06 07:11:27 +03:00
ViperMaul
98202f4f38 Additional debug statements for caching and wounds. 2015-09-05 15:31:14 -07:00
Glowbal
a745b07cb6 Merge pull request #2365 from jonpas/addSparePartsSettingInitDelay 
Used new setting init delay function in addSpareParts
 2015-09-05 21:18:25 +02:00
Jonathan Pereira
7147891710 Added latest ACE3 PT-BR translations 2015-09-05 15:12:31 -03:00
jonpas
a8412361bd Use setting init delay function for addSpareParts 2015-09-05 19:33:25 +02:00
TheMagnetar
27a0e8f639 Repair: Fix possible out of bounds setting 
Setting "engineerSetting_fullRepair" had an out of bounds default value.
 2015-09-05 16:30:00 +02:00
Glowbal
315f46c6c6 Merge branch 'master' into medical-adjustments2 2015-09-05 14:41:25 +02:00
Glowbal
0a6b77b902 Removed more deprecated wound sync code 2015-09-05 14:10:28 +02:00
Glowbal
e4c246984f Removed another debug trace that should not be there 2015-09-05 14:10:04 +02:00
Glowbal
d9af19df28 properly fixes unconscious weird behavior. Because it never registered any unconscious conditions. 2015-09-05 14:08:46 +02:00
Glowbal
41db78b52b Merge pull request #2341 from acemod/323tracers 
better scaling for tracer sizes, fix #1008
 2015-09-05 13:47:37 +02:00
commy2
46d741281b Merge pull request #2358 from acemod/322flashbangexplosive 
sort flashbang under explosive grenades, not misc grenades
 2015-09-05 13:40:24 +02:00
Glowbal
a4b4c5d2a3 Merge pull request #2187 from jonpas/trackToTrackedVehicles 
Added Spare Parts module handling
 2015-09-05 13:36:42 +02:00
Glowbal
dad96822be Only add 1/4 of the new damage to pain instead of everything. 2015-09-05 13:27:02 +02:00
Glowbal
6405ef7d91 Merge branch 'master' into medical-adjustments2 2015-09-05 13:22:44 +02:00
Glowbal
f15a1c033d Added allowSelfTreatment attribute to treatment actions 2015-09-05 13:20:19 +02:00
Glowbal
f0a074072f Merge pull request #2329 from acemod/323medicalstrcturaldamage 
setStructuralDamage function
 2015-09-05 13:16:13 +02:00
Glowbal
446f367f8b Merge pull request #2359 from acemod/fixRestoreGear 
fix restore gear
 2015-09-05 13:09:21 +02:00
Glowbal
9c7f7429d1 Merge pull request #2350 from jonpas/cargoHideActionOnLocked 
Prevent Cargo opening if vehicle is locked
 2015-09-05 13:09:14 +02:00
Glowbal
a4e406658f Reduced initial knockdown time for basic medical 2015-09-05 13:02:19 +02:00
Glowbal
17ad7ecb8c replaced diag_logs by trace 2015-09-05 12:59:09 +02:00
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
Michael Braun
035b3432c5 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros 
Conflicts:
	addons/common/XEH_postInit.sqf
 2015-09-01 08:45:59 +02:00
PabstMirror
c97e0eb500 MapTools - Handle Bad Aspect Ratio 2015-08-31 22:50:01 -05:00
jokoho48
3f4d0af940 prevent Issues with other mods 2015-09-01 01:03:34 +02:00
jokoho48
afee398b11 woops 2015-09-01 00:51:32 +02:00
jokoho48
5d612abd02 posible Fix for #2310 2015-09-01 00:42:13 +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