Commit Graph

6030 Commits

Author SHA1 Message Date
Glowbal
42b2c18509 Merge pull request #2542 from acemod/FixSparePartsCargo
Fix cargo setVariable on server with InitPost
2015-09-21 22:28:59 +02:00
Glowbal
6b93760f9b Merge pull request #2557 from alganthe/torso_diag_fix
Torso diag fix
2015-09-21 22:27:13 +02:00
Glowbal
bbed98fbef Merge pull request #2394 from jonpas/cleanupRepairRelease
Minor Repair Cleanup for release
2015-09-21 22:25:58 +02:00
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
PabstMirror
79d4eb62be Allow fixing jam when in FFV slot 2015-09-20 16:55:33 -05: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
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
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
PabstMirror
05f4dad764 maptools - Remove debug 2015-09-19 20:42:46 -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
Glowbal
1d7cbf40ca Fixed incorrect handleDamage call 2015-09-19 11:52:35 +02:00
PabstMirror
97921aa665 #2503 - run BFT module on server 2015-09-18 12:18:43 -05:00
PabstMirror
81f427ad82 Merge branch 'fixSpareParts' into release 2015-09-17 16:43:54 -05:00
PabstMirror
5fc127e94c #2491 - fix params 2015-09-17 11:34:32 -05:00
PabstMirror
3b1a9ab415 #2488 - only run addSpareParts on server 2015-09-17 11:19:47 -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
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
jokoho48
a24e5b4665 fix Performance issue in AB 2015-09-16 11:54:49 +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
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