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,763 Commits 73 Branches 88 Tags 752 MiB
602832cc0c
Commit Graph

6401 Commits

Author SHA1 Message Date
commy2
0070ba113c Merge pull request #2546 from acemod/overheatJamFFV 
Allow fixing jam when in FFV slot
 2015-09-21 19:51:14 +02:00
PabstMirror
1d5217d165 Medical - delayedUnconsicous fix waitAndExecute 2015-09-21 12:43:35 -05:00
commy2
5a5242f1c9 more common code cleanup 2015-09-21 19:19:49 +02:00
PabstMirror
4cc9b91d68 Merge pull request #2463 from acemod/cleanupNightvision 
Cleanup Nightvision
 2015-09-21 12:06:15 -05:00
PabstMirror
5a67b00540 Merge pull request #2507 from acemod/pythonSearchNilFuncs 
Script to search for undefined functions
 2015-09-21 12:05:27 -05:00
commy2
8503d15c9b more common code cleanup 2015-09-21 18:37:19 +02:00
commy2
1a4ebdac51 more common code cleanup 2015-09-21 17:32:21 +02:00
commy2
13b487e13b fix missing ; 2015-09-21 17:13:28 +02:00
commy2
b5b5c761c4 fix missing '' in info log macro 2015-09-21 17:09:10 +02:00
commy2
3037181fc2 more common code cleanup 2015-09-21 17:00:53 +02:00
commy2
df3211cc42 more common code cleanup 2015-09-21 14:20:53 +02:00
commy2
b0f9eab1f7 more common code cleanup 2015-09-21 13:53:12 +02:00
commy2
5adca6616d Merge branch '323cleanuphitpoints' into commoncleanup10 2015-09-21 13:24:12 +02:00
commy2
9fa6eb0651 more common code cleanup 2015-09-21 13:08:10 +02:00
commy2
ef099861a3 Merge pull request #2545 from acemod/commoncleanup9 
common code cleanup part 9
 2015-09-21 09:24:41 +02:00
bux578
9be4072a10 Merge pull request #2547 from gienkov/patch-34 
Add missing english string
 2015-09-21 08:44:31 +02:00
bux578
549a3e0a2a Merge pull request #2548 from gienkov/patch-35 
Add missing english string
 2015-09-21 08:44:16 +02:00
commy2
d802cdfb23 more common code cleanup 2015-09-21 01:41:17 +02:00
commy2
d449e4bd83 more common code cleanup 2015-09-21 01:07:49 +02:00
PabstMirror
5555eb195a Also search for missing stringtable entries 2015-09-20 17:46:43 -05:00
Grzegorz
89a1495534 Add missing english string 2015-09-21 00:42:08 +02:00
Grzegorz
29db26eb58 Add missing english string 2015-09-21 00:40:14 +02:00
Grzegorz
fe75aa55cf Add missing english string 2015-09-21 00:39:13 +02:00
commy2
5f7d8c0095 more common code cleanup 2015-09-21 00:34:04 +02:00
commy2
1679235b51 more common code cleanup 2015-09-21 00:28:25 +02:00
PabstMirror
345b1f0f98 Merge branch 'master' into miscFixNilFunctions 
Conflicts:
	addons/common/functions/fnc_execPersistentFnc.sqf
	addons/common/functions/fnc_execRemoteFnc.sqf
 2015-09-20 17:02:49 -05:00
PabstMirror
79d4eb62be Allow fixing jam when in FFV slot 2015-09-20 16:55:33 -05:00
commy2
1d4eb209a4 fix missing ; in dumpPerformanceCounters 2015-09-20 23:50:30 +02:00
commy2
ffc5a16384 more common code cleanup 2015-09-20 23:40:51 +02:00
commy2
a98a45e5d1 more common code cleanup 2015-09-20 23:18:51 +02:00
commy2
62ec00a251 more common code cleanup 2015-09-20 22:36:05 +02:00
commy2
5fd1938f25 more common code cleanup 2015-09-20 22:29:38 +02:00
commy2
493ce1b092 more common code cleanup 2015-09-20 22:16:51 +02:00
commy2
2348c25e1a more common code cleanup 2015-09-20 20:25:25 +02:00
PabstMirror
86fae2c251 #2528 - addToLog date / missing string fullHeal 2015-09-20 13:19:51 -05:00
PabstMirror
0c8a694b96 Medical_menu settings under medical category 2015-09-20 12:07:44 -05:00
PabstMirror
610fb0bb2c Fix Merge 2015-09-20 11:28:43 -05:00
PabstMirror
7687374fcf Merge branch 'master' into miscFixNilFunctions 
Conflicts:
	addons/common/functions/fnc_resetAllDefaults.sqf
 2015-09-20 11:25:33 -05:00
