2614 Commits

Author SHA1 Message Date
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
Imbris
34a1e016a9 Don't drop wayland clipboard 2020-12-01 19:35:32 -05:00
Imbris
d95a5cdefd Merge branch 'weldar/remove-ssaa' into 'master'
Removed SSAA option

Closes #871

See merge request veloren/veloren!1587
2020-12-02 00:21:30 +00:00
Marcel
0569936d2b Merge branch 'xMAC94x/veloren_anim_move' into 'master'
move anim code from voxygen/src/anim to voxygen/anim

See merge request veloren/veloren!1585
2020-12-01 20:01:26 +00:00
Marcel Märtens
70941b4d61 move anim code from voxygen/src/anim to voxygen/anim 2020-12-01 20:20:01 +01:00
Forest Anderson
5f8d5825ec Cleaning 2020-12-01 10:28:39 -05:00
weldar
7ff39f1195 Removed SSAA option to resolve issue #871. 2020-12-01 09:43:06 -05:00
Marcel Märtens
791f8d6f16 move common_state into common_sys 2020-12-01 13:46:28 +01:00
Marcel Märtens
d216ed2a2f Move Systems out of common into common_sys
This requires to move `State` into a own crate called `common_state` which depends on `common` and `common_sys`
2020-12-01 13:44:07 +01:00
Marcel
5da7cb6049 Merge branch 'xvar/tooltip-fade-fix' into 'master'
Changed tooltip fade time from 100 to 0ms to fix tooltip glitching

See merge request veloren/veloren!1567
2020-11-30 21:13:05 +00:00
Marcel
e3d5185894 Merge branch 'azymohliad/sun-movement-direction' into 'master'
Fix Sun and Moon movement direction

See merge request veloren/veloren!1568
2020-11-30 21:13:03 +00:00