Volker Fischer
7dbd2c89d1
fix code style issues introduced by contributed source code
2020-05-18 20:46:46 +02:00
Volker Fischer
78413826a5
Merge branch 'master' into feature_panning
...
# Conflicts:
# src/protocol.h
2020-05-18 19:03:40 +02:00
Volker Fischer
d21acb0a7f
server sends version info on initial connection
2020-05-18 19:00:56 +02:00
Volker Fischer
8724d1443c
updates for German translation
2020-05-18 18:01:04 +02:00
Volker Fischer
a42302393f
remove the "instr" from the instrument picture names since it is no longer needed because all pictures are now in a separate instrument directory
2020-05-18 17:54:49 +02:00
Volker Fischer
f847303521
Merge pull request #246 from ignotus666/master
...
Updated Spanish translation
2020-05-18 10:44:08 +02:00
ignotus
df52fc80e0
Correction
2020-05-18 10:26:39 +02:00
ignotus
38fcf96ec9
Spanish translation update
2020-05-18 10:12:22 +02:00
ignotus
da9828406f
Merge pull request #9 from corrados/master
...
update
2020-05-18 09:27:53 +02:00
Volker Fischer
87e9096297
Merge pull request #244 from trebmuh/patch-1
...
update debian packaging
2020-05-18 08:05:59 +02:00
Olivier Humbert
59501c5f22
update debian packaging
2020-05-18 00:27:32 +02:00
Volker Fischer
2c42725b83
Merge pull request #243 from trebmuh/patch-1
...
French translation update
2020-05-17 23:52:34 +02:00
Olivier Humbert
27602468b9
French translation update
2020-05-17 23:22:07 +02:00
Volker Fischer
d1966d9423
Merge pull request #242 from trebmuh/patch-1
...
French translation update
2020-05-17 19:35:19 +02:00
Olivier Humbert
33d6b9db68
French translation update
2020-05-17 19:34:04 +02:00
Volker Fischer
da9e8e61d8
update contributers list and changelog
2020-05-17 18:27:29 +02:00
Volker Fischer
ce7fd592bc
Merge pull request #145 from tarmoj/panning
...
Implemented panning for channels.
2020-05-17 18:15:48 +02:00
Volker Fischer
641eaec426
added vocal bass/tenor/alto/soprano instrument icons created by Alberstein8 (Ticket #131 )
2020-05-17 18:12:03 +02:00
Volker Fischer
1cfcbe09fc
adjust URL for rock/jazz central servers
2020-05-17 18:02:56 +02:00
Tarmo Johannes
f1eb713a17
Merge remote-tracking branch 'upstream/master' into panning
2020-05-17 15:53:43 +03:00
Tarmo Johannes
f2cd5348b0
Cahanges according to pull request comments.
2020-05-17 15:51:01 +03:00
Volker Fischer
75b8a05257
introduce genre-based server lists (Ticket #139 ), adjust some values in global.h to adjust to heavier usage of Jamulus
2020-05-17 11:00:56 +02:00
Volker Fischer
043be698d6
Merge pull request #239 from gilgongo/patch-8
...
Change link
2020-05-17 10:34:28 +02:00
Volker Fischer
dc1017a9e8
Merge pull request #240 from gilgongo/patch-9
...
Change link
2020-05-17 10:34:08 +02:00
Jonathan
107ae24c0d
Change link
...
To avoid confusion
2020-05-17 08:58:26 +01:00
Jonathan
0149aed78e
Change link
...
To avoid confusion in the titles.
2020-05-17 08:56:47 +01:00
Tarmo Johannes
2f200f5b12
Merge remote-tracking branch 'upstream/master' into panning
2020-05-16 20:39:16 +03:00
Volker Fischer
1dc8e61c68
Merge pull request #237 from trebmuh/patch-1
...
Update French translation
2020-05-16 19:20:17 +02:00
Tarmo Johannes
31c3f5567d
Implemented storing pan values.
2020-05-16 20:11:54 +03:00
Tarmo Johannes
fa85d3d5a7
Description to protocal; made pan connections similar to gain.
2020-05-16 19:18:58 +03:00
Olivier Humbert
bcb904d4b4
Update French translation
2020-05-16 17:47:05 +02:00
Volker Fischer
8788936414
duplicate Central Server type dropdown to Connection Setup ( #157 )
2020-05-16 17:35:38 +02:00
Volker Fischer
1bceb912b0
Merge pull request #216 from andreassch/master
...
Converted icon to be used as Android resource.
2020-05-16 15:40:14 +02:00
Volker Fischer
096465565a
update
2020-05-16 11:45:08 +02:00
Volker Fischer
65f5c8f8b8
added "personal mix at server: " according to #187
2020-05-16 11:44:00 +02:00
Volker Fischer
fc2b7a76e2
changed function name to make it clearer what the function does
2020-05-16 11:28:05 +02:00
Volker Fischer
6977a17156
some central server address clean up
2020-05-16 11:24:50 +02:00
Volker Fischer
be9f396b0d
Merge pull request #235 from ignotus666/master
...
Update Spanish translation
2020-05-16 11:00:17 +02:00
ignotus
b437f9422f
Add files via upload
2020-05-16 10:50:07 +02:00
ignotus
e905f51bf1
Merge pull request #8 from corrados/master
...
update
2020-05-16 10:39:48 +02:00
Volker Fischer
ab31fc476f
small merge changes
2020-05-16 09:24:46 +02:00
Volker Fischer
e529baeb94
Merge pull request #229 from pljones/feature/170-allow-triggered-recording-cuts
...
Feature/170 allow triggered recording cuts
2020-05-16 09:20:47 +02:00
Volker Fischer
883b314ef4
Merge pull request #232 from jerogee/fix/dutch-translation
...
Fix to Dutch translation
2020-05-16 08:32:14 +02:00
Volker Fischer
48e4860c01
Merge pull request #231 from Snayler/master
...
Update to Portuguese Translation files
2020-05-16 08:31:18 +02:00
Volker Fischer
3ebd020000
Merge pull request #230 from tormodvolden/debianpackaging
...
debian/watch: Adapt to the tags on github
2020-05-16 08:30:46 +02:00
jerogee
b60d7739c4
Minor changes to labels
2020-05-16 01:08:17 +02:00
jerogee
4c0aaacd1e
Hotfix Dutch translation in #219
2020-05-16 00:47:56 +02:00
Snayler
9b2b47ff1a
Update Portuguese Translation
2020-05-15 23:34:12 +01:00
Snayler
58b72ca660
Merge pull request #2 from corrados/master
...
pull master
2020-05-15 23:20:32 +01:00
Tormod Volden
4a2dcb7a8c
debian/watch: Adapt to the tags on github
...
It will download the upstream package as e.g.
jamulus-r3_5_3.tar.gz (respecting upstream versioning)
and link as jamulus_3.5.3.orig.tar.gz
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
2020-05-15 23:42:45 +02:00
