PabstMirror
|
45e44251b6
|
Merge branch 'release'
Conflicts:
addons/repair/stringtable.xml
|
2015-09-21 17:14:53 -05:00 |
|
PabstMirror
|
6702a1faa4
|
Fix warnings for WeaponHolderSimulated
|
2015-09-21 16:34:02 -05:00 |
|
Glowbal
|
62ad9d4284
|
Version 3.3.2
|
2015-09-21 22:31:01 +02:00 |
|
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
|
a98e490f5c
|
Merge pull request #2512 from acemod/340fixaidisposable
fix ai seemingly reloading disposable launcher at mission start, fix #2508
|
2015-09-21 22:00:55 +02:00 |
|
commy2
|
a1b2d63417
|
Merge pull request #2551 from acemod/commoncleanup11
common code cleanup part 11
|
2015-09-21 21:12:42 +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 |
|
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
|
414151de38
|
Merge pull request #2550 from acemod/commoncleanup10
common code cleanup part 10, close #2319
|
2015-09-21 15:09:56 +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 |
|
bux578
|
27c9e44c8b
|
Merge pull request #2549 from gienkov/patch-36
Add missing english string
|
2015-09-21 08:44:06 +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
|
80483f6dad
|
fix ESTRING search
|
2015-09-20 17:56:07 -05: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
|
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
|
5907bccc77
|
Merge pull request #2539 from acemod/commoncleanup8
common code cleanup part 8
|
2015-09-20 21:23:54 +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
|
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 |
|