Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,036 Commits 151 Branches 18 Tags
Commit Graph

6036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Samuel Keiffer
5be36b1399 Merge branch 'sam/combat-tweaks' into 'master' 
Combat tweaks

See merge request veloren/veloren!1603
 2020-12-08 05:26:27 +00:00
Sam
bdd1a605ab Modified how most abilites that could scale were scaled. 2020-12-07 22:00:24 -06:00
Joshua Barretto
6cc61baf4b 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
a3a077067c Removed panic sources from server event handling 2020-12-07 12:28:29 +00:00
Ben Wallis
49baf14d0b 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
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
38f9bc15ae 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
74f100fe44 Fixed incorrect grid check 2020-12-05 18:30:07 +00:00
Joshua Barretto
309dcd2acb Added cave mushrooms 2020-12-05 18:00:29 +00:00
Joshua Barretto
ce67292d04 Updated chat-cli with new API 2020-12-05 11:47:31 +00:00
Joshua Barretto
83c403aff3 Better aurora 2020-12-05 11:20:25 +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
b82f4f6cad Better mist access 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
Samuel Keiffer
cd658dd394 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
6b100bce79 Aura System and Campfire Health Regen 2020-12-04 22:24:56 +00:00
Imbris
88a3269ed6 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
a90ec872b7 Chat commands for group manipulation 2020-12-04 02:18:42 +00:00
Marcel
be1d5950e1 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
1e2c719f11
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
106d377299
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
b22e6215f3 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
d57b23a82e
nix: add rust-src component to rust toolchain 2020-12-02 12:48:14 +01: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
Samuel Keiffer
72c405c3c6 Merge branch 'sceptre_buff' into 'master' 
iOddishGX/sceptre_buff

See merge request veloren/veloren!1582
 2020-12-01 20:01:24 +00:00
iOddishGX
9d45d069b4 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
70941b4d61 move anim code from voxygen/src/anim to voxygen/anim 2020-12-01 20:20:01 +01:00
Forest Anderson
6da0032339 Updated changelog 2020-12-01 10:29:49 -05: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
dec494d531 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
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
cc735c8bc7 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
399d94c203 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
Yusuf Bera Ertan
893b2de47b
nix: add .desktop file to veloren-voxygen derivation, update deps and other minor stuff 2020-12-01 00:15:18 +03:00
Marcel
a9aaa4c22a Merge branch 'ubruntu/fix-home-fall-damage' into 'master' 
Stop /home from causing fall damage

Closes #843

See merge request veloren/veloren!1552
 2020-11-30 21:13:06 +00:00
ubruntu
fecf5bad92 Stop /home from causing fall damage 2020-11-30 21:13:06 +00: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
Yusuf Bera Ertan
3ed3e39c51
nix: add envrc and envrc-nvidia file for auto dev env setup with direnv 2020-11-30 23:51:05 +03:00
Marcel
1f12ec67e5 Merge branch 'offspec/larger-scalemode-range' into 'master' 
Offspec/larger scalemode range

See merge request veloren/veloren!1579
 2020-11-30 20:36:58 +00:00
Nicholas Kinney
f2014f7896 Offspec/larger scalemode range 2020-11-30 20:36:58 +00:00
Ben Wallis
62edafa075 Changed Dockerfile to use ENTRYPOINT to allow the veloren-server-cli process to receive signals sent by Watchtower 2020-11-30 16:46:36 +00:00