Commit Graph

2618 Commits

Author SHA1 Message Date
fee51a15b4 Faster cloud reflections 2019-11-19 19:09:22 +00:00
61cfcf4c8b Faster clouds, better water 2019-11-19 19:09:22 +00:00
e9d01da358 Faster and more visually pleasing clouds 2019-11-19 19:09:22 +00:00
2c5d21ddf5 Added clouds 2019-11-19 19:09:22 +00:00
07262fa399 Prevented the moon rising/setting too early/late 2019-11-19 19:09:22 +00:00
9aa2bfe591 Better moonlight 2019-11-19 19:09:22 +00:00
7af96e4655 Added moon 2019-11-19 19:09:22 +00:00
334048a3ad Merge branch 'newcache' into 'master'
switch to new caching inside docker, described at:...

See merge request veloren/veloren!655
2019-11-18 16:18:43 +00:00
2617146512 switch to new caching inside docker, described at: https://gitlab.com/veloren/veloren-docker-ci/merge_requests/8
we need to ln target to /dockercache/veloren/target in order for the cace to take affect, the old caching info is no longer needed inside .gitlab-ci.yml
2019-11-18 12:11:54 +01:00
477cf84d3c Merge branch 'fixci' into 'master'
fix a ci problem if debug dir wasnt available

See merge request veloren/veloren!652
2019-11-14 09:07:29 +00:00
81f61eff7c fix a ci problem if debug dir wasnt available 2019-11-14 09:33:16 +01:00
6c04b7e3ba Merge branch 'checkci' into 'master'
more debug stuff in ci

See merge request veloren/veloren!651
2019-11-14 00:56:59 +00:00
51758a263d more debug stuff in ci 2019-11-14 01:24:08 +01:00
8f4b5904b1 Merge branch 'zesterer/better-water' into 'master'
Better water

See merge request veloren/veloren!643
2019-11-12 14:55:54 +00:00
54640f63ba Merge branch 'xacrimon/strip-ci' into 'master'
Strip Linux executables generated by CI

See merge request veloren/veloren!644
2019-11-11 18:38:23 +00:00
ff10e7a034 Merge branch 'conditional-animations' into 'master'
Make character anims conditional by Tool held

See merge request veloren/veloren!649
2019-11-11 18:32:14 +00:00
a75b2da491 Strip linux executables. 2019-11-11 12:52:27 -05:00
4f03133950 Merge branch 'qwertycrackers' into 'master'
Add a `debug_items` chat command that gives all debug items.

See merge request veloren/veloren!641
2019-11-11 17:36:31 +00:00
c5c42e3755 Remove unnecessary elided lifetimes 2019-11-11 08:26:44 -08:00
b8a291a3dd Make character anims conditional by Tool held 2019-11-10 15:36:47 -08:00
996b5057af Merge branch 'login_desc' into 'master'
Login desc

See merge request veloren/veloren!647
2019-11-09 23:19:41 +00:00
24e9cf702d Login desc 2019-11-09 23:19:41 +00:00
08655ed9dc Merge branch 'pfauenauge/assets' into 'master'
Pfauenauge/assets

See merge request veloren/veloren!646
2019-11-09 13:42:42 +00:00
1cf4e4be11 assets update
map image
human male hairstyles
elf male hairstyle
potion item
cheese item
removed admin items from inventory
2019-11-09 13:42:42 +00:00
9fbfc2fdfc Merge branch 'shandley/disconnection-kick-warnings' into 'master'
Network timeout updates and singleplayer UI improvements

Closes #25

See merge request veloren/veloren!599
2019-11-07 02:06:05 +00:00
e16431d990 Cargo fmt 2019-11-06 20:57:05 -05:00
5430cafabf fix: show error on client failure again 2019-11-07 09:42:03 +09:00
4bf5bed14e Don't use the actual multiline doc comment syntax. 2019-11-06 18:02:58 -05:00
9e40b49b9b Respond to MR feedback.
Mainly clean up code with better use of iterators, and rename the debug
    command to be just `debug`.
2019-11-06 17:57:54 -05:00
6ed33fa875 Add a TODO regarding the future plan for the connection timeout setting. 2019-11-06 21:34:19 +01:00
8bc53693e1 Re-add the metrics port logging which was lost in the merge. 2019-11-06 21:34:19 +01:00
d6785da21b Ignore warning about variant never being constructed. It's being used
elsewhere. Not sure why that isn't being picked up.
2019-11-06 21:34:19 +01:00
08a3d47543 Hmm, alright have it your way rust. Not my change, so leaving it alone. 2019-11-06 21:34:18 +01:00
93cef29378 Removed error which is now handled by the ServerTimeout case 2019-11-06 21:34:18 +01:00
2461318576 Address code review points:
- Clarify caffeine fueled comment
- Be better at comparing Instant's, and catch the 0 seconds case to say
Goodbye to the user
- Switch println for 'info!'
2019-11-06 21:34:18 +01:00
33a1a0ba63 Re-add the handling of error when the player loses connection on the character select screen. 2019-11-06 21:34:17 +01:00
c9de7a0ae6 Fix issue with the timeout error showing when there is an intentional logout from the game. 2019-11-06 21:34:17 +01:00
bcd214187b Remove unused warn and fix dangling parameter. 2019-11-06 21:34:17 +01:00
ef33675fd0 improvement: remove wait because it now always retries 2019-11-06 21:34:16 +01:00
ca2b32acd6 Bump up the timeout tie for booting the single player server 2019-11-06 21:34:16 +01:00
97dda3b2ca improvement: UI for connecting to singleplayer servers + threading fixes 2019-11-06 21:34:15 +01:00
35dbd94ce6 feat: show errors in main menu when client fails
Instead of `[ERROR] Failed to tick the scene: Network(Bincode(Io(Custom { kind: UnexpectedEof, error: "failed to fill whole buffer" })))`
2019-11-06 21:34:15 +01:00
94c453de93 Formatting 2019-11-06 21:34:15 +01:00
5c4cd552d9 Fix chat-cli to account for new case. 2019-11-06 21:34:14 +01:00
97f36ec917 Eeek, remove logging. 2019-11-06 21:34:14 +01:00
7848944c17 Network timeout updates
- Bugfix: Check whether the server response (pong) is greater than the timeout period, rather than the ping (which will always fire regardless of connection status) This was causing the timeout error event to never fire.

- Feature: Send the player notifications to the chat window that they will be kicked due to disconnection for 6 seconds before kicking them back to the main menu.
2019-11-06 21:34:14 +01:00
e6307431e7 cargo fmt the previous changes. 2019-11-05 15:57:08 -05:00
b480b5d324 Add debug_items command
This command gives the player all debug items he does not currently
have.
2019-11-05 15:57:08 -05:00
fbd72b5bbc Add interface to add stuff in bulk to inventory
Also includes inventory tests.
inventory API.
2019-11-05 15:57:08 -05:00
147e745abd Smaller water details 2019-11-05 15:45:01 +00:00