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 |
|
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 |
|
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 |
|
Marcel
|
a4bf2f9ca8
|
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
|
fa1f24ec2e
|
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
|
665795d1c9
|
Made the CI fail if Cargo.lock isn't up-to-date
|
2020-03-10 23:32:33 +01:00 |
|
Acrimon
|
2dddc2e692
|
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 |
|
Marcel
|
77c946d834
|
temp allow failure in macos
|
2020-03-10 22:03:29 +00:00 |
|
Capucho
|
1437d51c67
|
removed merge artifact
|
2020-03-10 21:09:38 +00:00 |
|
Capucho
|
b4969e0233
|
Merge branch 'capucho/voxygen-logout-timeout' of gitlab.com:veloren/veloren into capucho/voxygen-logout-timeout
Fixed conflicts
|
2020-03-10 21:06:08 +00:00 |
|
Capucho
|
6625a356ef
|
Rebased on master and moved logout message to events
|
2020-03-10 21:04:13 +00:00 |
|
Mckol
|
de48300c78
|
Merge branch 'controller' into 'master'
Controller support
Closes #20
See merge request veloren/veloren!750
|
2020-03-10 21:00:13 +00:00 |
|
Mckol
|
aec086a10d
|
Added Controller support
|
2020-03-10 21:00:13 +00:00 |
|
Acrimon
|
7aa102415e
|
Merge branch 'shandley/pickup-player-relative' into 'master'
Constrain item pickup range
See merge request veloren/veloren!843
|
2020-03-10 20:50:04 +00:00 |
|
S Handley
|
fdefcf3926
|
Check that a targeted collectible is within a certain pickup range of the character before highlighting it
|
2020-03-10 20:50:04 +00:00 |
|
Capucho
|
62a5a0ae2c
|
Switch states instead of popping
|
2020-03-10 20:34:50 +00:00 |
|
Capucho
|
d8e65318cb
|
Fix the spam on disconnect
|
2020-03-10 20:34:50 +00:00 |
|
Capucho
|
cc5845d756
|
Proper fix to the logout timeout problem using Disconnect ACK
|
2020-03-10 20:34:50 +00:00 |
|
Capucho
|
d131a5ce8f
|
Janky fix of the logout timeout problem
|
2020-03-10 20:34:50 +00:00 |
|