Alessandro Foresi
aabc437314 Remove: pain diagnosis on dead patients 2015-09-20 17:37:33 +02:00
PabstMirror
9c61f256bc Rem debug 2015-09-20 10:06:24 -05:00
PabstMirror
789f3843d5 #2488 - Fix cargo setVariable on server with InitPost 2015-09-20 10:05:34 -05:00
commy2
0a01bbdc76 more common code cleanup 2015-09-20 16:56:35 +02:00
commy2
e62683a0c4 more common code cleanup 2015-09-20 16:40:49 +02:00
commy2
e8ebe87450 more common code cleanup 2015-09-20 15:52:40 +02:00
alganthe
4265b11d51 wrong target fixed 
Signed-off-by: alganthe <alganthe@live.fr>
 2015-09-20 14:13:22 +02:00
Glowbal
461028b4e8 Merge pull request #2521 from acemod/fix-ctd-medical 
Fixed CTD on overpressure with advanced medical enabled
 2015-09-20 12:44:58 +02:00
Glowbal
8279f60d09 Merge pull request #2529 from acemod/repairCanInteractCheck 
Add CanInteractWith checks for repair
 2015-09-20 11:48:10 +02:00
Glowbal
409c2d5f78 Merge pull request #2505 from acemod/fixBFT 
Run BFT module on server
 2015-09-20 11:46:03 +02:00
commy2
4c4785c140 Merge pull request #2535 from acemod/commoncleanup7 
common code cleanup part 7
 2015-09-20 11:06:38 +02:00
commy2
d33a98c612 set variable public didn't work / didn't work on server and headless client 2015-09-20 11:02:15 +02:00
commy2
8c8b23ec18 Merge pull request #2530 from acemod/commoncleanup6 
common code cleanup part 6
 2015-09-20 10:44:31 +02:00
PabstMirror
05f4dad764 maptools - Remove debug 2015-09-19 20:42:46 -05:00
commy2
dfa6d71a64 more common code cleanup 2015-09-20 00:55:58 +02:00
commy2
73a9c1b5f8 more common code cleanup 2015-09-19 23:18:07 +02:00
commy2
6b96c7fd7c more common code cleanup 2015-09-19 22:27:23 +02:00
commy2
bfd5d13de8 more common code cleanup 2015-09-19 21:33:25 +02:00
bux578
450ee98004 Merge pull request #2515 from acemod/340fixinventoryeh 
fix playerInventoryChanged eventhandler triggers when current weapon is changed fix #2513
 2015-09-19 21:04:48 +02:00
PabstMirror
db41537f56 #2524 - Take Unconscious captive 2015-09-19 13:58:34 -05:00
commy2
09f133b7f8 more common code cleanup 2015-09-19 20:55:35 +02:00
SilentSpike
35d94e8d5c Fix medical litter scopeCurator values 
Solves #2526 where medical litter would appear in zeus with no name.
 2015-09-19 19:37:38 +01:00
commy2
3ddaa5ed4a more common code cleanup 2015-09-19 20:34:07 +02:00
commy2
1636e3976d more common code cleanup 2015-09-19 20:17:38 +02:00
commy2
cbc7f961b2 more common code cleanup 2015-09-19 19:40:56 +02:00
commy2
20a5c79431 more common code cleanup 2015-09-19 19:26:45 +02:00
commy2
6ee5c6d9f8 Merge pull request #2510 from acemod/commoncleanup5 
common code cleanup part 5
 2015-09-19 18:50:28 +02:00
commy2
fb71e0594e lsd module, use global variable for color 2015-09-19 18:47:00 +02:00
PabstMirror
8573238cff Merge branch 'release' 2015-09-19 11:21:33 -05:00
PabstMirror
3c93c2c95c #2525 - Add CanInteractWith checks for repair 2015-09-19 11:07:03 -05:00
PabstMirror
79d985a648 Fix XEH Warning Debug 
Wait 5 to let supMon run first, and only show visual error if actually
missing pbo.
 2015-09-19 10:43:29 -05:00
