2625 Commits

Author SHA1 Message Date
Ben Wallis
659ca3e737 * Fixed character load errors not being handled in Voxygen.
* Improved server error message for character load errors.
* Added server logging for item asset load errors during character load.
* Fixed character select error message dialog not supporting long messages.
2020-12-30 19:29:22 +00:00
Acrimon
e79282ce76
update some error handling code 2020-12-29 01:21:09 +01:00
Sarra Kitty
81f656ba81 new gliders
added sandraptor glider

added sandraptor glider

stuff

working on other raptor gliders

adding file and placeholder model (copy of morpho) for monarch butterfly gliders

adding models for snow and wood raptor gliders

added a proper model for the monarch glider

adding crafting recipies for raptor gliders, and raptor feather item for the recipe. Made monarch and morpho rare drops in cave loot table

made raptors drop their feathers

fmt
2020-12-24 02:54:18 +00:00
Frinksy
fd554827a0 fixing #881
- Multiple buffs make the UI icons flicker
2020-12-22 15:40:57 +00:00
Adam Blanchet
e3b9de37fb working towards #861 -
Use scancodes for (at minimum) key remapping

added ScanCode fallback for when winit doesn't provide a VirtualKeyCode

renamed SKey to ScanKey
2020-12-18 10:01:30 +01:00
Benoît du Garreau
f983f9e915 Fix bad specifier breaking on Windows 2020-12-17 17:22:02 +00:00
Marcel
7d1eb4604b Merge branch 'a1phyr/use_assets_manager' into 'master'
Use `assets_manager` to load assets

See merge request veloren/veloren!1624
2020-12-17 12:25:29 +00:00
Marcel
05519ee293 Merge branch 'test_util' into 'master'
Add simple tests to utils description functions

See merge request veloren/veloren!1526
2020-12-17 11:20:19 +00:00
Benoît du Garreau
2c94b05e99 Improve world::Index 2020-12-17 12:08:04 +01:00
Benoît du Garreau
780be6787d Fix clippy lints 2020-12-17 12:06:28 +01:00
Benoît du Garreau
3052ba5f65 cargo fmt 2020-12-17 12:06:22 +01:00
Benoît du Garreau
8bc4b887a8 Move the asset module to a single file 2020-12-17 12:06:13 +01:00
Benoît du Garreau
db18cc1770 Use assets_manager to load assets 2020-12-17 12:06:07 +01:00
jiminycrick
26239394be Switched to hashbrown everywhere 2020-12-17 10:31:35 +01:00
Marcel Märtens
100e858d79 fix wrong alignment 2020-12-16 15:17:17 +01:00
Marcel Märtens
04b71f9dc8 update specs 2020-12-16 14:31:16 +01:00
Marcel Märtens
1f2f9905a3 update guillotiere 2020-12-16 10:56:00 +01:00
Marcel Märtens
075933d60b get rid of some insecure dependencies 2020-12-16 10:42:36 +01:00
Marcel
91ad5657a5 Merge branch 'xMAC94x/dependencies' into 'master'
update chrossbeam, tracy, prometheus (and reduce server deps to crossbeam-channel)

See merge request veloren/veloren!1641
2020-12-16 09:33:34 +00:00
Justin Shipsey
0d98896df8 accel based run 2020-12-16 08:07:38 +00:00
Marcel Märtens
1ea395a47f update further crates 2020-12-16 08:56:21 +01:00
Marcel Märtens
bcb4c075ed update chrossbeam, tracy, prometheus (and reduce server deps to crossbeam-channel) 2020-12-16 00:51:07 +01:00
Marcel
1b3361c842 Merge branch 'james/healbomb-sfx-fix' into 'master'
Healing bomb sfx fix

