Marcel Märtens
ccb01e1898
adjust fmt and clippy after toolchain upgrade
2020-12-10 14:53:01 +01:00
Marcel Märtens
b2a814b1d7
update toolchain to nightly-2020-12-09
2020-12-10 12:43:42 +01:00
Justin Shipsey
4bdd84ab46
Merge branch 'snowram/fishes' into 'master'
...
Add fishes
See merge request veloren/veloren!1577
2020-12-09 02:59:55 +00:00
Snowram
99c1baf6a9
Merge branch 'entropy9s/LeatherFix' into 'master'
...
changed kickers to 3 leather, hopefully this works!
See merge request veloren/veloren!1604
2020-12-09 01:44:40 +00:00
Entropy
98688651b5
changed kickers to use 3 leather
2020-12-08 16:27:21 -08: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
526d3bd035
Vacations are never over
2020-12-08 23:03:40 +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
Samuel Keiffer
f3216b55a3
Merge branch 'sam/combat-tweaks' into 'master'
...
Combat tweaks
See merge request veloren/veloren!1603
2020-12-08 05:26:27 +00:00
Sam
490915d384
Modified how most abilites that could scale were scaled.
2020-12-07 22:00:24 -06:00
Joshua Barretto
96b4c67419
Merge branch 'zesterer/small-fixes' into 'master'
...
More small fixes
See merge request veloren/veloren!1599
2020-12-07 16:12:53 +00:00
Joshua Barretto
fe7f73bf62
Removed panic sources from server event handling
2020-12-07 12:28:29 +00:00
Ben Wallis
283b8720b6
Merge branch 'xvar/fix-ansi-colors-on-windows' into 'master'
...
Fixed raw ANSI control codes showing when server-cli or voxygen run directly in Windows Command Prompt
See merge request veloren/veloren!1598
2020-12-06 18:39:41 +00: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
115c09120d
Merge branch 'zesterer/small-fixes' into 'master'
...
Actually small fixes this time
See merge request veloren/veloren!1597
2020-12-06 13:31:04 +00:00
Joshua Barretto
52f2bccf2f
Fixed incorrect grid check
2020-12-05 18:30:07 +00:00
Joshua Barretto
b37be14b86
Added cave mushrooms
2020-12-05 18:00:29 +00:00
Joshua Barretto
217890e70d
Updated chat-cli with new API
2020-12-05 11:47:31 +00:00
Joshua Barretto
a5c37262dd
Better aurora
2020-12-05 11:20:25 +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
e413392694
Better mist access
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
Samuel Keiffer
20b45a1202
Merge branch 'james/campfire-regen' into 'master'
...
Aura System and Campfire Health Regen
See merge request veloren/veloren!1539
2020-12-04 22:24:56 +00:00
James Melkonian
71303fecfd
Aura System and Campfire Health Regen
2020-12-04 22:24:56 +00:00
Imbris
30563f59f3
Merge branch 'ubruntu/group-commands' into 'master'
...
Chat commands for group manipulation
See merge request veloren/veloren!1584
2020-12-04 02:18:42 +00:00
ubruntu
c975f811e7
Chat commands for group manipulation
2020-12-04 02:18:42 +00:00
Marcel
f93c2874f9
Merge branch 'yusdacra/update-cargonix' into 'master'
...
Update Nix deps, regenerate Cargo.nix and minor changes
See merge request veloren/veloren!1590
2020-12-03 14:21:08 +00:00
Yusuf Bera Ertan
39843e847d
nix: update niv deps, regenerate Cargo.nix, add some comments and remove an unused variable
2020-12-02 23:38:26 +03:00
Yusuf Bera Ertan
1a8caaf4de
nix: envrc-common doesn't work apparently, so copy contents in it to both envrc-nvidia and envrc
2020-12-02 23:16:00 +03:00
Marcel
f8d48ad4a0
Merge branch 'stupremee/rust-src-in-nix-shell' into 'master'
...
Nix: Add rust-src component to rust toolchain
See merge request veloren/veloren!1588
2020-12-02 12:30:31 +00:00
Justus K
a0ca0c1517
nix: add rust-src component to rust toolchain
2020-12-02 12:48:14 +01: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
Samuel Keiffer
cdbdadc2ba
Merge branch 'sceptre_buff' into 'master'
...
iOddishGX/sceptre_buff
See merge request veloren/veloren!1582
2020-12-01 20:01:24 +00:00
iOddishGX
31e2e93786
Lowered the energy cost from 80 to 40
...
Increased the healing multiplier
Lowered the damage output
Increased the radius
Made the projectile slightly faster
2020-12-01 20:01:24 +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
f82016c66c
Updated changelog
2020-12-01 10:29:49 -05: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
6da55b8f2e
Merge branch 'xMAC94x/common_seperation_1' into 'master'
...
Move Systems out of common into `common_sys`
See merge request veloren/veloren!1583
2020-12-01 13:31:33 +00: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
e06dd3fe7e
Merge branch 'yusdacra/fix-nix-build-tag-bug' into 'master'
...
Improve Nix build files (yet again!)
See merge request veloren/veloren!1571
2020-11-30 21:50:15 +00:00
Marcel
fe46f8d901
Merge branch 'xvar/fix-docker-shutdown-signal' into 'master'
...
Fixed graceful shutdown countdown for servers running in Docker
See merge request veloren/veloren!1580
2020-11-30 21:42:08 +00:00