PabstMirror
2e09a7aa4b "cherrypick" PR #2496 (lockpick) 2015-09-19 10:02:37 -05:00
Alessandro Foresi
22ac16ead5 Changed: Seeker to aimPoint instead of ASL position 2015-09-19 16:22:36 +02:00
Glowbal
1d7cbf40ca Fixed incorrect handleDamage call 2015-09-19 11:52:35 +02:00
commy2
e08c6c343e fix LSD module, cutback on global variable usage 2015-09-19 09:24:28 +02:00
commy2
1357d72f16 fix broken LSD module 2015-09-19 02:44:02 +02:00
commy2
25d1e46422 Merge branch 'commoncleanup5' of https://github.com/acemod/ACE3 into commoncleanup5 2015-09-19 01:50:37 +02:00
commy2
c7d636a533 more common code cleanup 2015-09-19 01:50:17 +02:00
jokoho48
e7ff41a03c Merge branch 'commoncleanup5' of https://github.com/acemod/ACE3 into commoncleanup5 2015-09-19 01:12:20 +02:00
jokoho48
f2070deee8 Change spawn while to CBA PFH 2015-09-19 01:12:03 +02:00
commy2
f8ecf1b8ab fnc_debug was broken 2015-09-19 00:30:36 +02:00
commy2
30ba4f5586 this append should've been pushBack 2015-09-18 23:34:49 +02:00
commy2
56f4cbb39e fix playerInventoryChanged eventhandler triggers when current weapon is changed fix #2513 2015-09-18 23:03:35 +02:00
commy2
2e48a92eef fix ai seemingly reloading disposable launcher at mission start, fix #2508 2015-09-18 22:25:09 +02:00
commy2
85fd9d9d75 more common code cleanup 2015-09-18 21:46:21 +02:00
PabstMirror
5f0d73bab6 Cleanup more stuff 2015-09-18 14:24:20 -05:00
commy2
f3a175e9d6 remove obsolete private 2015-09-18 21:15:06 +02:00
commy2
5d0a7ed062 more common code cleanup 2015-09-18 21:12:40 +02:00
PabstMirror
c62ea5e406 Fix some nil functions 2015-09-18 13:47:19 -05:00
commy2
a53d158a89 Merge pull request #2501 from acemod/commoncleanup4 
common code cleanup part 4
 2015-09-18 19:54:04 +02:00
PabstMirror
65b8585d60 Use _player instead of ACE_player 2015-09-18 12:48:59 -05:00
commy2
8704cd0321 fix additional bracket, formatting 2015-09-18 19:40:48 +02:00
PabstMirror
c21a5d6f08 Merge pull request #2496 from acemod/fixLockPick 
Fix for #2495
 2015-09-18 12:28:51 -05:00
PabstMirror
97921aa665 #2503 - run BFT module on server 2015-09-18 12:18:43 -05:00
commy2
a18f63d861 more common code cleanup 2015-09-18 19:12:38 +02:00
commy2
2674310e65 remove another deprecated function 2015-09-18 18:45:41 +02:00
esteldunedain
a621a0c693 Fixes to spanish translations 2015-09-18 13:36:57 -03:00
commy2
1fd2fcafb0 remove old, not working functions 2015-09-18 18:34:29 +02:00
commy2
1b96caedc0 more common code cleanup 2015-09-18 18:28:19 +02:00
esteldunedain
3422f5a7f1 Merge branch 'master' of https://github.com/Legolasindar/ACE3 into spanish-translation 
Conflicts:
	addons/medical/stringtable.xml
	addons/repair/stringtable.xml
 2015-09-18 13:20:22 -03:00
commy2
a8ba96a01b more common code cleanup 2015-09-18 16:41:00 +02:00
commy2
39786420fa more common cleanup 2015-09-18 16:33:53 +02:00
commy2
c0fdd80ba4 formating 2015-09-18 16:00:58 +02:00
commy2
7efcfcc8a0 more common cleanup 2015-09-18 15:40:51 +02:00
commy2
f83dea6e01 formatting, remove an obsolete private 2015-09-18 14:32:58 +02:00
commy2
b0704e486f more common cleanup 2015-09-18 13:09:40 +02:00
commy2
3a027ff26f more common cleanup 2015-09-18 09:38:19 +02:00
commy2
e833c3fc42 more common cleanup 2015-09-18 08:47:14 +02:00
commy2
fc82018c49 more common cleanup 2015-09-18 08:23:18 +02:00
commy2
df2c7dce78 replace old pushback macro 2015-09-18 07:53:36 +02:00
commy2
475c193060 common code cleanup part 2 2015-09-18 07:42:10 +02:00
jokoho48
c5eb6e0070 posible fix for #2495 2015-09-18 04:12:18 +02:00
commy2
37c1dbd6f7 Merge pull request #2490 from acemod/commoncleanup 
cleanup common
 2015-09-17 23:59:10 +02:00
