Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,060 Commits 151 Branches 18 Tags 2.1 GiB
63d1b2bb22
Commit Graph

3060 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcel Märtens
b08f11cfa4 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
Marcel
fdeace1748 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
Marcel Märtens
db80ddb088 fix a ci problem if debug dir wasnt available 2019-11-14 09:33:16 +01:00
Marcel
e3c0cefd11 Merge branch 'checkci' into 'master' 
more debug stuff in ci

See merge request veloren/veloren!651
 2019-11-14 00:56:59 +00:00
Marcel Märtens
5d2199bd33 more debug stuff in ci 2019-11-14 01:24:08 +01:00
Joshua Barretto
eb7b55d3ad Merge branch 'zesterer/better-water' into 'master' 
Better water

See merge request veloren/veloren!643
 2019-11-12 14:55:54 +00:00
Forest Anderson
a58c257ea5 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
Timo Koesters
9a0c337eec 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
Acrimon
a196ad40b6 Strip linux executables. 2019-11-11 12:52:27 -05:00
Forest Anderson
5a73554aa1 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
Adam Whitehurst
59826a364a Remove unnecessary elided lifetimes 2019-11-11 08:26:44 -08:00
Adam Whitehurst
64a0d8d91f Make character anims conditional by Tool held 2019-11-10 15:36:47 -08:00
Acrimon
5fe1eecf1f Merge branch 'login_desc' into 'master' 
Login desc

See merge request veloren/veloren!647
 2019-11-09 23:19:41 +00:00
Monty Marz
a9a7b95037 Login desc 2019-11-09 23:19:41 +00:00
Monty Marz
259904ac99 Merge branch 'pfauenauge/assets' into 'master' 
Pfauenauge/assets

See merge request veloren/veloren!646
 2019-11-09 13:42:42 +00:00
Monty Marz
c38447a264 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
Justin Shipsey
06c41f1c31 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
Joseph Gerardot
0a44e714b4
Cargo fmt 2019-11-06 20:57:05 -05:00
timokoesters
b6552556e7 fix: show error on client failure again 2019-11-07 09:42:03 +09:00
Joseph Gerardot
52020e4902
Don't use the actual multiline doc comment syntax. 2019-11-06 18:02:58 -05:00
Joseph Gerardot
e73884a1d4
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
Shane Handley
4df7e95331
Add a TODO regarding the future plan for the connection timeout setting. 2019-11-06 21:34:19 +01:00
Shane Handley
f7cfcc5394
Re-add the metrics port logging which was lost in the merge. 2019-11-06 21:34:19 +01:00
Shane Handley
0fabe70960
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
Shane Handley
4330b33ce0
Hmm, alright have it your way rust. Not my change, so leaving it alone. 2019-11-06 21:34:18 +01:00
Shane Handley
fb3350c605
Removed error which is now handled by the ServerTimeout case 2019-11-06 21:34:18 +01:00
Shane Handley
15c725bfde
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
Shane Handley
b15c107f0b
Re-add the handling of error when the player loses connection on the character select screen. 2019-11-06 21:34:17 +01:00
Shane Handley
69b008e0e6
Fix issue with the timeout error showing when there is an intentional logout from the game. 2019-11-06 21:34:17 +01:00
Shane Handley
81f41e278e
Remove unused warn and fix dangling parameter. 2019-11-06 21:34:17 +01:00
timokoesters
4a65cddd15
improvement: remove wait because it now always retries 2019-11-06 21:34:16 +01:00
Shane Handley
26acd8b427
Bump up the timeout tie for booting the single player server 2019-11-06 21:34:16 +01:00
timokoesters
c733c95718
improvement: UI for connecting to singleplayer servers + threading fixes 2019-11-06 21:34:15 +01:00
timokoesters
21f126acd4
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
Shane Handley
3b24af76ab
Formatting 2019-11-06 21:34:15 +01:00
Shane Handley
833c1d06b2
Fix chat-cli to account for new case. 2019-11-06 21:34:14 +01:00
Shane Handley
ef6f8b509a
Eeek, remove logging. 2019-11-06 21:34:14 +01:00
Shane Handley
fe9ad3fa19
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
Joseph Gerardot
7325757066 cargo fmt the previous changes. 2019-11-05 15:57:08 -05:00
Joseph Gerardot
eb1b42be0f 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
Joseph Gerardot
fab5377eed Add interface to add stuff in bulk to inventory 
Also includes inventory tests.
inventory API.
 2019-11-05 15:57:08 -05:00
Joshua Barretto
2134bf87a7 Smaller water details 2019-11-05 15:45:01 +00:00
Joshua Barretto
671313a523 Overhauled water shaders 2019-11-05 15:45:01 +00:00
Joshua Barretto
6d8d06ff7c Smoother water 2019-11-05 15:45:01 +00:00
Joshua Barretto
7ecfde2925 Better water 2019-11-05 15:45:01 +00:00
Marcel
1e62e0077e Merge branch 'soruh/audit-dependencies' into 'master' 
Updated most dependencies. Removed potential vulnerability.

See merge request veloren/veloren!635
 2019-11-05 11:14:39 +00:00
soruh
6dfa146484 Mitgated RUSTSEC-2019-0014 by updating noise and 
disabling its default features, specifically `image`,
which had the vulnerability.
 2019-11-05 11:14:39 +00:00
Marcel
776919bc6e Merge branch 'soruh/update-toolchain' into 'master' 
Update the toolchain to `nightly-2019-11-04`

See merge request veloren/veloren!645
 2019-11-04 18:58:06 +00:00
soruh
e3bd152d24 update toolchain to nightly-2019-11-04 2019-11-04 18:26:32 +01:00
Marcel
41f46cb499 Merge branch 'angelonfira/add-lines-of-code-readme' into 'master' 
Added lines of code badge into readme

See merge request veloren/veloren!622
 2019-11-04 16:14:11 +00:00