Commit Graph

3195 Commits

Author SHA1 Message Date
Marli Frost
a83f09bd60
fix: avoid rodio API when audio is disabled 2020-03-31 21:28:09 +01:00
Marli Frost
c82d1b9316
allow the game to start without an audio device 2020-03-31 21:27:55 +01:00
Imbris
3e768349be 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
c5331cbabe Add Turkish (Turkey) translation file 2020-03-31 19:52:45 +02:00
Imbris
508def2701 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
7b6c6111f0 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
d583a7e91b Merge branch 'capucho/portuguese-translation' into 'master'
Portuguese translation

See merge request veloren/veloren!863
2020-03-30 21:29:41 +00:00
Capucho
3f1f9b9ab0 Make so that the resume button doesn't eject the mouse 2020-03-30 22:00:46 +01:00
Capucho
abc1a041fa Added a portuguese translation 2020-03-30 22:57:26 +02:00
Songtronix
2024718ad1 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
bb293c4442 Add Italian translation 2020-03-29 13:40:57 +02:00
Imbris
5ef8346ce2 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
1cb93b92ed Add Italian translation 2020-03-29 01:47:18 +00:00
Justin Shipsey
976043df83 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
15d2a6d3dc Fix the wrong default keybind change 2020-03-27 19:36:20 +00:00
Capucho
15ecdfb9b4 Added an option for hold and added everything to the settings 2020-03-27 18:35:52 +00:00
Joshua Barretto
fe07156531 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
3a989f061f Better water shaders 2020-03-27 15:13:36 +00:00
Imbris
63d5e196e9 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
03396eb77e Implement #505 2020-03-26 21:22:21 +00:00
Songtronix
9cb8dc1df1 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
604a6cf169 feat: log server version 2020-03-26 12:41:30 +01:00
Capucho
7048163153 Fixed Some minor bugs on the password field 2020-03-25 12:51:43 +00:00
Capucho
7851a407b1 Fix the cursor lagging behind on password field 2020-03-24 21:41:59 +00:00
Songtronix
30e6bbc851 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
0358caa173 Fix the wrong logs directory being displayed on panic 2020-03-22 22:06:05 +00:00
Marcel
159d8df659 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
48b5977551 add watchtower support and fix CMD in Dockerfile 2020-03-22 14:56:14 +00:00
Marcel
f80ea7bd39 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
d8cbd15204 Fix docker image for server-cli 2020-03-22 12:44:32 +00:00
Marcel
0c9ef6d5d9 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
4ab646900a 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
763d68fb96 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
b940cde501 change(panic): mention the game version in panic 2020-03-20 09:47:00 +01:00
Acrimon
8c2c2cb430 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
f83b223178 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
95eeb7e145 Omitted unnecessary test 2020-03-17 16:37:39 +00:00
Joshua Barretto
4580752e78 Fixed remaining pathfinding issues 2020-03-17 14:14:20 +00:00
Joshua Barretto
3559252a5e Nicer point lights 2020-03-17 13:29:42 +00:00
Songtronix
b9639f2454 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
e72f0c6d12 fix: do not depend on hash file during runtime 2020-03-15 09:02:56 +01:00
Shane Handley
4e5d200b70 Fix: Make the dropped item collection range match the world item range limit. 2020-03-12 11:54:23 +09:00
Marcel
875ae6cedd 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
bc692c0101 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
ab56829385 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
434dd96cd6 Check for the mousedown state before trying to collect an item via secondary mouse click. 2020-03-11 15:39:46 +09:00
Marcel
9c56d25cfa Merge branch 'mckol/update-ci' into 'master'
Made the CI fail if Cargo.lock would be changed by cargo build

Closes #110

See merge request veloren/veloren!845
2020-03-11 00:05:34 +00:00
Imbris
a4eaeb1da6 Merge branch 'imbris/se-latency' into 'master'
Rearrange some operations in the server tick to reduce clientside latency of ServerEvent mediated effects

See merge request veloren/veloren!840
2020-03-10 23:21:57 +00:00
Mckol
e4a1e4d078 Made the CI fail if Cargo.lock isn't up-to-date 2020-03-10 23:32:33 +01:00
Acrimon
406767ae31 Merge branch 'capucho/voxygen-logout-timeout' into 'master'
FIX #513 logout timeout

See merge request veloren/veloren!837
2020-03-10 22:12:29 +00:00