PabstMirror
a9946e26a5 Merge pull request #2489 from acemod/fixSpareParts 
only run addSpareParts on server
 2015-09-17 16:44:31 -05:00
PabstMirror
81f427ad82 Merge branch 'fixSpareParts' into release 2015-09-17 16:43:54 -05:00
commy2
27ca3dc7bd Merge pull request #2471 from acemod/340noactionmenu 
optional pbo to hide select weapon actions
 2015-09-17 22:47:35 +02:00
commy2
3927103a86 Merge pull request #2483 from acemod/340staticmgfcs 
add fcs to static machine guns
 2015-09-17 22:47:23 +02:00
commy2
ca43520b7f Merge pull request #2482 from acemod/340fixdaylaserlight 
fix daylasers being a virtual light source
 2015-09-17 22:47:13 +02:00
commy2
cfc7102cb6 Merge pull request #2481 from acemod/340loadcargohint 
display text when loading / unloading cargo
 2015-09-17 22:47:05 +02:00
commy2
7336e694c1 Merge pull request #2480 from acemod/340doanim2tweak 
tweak doAnimation switchMove to do no akward camera jumps whenever possible
 2015-09-17 22:46:54 +02:00
PabstMirror
7faee2e6ff Merge pull request #2492 from acemod/fixCPR 
Fix CPR params
 2015-09-17 12:37:45 -05:00
PabstMirror
5fc127e94c #2491 - fix params 2015-09-17 11:34:32 -05:00
commy2
36a279012c cleanup common 2015-09-17 18:25:02 +02:00
PabstMirror
3b1a9ab415 #2488 - only run addSpareParts on server 2015-09-17 11:19:47 -05:00
commy2
a03bc44ba0 add fcs to static machine guns, close #1188 2015-09-17 14:40:58 +02:00
commy2
864c0b4baf fix daylasers being a virtual light source, fix #2416 2015-09-17 14:17:48 +02:00
commy2
42a754a981 display text when loading / unloading cargo 2015-09-17 13:43:55 +02:00
KoffeinFlummi
067b08611e Fix missing newlines 2015-09-17 12:54:26 +02:00
KoffeinFlummi
49cc207e6b Merge remote-tracking branch 'origin/pr/2397' into polish-merge 2015-09-17 12:53:47 +02:00
commy2
a09ca8fb80 tweak doAnimation switchMove to do no akward camera jumps whenever possible, fix #2474 2015-09-17 12:23:56 +02:00
kaban
4d2707eae2 Russian Translations - Update 2015-09-17 12:21:21 +03:00
kaban
341e122e4c Russian Translations - Update 2015-09-17 11:43:14 +03:00
commy2
014203413d handle optional pbos in checkFiles 2015-09-17 02:13:21 +02:00
commy2
ca72770c48 add english translation to switch units module 2015-09-16 23:49:34 +02:00
commy2
6d80740a20 don't default to english on the switch units module description 2015-09-16 23:29:07 +02:00
PabstMirror
b8c687611e Merge branch 'release' 2015-09-16 14:10:02 -05:00
ViperMaul
c748e56f4a bump v3.3.1.2 2015-09-16 11:42:01 -07:00
commy2
b7715152e2 correct cargo capacities for quads, karts, boats and jets 2015-09-16 20:12:56 +02:00
alganthe
49e0befbaf added diagnose to torso 
Signed-off-by: alganthe <alganthe@live.fr>
 2015-09-16 19:44:44 +02:00
commy2
f383e8701d increase trucks cargo space 2015-09-16 19:27:32 +02:00
PabstMirror
06a9f60281 Cleanup Nightvision 2015-09-16 10:55:23 -05:00
PabstMirror
539e158a97 Merge branch 'release' 2015-09-16 10:35:19 -05:00
ViperMaul
e78b59c28a bump to 3.3.1.1 2015-09-16 05:09:48 -07:00
ViperMaul
f83a76b304 Merge pull request #2458 from acemod/FixAB 
Fix Advaced Basllistic Performance bug
 2015-09-16 05:07:26 -07:00