See merge request veloren/veloren!1637
2020-12-15 13:15:32 +00:00
Joshua Barretto
52a6717996 Hid plugins behind a feature flag to resolve Windows CI issue 2020-12-15 11:14:26 +00:00
jiminycrick
ee281ecad0 Healing bomb sfx fix 2020-12-14 21:36:51 -08:00
Monty
0a9aed3d11 cleanup, changelog, small bugfixes
fmt
fix rebase
fmt
2020-12-14 21:52:24 +01:00
Monty Marz
23a808f721 group member indicator visuals
functional group member indicators
adjust visuals
z-comparison
2020-12-14 21:16:13 +01:00
Snowram
f08a9545d9 Merge branch 'snowram/objects-offsets-ron' into 'master'
Put objects offsets into a .ron file

See merge request veloren/veloren!1627
2020-12-14 18:00:07 +00:00
Snowram
577447df76 Puts objects offsets into a .ron file 2020-12-14 02:43:49 +01:00
Joshua Barretto
a8c469c9bf Merge branch 'plugins' into 'master'
Plugins and codebase refactor

See merge request veloren/veloren!1625
2020-12-14 00:53:09 +00:00
Samuel Keiffer
7f7fc3a757 Merge branch 'nahua/replace_sceptre_m2_sound' into 'master'
Issue 872: Replace explosion sound with heal bomb sound for sceptre M2

See merge request veloren/veloren!1618
2020-12-13 23:18:30 +00:00
nahuakang
ef5efa738c Replace explosion sound with heal bomb sound for sceptre M2 2020-12-13 22:09:28 +01:00
Joshua Barretto
5b0e0e6f4c Updated changelog, fmt and clippy fixes 2020-12-13 17:40:15 +00:00
Joshua Barretto
e5100040b4 Moved common networking code to common/net, clippy fixes 2020-12-13 17:23:45 +00:00
Marcel Märtens
cc062ffaea get rid of insecure dependency completly 2020-12-11 16:13:57 +01:00
Monty Marz
daf8354c9f Better group frame placement 2020-12-10 21:31:19 +01:00
Monty Marz
565c304a4c add baobabs, fix map difficulty, make mushrooms lootable 2020-12-10 18:06:29 +01:00
Marcel Märtens
92991a92ef adjust fmt and clippy after toolchain upgrade 2020-12-10 14:53:01 +01:00
Snowram
856ce6cb1d Addressed comments 2020-12-08 23:04:21 +01:00
Snowram
22635559f0 Adds accumulated velocity for animation 2020-12-08 23:03:41 +01:00
Snowram
6f200ffe93 Improves fish_small, new npc 2020-12-08 23:03:39 +01:00
Snowram
80fbf6e225 Initial fish work 2020-12-08 23:03:38 +01:00
Marcel
5bf93689c3 Merge branch 'HiggsTardigradeTau/deltatime-lowest-delta-usage' into 'master'
Resolve #867 - Make deltatime use the lowest delta of several frames to avoid 'teleport' effect after single-frame lag spike

Closes #867

See merge request veloren/veloren!1592
2020-12-08 21:07:15 +00:00
HiggsTardigradeTau
9ab8dc3eb5 Resolve #867 - Make deltatime use the lowest delta of several frames to avoid 'teleport' effect after single-frame lag spike 2020-12-08 21:07:14 +00:00
Sam
bdd1a605ab Modified how most abilites that could scale were scaled. 2020-12-07 22:00:24 -06:00
Ben Wallis
135f019078 Changed logging to use termcolor crate to fix ansi control codes showing when run under Windows Command Prompt 2020-12-06 14:49:13 +00:00
Joshua Barretto
483c707006 Removed public fields from Client, turned a character error into a frontend event 2020-12-05 11:20:25 +00:00
Joshua Barretto
941ba71794 Began using Grid<T> for LoD data 2020-12-05 11:20:25 +00:00
James Melkonian
6b100bce79 Aura System and Campfire Health Regen 2020-12-04 22:24:56 +00:00
Imbris
eda360562b Merge branch 'imbris/update-winit' into 'master'
Don't drop the wayland clipboard

Closes #855

See merge request veloren/veloren!1576
2020-12-02 01:33:29 +00:00