Benoît du Garreau
7b4aa6d4cc
cargo fmt
2020-12-17 12:06:22 +01:00
Benoît du Garreau
d090eefb00
Move the asset module to a single file
2020-12-17 12:06:13 +01:00
Benoît du Garreau
0cf164f33a
Use assets_manager to load assets
2020-12-17 12:06:07 +01:00
jiminycrick
60d5d62eef
Switched to hashbrown everywhere
2020-12-17 10:31:35 +01:00
Marcel Märtens
ea84cb138f
fix wrong alignment
2020-12-16 15:17:17 +01:00
Marcel Märtens
e8003a44dd
update specs
2020-12-16 14:31:16 +01:00
Marcel Märtens
a1b50a86c4
update guillotiere
2020-12-16 10:56:00 +01:00
Marcel Märtens
e3307344ab
get rid of some insecure dependencies
2020-12-16 10:42:36 +01:00
Marcel
24a840bc6b
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
e7249210f6
accel based run
2020-12-16 08:07:38 +00:00
Marcel Märtens
107fd432f5
update further crates
2020-12-16 08:56:21 +01:00
Marcel Märtens
26918d10c9
update chrossbeam, tracy, prometheus (and reduce server deps to crossbeam-channel)
2020-12-16 00:51:07 +01:00
Marcel
5600d93844
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
494436be01
Hid plugins behind a feature flag to resolve Windows CI issue
2020-12-15 11:14:26 +00:00
jiminycrick
ce03fcfda3
Healing bomb sfx fix
2020-12-14 21:36:51 -08:00
Monty
8b9db7b179
cleanup, changelog, small bugfixes
...
fmt
fix rebase
fmt
2020-12-14 21:52:24 +01:00
Monty Marz
b5a2104ca5
group member indicator visuals
...
functional group member indicators
adjust visuals
z-comparison
2020-12-14 21:16:13 +01:00
Snowram
834670a641
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
96ed008348
Puts objects offsets into a .ron file
2020-12-14 02:43:49 +01:00
Joshua Barretto
9f2e01617e
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
c3732a8a8c
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
f3ed13ca09
Replace explosion sound with heal bomb sound for sceptre M2
2020-12-13 22:09:28 +01:00
Joshua Barretto
023888f560
Updated changelog, fmt and clippy fixes
2020-12-13 17:40:15 +00:00
Joshua Barretto
f8c8e342e6
Moved common networking code to common/net, clippy fixes
2020-12-13 17:23:45 +00:00
Marcel Märtens
534f083b08
get rid of insecure dependency completly
2020-12-11 16:13:57 +01:00
Monty Marz
f9d4d744a0
Better group frame placement
2020-12-10 21:31:19 +01:00
Monty Marz
f2ba7cc297
add baobabs, fix map difficulty, make mushrooms lootable
2020-12-10 18:06:29 +01:00
Marcel Märtens
ccb01e1898
adjust fmt and clippy after toolchain upgrade
2020-12-10 14:53:01 +01:00
Snowram
6713ac935f
Addressed comments
2020-12-08 23:04:21 +01:00
Snowram
2e8ac0688c
Adds accumulated velocity for animation
2020-12-08 23:03:41 +01:00
Snowram
f94a4ec90d
Improves fish_small, new npc
2020-12-08 23:03:39 +01:00
Snowram
72d73ecd38
Initial fish work
2020-12-08 23:03:38 +01:00
Marcel
ed9413e96a
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
57d3a595ce
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
490915d384
Modified how most abilites that could scale were scaled.
2020-12-07 22:00:24 -06:00
Ben Wallis
81a8ee0c19
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
77a39d74d4
Removed public fields from Client, turned a character error into a frontend event
2020-12-05 11:20:25 +00:00
Joshua Barretto
e5ebbd31fa
Began using Grid<T> for LoD data
2020-12-05 11:20:25 +00:00
James Melkonian
71303fecfd
Aura System and Campfire Health Regen
2020-12-04 22:24:56 +00:00
Imbris
d1431d734a
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
d7f506cf71
Don't drop wayland clipboard
2020-12-01 19:35:32 -05:00
Imbris
b6b03c4a5f
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
bf136a62c5
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
e5e255cbd3
move anim code from voxygen/src/anim to voxygen/anim
2020-12-01 20:20:01 +01:00
Forest Anderson
57c2f21e4d
Cleaning
2020-12-01 10:28:39 -05:00
weldar
a2d98d31a7
Removed SSAA option to resolve issue #871 .
2020-12-01 09:43:06 -05:00
Marcel Märtens
e398cca53c
move common_state into common_sys
2020-12-01 13:46:28 +01:00
Marcel Märtens
add7922653
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
9e5c31a27e
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
a189163910
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