jokoho48
c1baf4f8f7 tweak Vales for B_Truck_01_Base and B_Truck_01_box_F 2015-09-16 12:45:08 +02:00
Ivan Navarro Cabello
463e21dd91 330 2015-09-16 12:40:30 +02:00
jokoho48
a24e5b4665 fix Performance issue in AB 2015-09-16 11:54:49 +02:00
gienkov
e2f9b31fb2 small fix + repair translation 2015-09-16 11:53:05 +02:00
gienkov
a66f4d0e09 Merge remote-tracking branch 'origin/master' into pl-translation-8 2015-09-16 11:44:35 +02:00
gienkov
b94df35c08 Revert "fixed duplicate stringtable entries" 
This reverts commit ab02bed1c1.
 2015-09-16 11:42:45 +02:00
ViperMaul
8330aadb6f bump version to 3.3.1 2015-09-15 17:56:57 -07:00
PabstMirror
2c2d79cfe0 Merge pull request #2439 from acemod/badXEHcheck 
Bad xeh check
 2015-09-15 19:46:10 -05:00
PabstMirror
e254af9964 Fix missing ) 2015-09-15 19:26:37 -05:00
PabstMirror
1ea1094a73 Merge branch 'release' 2015-09-15 16:16:10 -05:00
Glowbal
a124b05672 Revert "disable a10 tracers, commanche tracers only nvg" 2015-09-15 21:25:01 +02:00
Glowbal
c6c51af548 Updated build version 2015-09-15 21:13:36 +02:00
Glowbal
7e5ab07e32 Merge pull request #2387 from acemod/FixHCPPE 
Fix that PPEffects Throw a error on HC
 2015-09-15 21:04:37 +02:00
Glowbal
b2b221db20 Merge pull request #2441 from SzwedzikPL/air_no_tracers 
disable a10 tracers, commanche tracers only nvg
 2015-09-15 21:02:40 +02:00
PabstMirror
88f89b8d76 also check allDeadMen 2015-09-15 13:30:04 -05:00
PabstMirror
a8688609d7 Typo 2015-09-15 13:10:06 -05:00
Glowbal
3cc2ccf025 Merge pull request #2438 from acemod/wheelRepairSettingToolkit 
Add Setting for toolkit requirement for wheel repair
 2015-09-15 20:04:38 +02:00
PabstMirror
0e32c28552 #2437 - Warn users when mods break XEH 2015-09-15 12:55:08 -05:00
PabstMirror
db37fa0e04 Update stringtable.xml 2015-09-15 11:45:02 -05:00
PabstMirror
c50c53e5bb remove debug 2015-09-15 09:57:53 -05:00
PabstMirror
9cd470b849 Add Setting for toolkit requirement for wheel repair 2015-09-15 09:54:55 -05:00
commy2
2c7a2b4140 Merge pull request #2406 from acemod/captiveOnRespawn 
Reset captive status on respawn for reliability
 2015-09-15 16:37:01 +02:00
gienkov
6588237e8c stringtable DAGR 2015-09-15 15:05:30 +02:00
PabstMirror
17fdce7196 Cleanup preInit 2015-09-15 08:03:56 -05:00
Glowbal
478b618e4b Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros 
Feature/switch to log macros
 2015-09-15 14:51:23 +02:00
PabstMirror
d6d64b58b0 Merge pull request #2430 from acemod/microDagr-customDrawEvents 
microDagr - Add ability to access draw event for minimap
 2015-09-14 23:36:07 -05:00
PabstMirror
f419762653 Fix time of flight display 2015-09-14 23:33:32 -05:00
PabstMirror
db41512dc0 #2349 - Don't disable locking for base RocketPods 2015-09-14 22:11:12 -05:00
PabstMirror
61cbe543ee Fix #2432 - Don't check for null attached when mounted 2015-09-14 18:06:46 -05:00
PabstMirror
e029e8318f microDagr - Add ability to access draw event for minimap 2015-09-14 16:37:39 -05:00
Glowbal
16b7bb389c Merge pull request #2428 from acemod/FixMainMenuInfo151 
Fix main menu info151
 2015-09-14 23:30:00 +02:00
Glowbal
d52cc917ea Merge pull request #2419 from acemod/FixBBTexturePath2 
Fix Bandage Texture Path and UV
 2015-09-14 23:26:00 +02:00
