Commit graph

2921 commits

Author SHA1 Message Date
Volker Fischer
ca60870a55 Merge branch 'master' of https://github.com/corrados/jamulus 2020-06-18 16:20:34 +02:00
Volker Fischer
e9f0af6864 check "headless nosound" mode in Travis 2020-06-18 16:20:19 +02:00
Volker Fischer
b84d9448ed output a qmake message on headless mode 2020-06-17 19:38:45 +02:00
Volker Fischer
30d8181423 some more merge fixes 2020-06-17 19:34:51 +02:00
Volker Fischer
a2a489e6f0 merge fixes 2020-06-17 19:26:24 +02:00
Volker Fischer
36ca0bab1f
Merge pull request #322 from marcan/headless-qt
[RFC] Add a "headless" build type which does not depend on QtGui/QtWidgets
2020-06-17 19:23:15 +02:00
Hector Martin
1651a8d065 Add a "headless" build type which does not depend on QtGui/QtWidgets 2020-06-18 00:29:56 +09:00
Alberstein8
f7d9732800
Merge pull request #1 from corrados/master
Update
2020-06-16 19:53:02 +02:00
Volker Fischer
dc7a844f0b bug fix with recording state indicator 2020-06-16 16:58:45 +02:00
daryl
4841437d46 Spanish tr update 2020-06-16 12:54:30 +02:00
ignotus
db428afbe1
Merge pull request #2 from corrados/master
update
2020-06-16 12:42:56 +02:00
Volker Fischer
c5e4d75be0 move the channels tighter together in slim fader mode; adjust help text so that we have as little HTML as possible to simplify translation 2020-06-15 22:45:11 +02:00
Volker Fischer
8d3cdb7a4b merge fixes 2020-06-15 21:48:30 +02:00
Volker Fischer
ac9f054ee3
Merge pull request #368 from pljones/feature/295-receive-and-display-recorder-state
#295 Part 3: Client side changes for recorder state - the end
2020-06-15 21:34:39 +02:00
Peter L Jones
3f4125fe9d Client side changes for recorder state 2020-06-15 19:58:48 +01:00
Volker Fischer
fa0ff9faae merge fixes and some other stuff 2020-06-15 17:29:17 +02:00
Volker Fischer
d4e09a4680
Merge pull request #366 from pljones/feature/295-define-and-send-recorder-state
#295 Part 2: Define and send recorder state
2020-06-15 17:20:09 +02:00
Peter L Jones
ed10faea6d Define and send recorder state 2020-06-14 22:03:14 +01:00
ignotus
2310832894
Merge pull request #1 from corrados/master
update
2020-06-14 22:50:50 +02:00
Volker Fischer
cf543eab7c merge fixes 2020-06-14 21:00:19 +02:00
Volker Fischer
7bce1230c4
Merge pull request #363 from pljones/feature/295-add-recorder-state-protocol-message
#295 Part 1: Define protocol message for server jam recorder state publishing
2020-06-14 20:55:01 +02:00
Peter L Jones
c7080afd0f Define protocol message for server jam recorder state publishing 2020-06-14 19:42:36 +01:00
Volker Fischer
ac140ff8a2 use actual instrument name for sorting by instrument 2020-06-14 19:17:50 +02:00
Volker Fischer
0f12b32766 update 2020-06-14 11:36:28 +02:00
Volker Fischer
e883a51db9 support for storing/recovering the server window positions (#357) 2020-06-14 08:49:58 +02:00
Volker Fischer
2285148cb8 Reference HTML file for welcome message #361 2020-06-13 18:15:52 +02:00
Volker Fischer
1e80a8659b update translation files 2020-06-13 17:43:41 +02:00
Volker Fischer
b56a2491fb
Merge pull request #359 from dzpex/master
New feature translated - IT
2020-06-13 17:42:36 +02:00
Volker Fischer
1c89e75900 merge fixes 2020-06-13 17:41:44 +02:00
Volker Fischer
19f2b741a5
Merge pull request #356 from Alberstein8/master
Addded sort by instrument and Edit menu option
2020-06-13 17:37:08 +02:00
Alberstein8
7c73b93b9f Clean some empty lines to match original code 2020-06-13 14:58:36 +02:00
Alberstein8
61f25b5644 Removed iReceivedInstrument decalration 2020-06-13 14:15:24 +02:00
Alberstein8
8de92ed5f7 Sort by instrument, new sortby function with parameter to set order
Sort by instrument added, using the same function for sorting by name or instrument
2020-06-13 14:07:09 +02:00
dzpex
0578e8177e
New feature translated 2020-06-13 13:46:57 +02:00
Alberstein8
3dbddc5568
Merge branch 'master' into master 2020-06-13 11:29:21 +02:00
Volker Fischer
6ee1f091dc
Merge pull request #358 from gilgongo/patch-1
Update for sort order
2020-06-13 10:07:15 +02:00
Jonathan
16dc091b48
Update for sort order
Also a slight clarification
2020-06-13 08:58:20 +01:00
Volker Fischer
ff31b99dc3 added Genre label 2020-06-13 09:29:51 +02:00
Volker Fischer
14cf23a1d7 fix: Jamulus Server window too wide #357 2020-06-13 09:27:31 +02:00
Volker Fischer
b078bfd7b8 further preparation for #356 2020-06-13 08:51:05 +02:00
Volker Fischer
e4b01fa395 prepare for pull request: #356 2020-06-13 08:31:28 +02:00
Volker Fischer
e1b982c34c merge fixes 2020-06-13 08:20:03 +02:00
Volker Fischer
83c34d061c
Merge pull request #352 from pljones/351-improve-recorder-logging
Add recorder state to console
2020-06-13 08:16:21 +02:00
Alberstein8
0aea018a61 Addded sort by instrument 2020-06-13 01:14:43 +02:00
Volker Fischer
4c94633c1a clean up the reverberation and panning code in the client 2020-06-12 18:26:34 +02:00
Peter L Jones
fe338049b2 Add recorder state to console 2020-06-11 20:52:49 +01:00
Volker Fischer
0d77ccdcc4 under Mac the slim fader label must be a bit higher so that all have the same length 2020-06-11 19:58:51 +02:00
Volker Fischer
bfc438ba20 rename new skin to Compact 2020-06-11 18:43:32 +02:00
Volker Fischer
cf7a01d231 add new "slim channel" skin, intended for large ensembles (#339) 2020-06-11 16:42:50 +02:00
Volker Fischer
ea4a3134f8 fixed a typo 2020-06-11 12:28:28 +02:00