Songtronix
|
59492dec0b
|
Merge branch 'Plecra/veloren-fix-windows-tests' into 'master'
fix: connect to LOCALHOST address in tests
See merge request veloren/veloren!875
|
2020-04-01 17:39:58 +00:00 |
|
Imbris
|
f8f0f4fe4c
|
Merge branch 'audioless' into 'master'
Allow the game to start without an audio device
See merge request veloren/veloren!874
|
2020-04-01 11:41:29 +00:00 |
|
Marli Frost
|
74e9adac39
|
feat: configure audio output using an enum
|
2020-03-31 22:29:30 +01:00 |
|
Marli Frost
|
b5d4e7c89b
|
fix: avoid rodio API when audio is disabled
|
2020-03-31 21:28:09 +01:00 |
|
Marli Frost
|
dd673a3bcc
|
allow the game to start without an audio device
|
2020-03-31 21:27:55 +01:00 |
|
Imbris
|
c5c66d2eb9
|
Merge branch 'yusdacra/add-turkish-translation' into 'master'
Add Turkish (Turkey) translation
See merge request veloren/veloren!864
|
2020-03-31 19:24:08 +00:00 |
|
Yusuf Bera Ertan
|
a136dadf29
|
Add Turkish (Turkey) translation file
|
2020-03-31 19:52:45 +02:00 |
|
Imbris
|
37a39ac38d
|
Merge branch 'capucho/resume-do-not-eject-cursor' into 'master'
Don't eject mouse on resume
Closes #307
See merge request veloren/veloren!873
|
2020-03-31 16:50:45 +00:00 |
|
Imbris
|
c85ae65219
|
Merge branch 'capucho/password_cursor_fix' into 'master'
Fix the cursor lagging behind on the password field
See merge request veloren/veloren!859
|
2020-03-31 16:39:56 +00:00 |
|
Forest Anderson
|
b8a41215e4
|
Merge branch 'capucho/portuguese-translation' into 'master'
Portuguese translation
See merge request veloren/veloren!863
|
2020-03-30 21:29:41 +00:00 |
|
Capucho
|
b99f63a621
|
Make so that the resume button doesn't eject the mouse
|
2020-03-30 22:00:46 +01:00 |
|
Capucho
|
eb7b1a2ff4
|
Added a portuguese translation
|
2020-03-30 22:57:26 +02:00 |
|
Songtronix
|
4d959df166
|
Merge branch 'fix_italian_localization' into 'master'
Fix Italian translation
See merge request veloren/veloren!870
|
2020-03-29 13:00:39 +00:00 |
|
Jack Rubino
|
7224272c95
|
Add Italian translation
|
2020-03-29 13:40:57 +02:00 |
|
Imbris
|
4212199648
|
Merge branch 'jackrubino/italian-translation' into 'master'
Add Italian translation
See merge request veloren/veloren!868
|
2020-03-29 01:47:18 +00:00 |
|
S Handley
|
a82c055fa6
|
Add Italian translation
|
2020-03-29 01:47:18 +00:00 |
|
Justin Shipsey
|
7de4dd5269
|
Merge branch 'capucho/free-look-improvements' into 'master'
Free look improvements
See merge request veloren/veloren!865
|
2020-03-27 22:09:20 +00:00 |
|
Capucho
|
41b6404806
|
Fix the wrong default keybind change
|
2020-03-27 19:36:20 +00:00 |
|
Capucho
|
bba43dc9c8
|
Added an option for hold and added everything to the settings
|
2020-03-27 18:35:52 +00:00 |
|
Joshua Barretto
|
3fe815875d
|
Merge branch 'zesterer/small-fixes' into 'master'
Water shader improvements
See merge request veloren/veloren!862
|
2020-03-27 16:14:38 +00:00 |
|
Joshua Barretto
|
bb67638df5
|
Better water shaders
|
2020-03-27 15:13:36 +00:00 |
|
Marli Frost
|
1c4e507973
|
fix: connect to LOCALHOST address in tests
Windows doesn't allow us to connect to the Any (0.0.0.0) address,
instead returning the WSAEADDRNOTAVAIL error code.
https://docs.microsoft.com/en-us/windows/win32/winsock/windows-sockets-error-codes-2
|
2020-03-27 10:50:45 +00:00 |
|
Imbris
|
8ac42c396b
|
Merge branch 'capucho/free_look' into 'master'
Implement #505
Closes #505
See merge request veloren/veloren!854
|
2020-03-26 21:22:21 +00:00 |
|
Capucho
|
a8673cd5e4
|
Implement #505
|
2020-03-26 21:22:21 +00:00 |
|
Songtronix
|
e4a732f01f
|
Merge branch 'songtronix/log-server-version' into 'master'
log server version
See merge request veloren/veloren!860
|
2020-03-26 12:15:55 +00:00 |
|
Songtronix
|
43a9e47bbe
|
feat: log server version
|
2020-03-26 12:41:30 +01:00 |
|
Capucho
|
b1409ee717
|
Fixed Some minor bugs on the password field
|
2020-03-25 12:51:43 +00:00 |
|
Capucho
|
9096d4c95b
|
Fix the cursor lagging behind on password field
|
2020-03-24 21:41:59 +00:00 |
|
Songtronix
|
9b7b994530
|
Merge branch 'capucho/panic_log_wrong_directory' into 'master'
Fix the wrong logs directory being displayed on panic
See merge request veloren/veloren!858
|
2020-03-23 08:02:16 +00:00 |
|
Capucho
|
7bd4492233
|
Fix the wrong logs directory being displayed on panic
|
2020-03-22 22:06:05 +00:00 |
|
Marcel
|
288ced16e3
|
Merge branch 'xMAC94x/really-fix-docker' into 'master'
add watchtower support and fix CMD in Dockerfile
See merge request veloren/veloren!857
|
2020-03-22 14:56:35 +00:00 |
|
Marcel
|
6376827df8
|
add watchtower support and fix CMD in Dockerfile
|
2020-03-22 14:56:14 +00:00 |
|
Marcel
|
9d8a9db329
|
Merge branch 'xMAC94x/fix-docker' into 'master'
Fix docker image for server-cli
See merge request veloren/veloren!856
|
2020-03-22 12:44:57 +00:00 |
|
Marcel
|
464d4622db
|
Fix docker image for server-cli
|
2020-03-22 12:44:32 +00:00 |
|
Marcel
|
33216e3b98
|
Merge branch 'xMAC94x/update-toolchain' into 'master'
update toolchain to `nightly-2020-03-05`
See merge request veloren/veloren!853
|
2020-03-20 10:49:12 +00:00 |
|
Marcel
|
8524e780c2
|
Merge branch 'xMAC94x/temp-macos' into 'master'
temp allow failure in macos
See merge request veloren/veloren!844
|
2020-03-20 10:27:02 +00:00 |
|
Acrimon
|
07ac835dd9
|
Merge branch 'songtronix/include-version-in-crash' into 'master'
Mention the game version in panic
See merge request veloren/veloren!852
|
2020-03-20 09:24:51 +00:00 |
|
Songtronix
|
9738e3b54c
|
change(panic): mention the game version in panic
|
2020-03-20 09:47:00 +01:00 |
|
Acrimon
|
884d644448
|
Merge branch 'shandley/fix-dropped-pickup-range' into 'master'
Fix: Make the dropped item collection range match the world item range limit.
See merge request veloren/veloren!848
|
2020-03-19 20:30:09 +00:00 |
|
Joshua Barretto
|
72e483df00
|
Merge branch 'zesterer/small-fixes' into 'master'
Small Fixes
See merge request veloren/veloren!851
|
2020-03-17 17:48:43 +00:00 |
|
Joshua Barretto
|
99bc1825d3
|
Omitted unnecessary test
|
2020-03-17 16:37:39 +00:00 |
|
Joshua Barretto
|
5c58fd318d
|
Fixed remaining pathfinding issues
|
2020-03-17 14:14:20 +00:00 |
|
Joshua Barretto
|
6b13f305eb
|
Nicer point lights
|
2020-03-17 13:29:42 +00:00 |
|
Songtronix
|
5f7a49d2d4
|
Merge branch 'songtronix/remove-runtime-dep' into 'master'
fix: do not depend on hash file during runtime
See merge request veloren/veloren!849
|
2020-03-15 08:34:15 +00:00 |
|
Songtronix
|
5cbd629118
|
fix: do not depend on hash file during runtime
|
2020-03-15 09:02:56 +01:00 |
|
Shane Handley
|
7ad3cfa4d1
|
Fix: Make the dropped item collection range match the world item range limit.
|
2020-03-12 11:54:23 +09:00 |
|
Marcel
|
425c7052f9
|
Merge branch 'shandley/inventory-full-handling' into 'master'
Feedback when collecting an item while inventory is full
Closes #459
See merge request veloren/veloren!847
|
2020-03-11 10:31:00 +00:00 |
|
S Handley
|
2864e7603a
|
Add audio and chat message feedback when the player attempts to collect something while thier inventory is full.
|
2020-03-11 10:30:59 +00:00 |
|
Acrimon
|
4eed065bd9
|
Merge branch 'shandley/collect-block-mousedown-only' into 'master'
Check for the mousedown state before trying to collect an item via secondary mouse click.
See merge request veloren/veloren!846
|
2020-03-11 08:07:34 +00:00 |
|
Shane Handley
|
f595dad1f8
|
Check for the mousedown state before trying to collect an item via secondary mouse click.
|
2020-03-11 15:39:46 +09:00 |
|