Glowbal
4b6082d836 Merge pull request #2424 from acemod/medical-tweaks 
Medical tweaks
 2015-09-14 23:20:50 +02:00
Glowbal
7b7ad6eea8 fixed tweak to basic bandage 2015-09-14 23:18:20 +02:00
PabstMirror
f7bd557a30 Fix some stringtable weirdness 2015-09-14 16:11:43 -05:00
Glowbal
10ac127159 Fixed incorrect new damage value in handleDamage advanced. 
The new handleDamage from BI added a new value to the parameters that we didn't account for in handleDamage advanced.
 2015-09-14 21:15:57 +02:00
Glowbal
33ac78dbac Addresses the large amount of bandages required in basic medical 
This should restore the bandaging behavior back to how it is before the adjustments made to basic medical
 2015-09-14 21:14:56 +02:00
Glowbal
8c60e76979 Tweaks made to improve determine if fatal algorithm 2015-09-14 21:13:58 +02:00
Glowbal
37639066c2 Include missing frame in the caching execution 2015-09-14 15:19:58 +02:00
Glowbal
6d4744b9ea Increased duration of knock down for basic medical 2015-09-14 15:19:18 +02:00
Glowbal
032dd6c87c Tweaked visual effects. 2015-09-14 15:18:56 +02:00
jokoho48
fb75f6ad9e Fix Bandage Texture Path and UV 2015-09-13 18:57:07 +02:00
gienkov
530dfa041d stringtable DAGR 2015-09-12 21:25:02 +02:00
jokoho48
b2b41ce8af Merge branch 'release' of https://github.com/acemod/ACE3 into release 2015-09-12 18:13:12 +02:00
jokoho48
5feee53c69 Posible fix for #2407 2015-09-12 18:12:57 +02:00
SilentSpike
7c846502b5 Reset captive status on respawn for reliability 
Previously we were resetting on death, but this caused problems when the respawnDelay was 0 as the dead unit wasn't actually the player.

To account for "group" and "side" respawn types where you change unit on respawn and could potentially become a captive unit, I am explicity checking the mission respawn type before resetting variables.
 2015-09-12 15:42:20 +01:00
SilentSpike
e6c2916a14 Fix spectator template for negligible respawnDelay 
When the value of respawn delay is 0 the timing of the killed and respawn events can be a little strange and result in spectator being entered but never exited. The respawn template should just do nothing when the delay is so small.
 2015-09-12 14:02:42 +01:00
bux578
9748abdb48 change order of BloodPressure readout, fix #2400 2015-09-12 10:58:29 +02:00
gienkov
ef36b27fe2 medical pl translation 2015-09-11 23:49:41 +02:00
gienkov
ab02bed1c1 fixed duplicate stringtable entries 2015-09-11 23:42:03 +02:00
jonpas
3de783d3a7 Cleanup for branch release, picked from #2366 2015-09-11 19:57:21 +02:00
jonpas
6fb22ebd11 Added isNull check to PFH for explicity 2015-09-11 17:55:28 +02:00
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
jonpas
e07b71faf0 Merge branch 'master' into parseList 
Conflicts:
	addons/medical/functions/fnc_moduleAssignMedicRoles.sqf
	addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
 2015-09-09 19:13:04 +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
jonpas
f45c0334fc Added spaces 2015-09-06 03:49:52 +02:00
ViperMaul
98202f4f38 Additional debug statements for caching and wounds. 2015-09-05 15:31:14 -07:00
jonpas
f2bfc385eb Merge branch 'master' into removeVignetteAndCleanUI 
Conflicts:
	addons/ui/README.md
	addons/ui/config.cpp
 2015-09-05 22:00:51 +02:00
jonpas
ce1c735d89 Removed Vignette, Cleaned up UI 2015-09-05 21:57:22 +02: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
jonpas
06baa5e4d3 Fixed nilCheck, changed moduleAddSpareParts to use new parseList 2015-09-05 20:51:48 +02:00
jonpas
8fc061bfd6 Merge branch 'master' into parseList 2015-09-05 20:16:59 +02:00
jonpas
a2dd77ca70 Use splitString instead of BIS_fnc_splitString 2015-09-05 20:15:31 +02:00
Jonathan Pereira
7147891710 Added latest ACE3 PT-BR translations 2015-09-05 15:12:31 -03:00
jonpas
f22072a94d Use pushBack instead of array compiling 2015-09-05 19:57:35 +02: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