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 |
|
Nicolás Badano
|
17e8e5050f
|
Merge pull request #2504 from acemod/spanish-translation
Spanish translation
|
2015-09-18 13:39:43 -03: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
|
4211d71a32
|
Merge pull request #2499 from acemod/commoncleanup3
common code cleanup part 3
|
2015-09-18 16:00:42 +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
|
dee025bbea
|
Merge pull request #2497 from acemod/commoncleanup2
common code cleanup part 2
|
2015-09-18 09:54:32 +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 |
|
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 |
|
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 |
|