1173 Commits

Author SHA1 Message Date
Shane Handley
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
Shane Handley
08a3d47543
Hmm, alright have it your way rust. Not my change, so leaving it alone. 2019-11-06 21:34:18 +01:00
Shane Handley
93cef29378
Removed error which is now handled by the ServerTimeout case 2019-11-06 21:34:18 +01:00
Shane Handley
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
Shane Handley
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
Shane Handley
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
Shane Handley
bcd214187b
Remove unused warn and fix dangling parameter. 2019-11-06 21:34:17 +01:00
timokoesters
ef33675fd0
improvement: remove wait because it now always retries 2019-11-06 21:34:16 +01:00
Shane Handley
ca2b32acd6
Bump up the timeout tie for booting the single player server 2019-11-06 21:34:16 +01:00
timokoesters
97dda3b2ca
improvement: UI for connecting to singleplayer servers + threading fixes 2019-11-06 21:34:15 +01:00
timokoesters
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
Shane Handley
94c453de93
Formatting 2019-11-06 21:34:15 +01:00
Shane Handley
97f36ec917
Eeek, remove logging. 2019-11-06 21:34:14 +01:00
Shane Handley
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
soruh
94beb0fa33 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
soruh
352694eecd update toolchain to nightly-2019-11-04 2019-11-04 18:26:32 +01:00
Monty Marz
cbb794f676 login info text 2019-11-01 20:53:52 +00:00
Acrimon
bc9667d669 Remove heaptrack as it is now deprecated. 2019-10-29 06:55:45 +00:00
Monty Marz
7d63f0297d Updated: Help Window, Map, Item Descriptions 2019-10-27 22:22:40 +00:00
jshipsey
3536b0f273 rebase, small fixes 2019-10-25 22:20:38 -04:00
jshipsey
d74f0bb2ce purged references to npckind from anim files, removed warnings 2019-10-25 21:50:14 -04:00
jshipsey
c503f6e063 streamlined body part naming scheme, swapped quadruped to quadruped_small, rewrote mesh names to reflect body type instead of npckind. finally. 2019-10-25 21:50:14 -04:00
jshipsey
345095a183 added large bipeds, small birbs, small fish skeletons 2019-10-25 21:47:23 -04:00
jshipsey
1c1e577c5b added dragon skeleton 2019-10-25 21:44:33 -04:00
jshipsey
33fb92aa08 fish_medium and bird_medium skelingtons 2019-10-25 21:39:06 -04:00
jshipsey
b9c623307a added large bipeds, small birbs, small fish skeletons 2019-10-25 21:34:29 -04:00
jshipsey
c69beb64a9 added dragon skeleton 2019-10-25 21:33:59 -04:00
jshipsey
1456548dbd fish_medium and bird_medium skelingtons 2019-10-25 21:33:02 -04:00
Marcel
572196ed10 Merge branch 'songtronix/set-voxygen-config-via-env' into 'master'
customizable config file location via environment variable

See merge request veloren/veloren!617
2019-10-25 18:52:38 +00:00
Timo Koesters
d77e91343b Merge branch 'timo-items-as-ron' into 'master'
feat: store items as RON files

See merge request veloren/veloren!618
2019-10-25 08:57:39 +00:00
Imbris
a6b352b93e Merge branch 'imbris/mesh-speed' into 'master'
Speed up terrain meshing ~20%

See merge request veloren/veloren!625
2019-10-25 02:22:03 +00:00
Imbris
8df95e0ce7 improvement: roughly ~20% speedup of terrain meshing by eliminating redundant lookups of terrain blocks 2019-10-24 20:02:29 -04:00
timokoesters
9ffbb9550b
improvement: load_cloned returns a result 2019-10-24 23:55:24 +02:00
timokoesters
2182becc6a
improvement: make debug items of type ItemKind::Tool
This way all items that can be held in a hand are tools
2019-10-24 23:55:24 +02:00
timokoesters
c426c1641c
feat: store items as RON files
When a new item is created, a ron file will be used as a template
2019-10-24 23:47:26 +02:00
Monty Marz
072611f703 .floating(true) for help window background to make it layer above every recent and future widget 2019-10-24 18:21:17 +00:00
Joshua Barretto
8fa8bc31c4 Merge branch 'soruh/fix-welcome-window-depth' into 'master'
fix the welcome window not being closeable, due to it being obscured by the chat

See merge request veloren/veloren!623
2019-10-24 12:49:20 +00:00
Imbris
e830077fb1 Merge branch 'imbris/graphic-cache' into 'master'
Rework GraphicCache to use multiple texture atlases if necessary and put large images in their own textures.

See merge request veloren/veloren!609
2019-10-24 05:27:09 +00:00
Imbris
8bda7b1633 Fix possess bug, remove commented code, drain controller events 2019-10-24 00:00:00 -04:00
Imbris
22d29d1209 Integrate new systems with metrics 2019-10-23 23:50:06 -04:00
Imbris
9cd42d1056 Move serverside client to a component and communications into server ecs systems 2019-10-23 23:50:06 -04:00
soruh
696da23f7f fix the welcome window not being closeable
due to the chat being in front of it,
by giving the welcome window a depth of -1.0.
The value of -1.0 is very arbitrary, but has some effect on
further development*, so there should be consideration concerning it.

* if something is supposed to be over/under the welcome window and
over/under something else with a different depth at the same time,
the resulting depth could become really ugly.
Of course it's always possible to change depths afterwards, but this often
breaks things, so the general scope of depths should
imo be considered, before this becomes a problem.
2019-10-24 00:46:40 +02:00
Monty Marz
9282ca00b4 Multiple Assets and UI fixes and additions 2019-10-23 19:40:45 +00:00
Songtronix
34a361bba8 feat(env): customizable config file location 2019-10-22 17:15:10 +02:00
Isaac Freund
9712d6dcd7 Allow dropping items
Items can now be dropped by clicking to select the item then clicking
outside of the bag.
2019-10-22 01:40:58 +02:00
Imbris
7d08a9ea48 Rework GraphicCache to use multiple texture atlases and put large images in their own textures. 2019-10-19 21:28:30 -04:00
Songtronix
eda188dc37 fix(crash): overflowing the stack 2019-10-18 14:19:02 +02:00
Songtronix
4191b1bf9c change(menu): display version with hash and date 2019-10-18 15:51:07 +02:00
Imbris
c6f8125b6c Merge branch '276-hotloading-armor' into 'master'
Resolve "Enable hotloading of different offsets for armors/weapons"

Closes #276

See merge request veloren/veloren!545
2019-10-18 00:29:09 +00:00
Adam Fogle
ab9c6dc5db Removed the recolor property from the armor ron files. 2019-10-17 19:45:29 -04:00