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 |
|
bux578
|
76ccc74fa7
|
Merge pull request #2470 from acemod/340sumoduledescription
don't default to polish on the switch units module description, fix #2469
|
2015-09-17 06:36:32 +02:00 |
|
commy2
|
014203413d
|
handle optional pbos in checkFiles
|
2015-09-17 02:13:21 +02:00 |
|
commy2
|
15f4fc39e3
|
optional pbo to hide select weapon actions
|
2015-09-17 01:26:28 +02:00 |
|
[OMCB]kaban
|
4b21d1f42c
|
Merge pull request #1 from acemod/master
Fork update from master
|
2015-09-17 01:24:22 +03: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
|
8488bea67c
|
bump v
|
2015-09-16 11:48:52 -07:00 |
|
ViperMaul
|
c748e56f4a
|
bump v3.3.1.2
|
2015-09-16 11:42:01 -07:00 |
|
commy2
|
6b8a210956
|
Merge pull request #2465 from acemod/331bcargospace
increase trucks cargo space
|
2015-09-16 20:16:20 +02: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 |
|
ViperMaul
|
9ef391301e
|
Merge pull request #2459 from acemod/tweakCargoSize
tweak Cargo Size for B_Truck_01_Base and B_Truck_01_box_F
|
2015-09-16 05:07:04 -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
|
04512ebbc9
|
Merge pull request #2442 from acemod/revert-2441-air_no_tracers
Revert "disable a10 tracers, commanche tracers only nvg"
|
2015-09-15 21:25:47 +02: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 |
|