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,052 Commits 151 Branches 18 Tags 2.1 GiB
b8fb250b00
Commit Graph

6052 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ludvig Böklin
b8fb250b00 flake-compat (unify flake and non-flake build process/environment) 
The only user-facing changes is the process for version pinning, which will be
slightly less convenient without access to the `nix flake` feature. This is
justified by it rarely being necessary, for the benefit of relying on an
upcoming built-in nix feature rather than a non-standard third-party tool.

- deprecate `niv` for version pinning
- legacy nix now uses the flake via `flake-compat`
  - remove `sources.{nix,json}` (versions now pinned in `flake.lock`)
  - move contents of `nix/default.nix` to `nix/veloren.nix`
  - make `nix-build nix/default.nix` produce the same output as `flake build`
  - move contents of `nix/shell.nix` into `nix/devShell.nix`
  - make `nix-shell nix/shell.nix` produce the same environment as `flake develop`
- Move `tag` parameter into `sourceInfo`
- Tidy up and autoformat with `nixpkgs-fmt`
- update README to reflect new usage
- revert input versions to match those previously specified in nix/sources.json
 2020-12-11 12:00:04 +00:00
Monty Marz
6233dbc50b Merge branch 'pfau/baobabs' into 'master' 
Baobab Trees, UI fixes, es_la update

See merge request veloren/veloren!1608
 2020-12-11 11:45:11 +00:00
Monty Marz
daf8354c9f Better group frame placement 2020-12-10 21:31:19 +01:00
Snowram
783e784e50 Makes consumables heal faster 2020-12-10 18:06:32 +01:00
Pfauenauge90
f0e63ecbcb adjust mindflayer strength, fix en translation, update es_la translation, fix undead eyes 2020-12-10 18:06:31 +01:00
Monty Marz
565c304a4c add baobabs, fix map difficulty, make mushrooms lootable 2020-12-10 18:06:29 +01:00
Marcel
6be856847d Merge branch 'update-toolchain' into 'master' 
update toolchain to `nightly-2020-12-09`

See merge request veloren/veloren!1606
 2020-12-10 15:03:52 +00:00
Marcel Märtens
92991a92ef adjust fmt and clippy after toolchain upgrade 2020-12-10 14:53:01 +01:00
Marcel Märtens
f44e575cde update toolchain to nightly-2020-12-09 2020-12-10 12:43:42 +01:00
Justin Shipsey
c42cdc685c Merge branch 'snowram/fishes' into 'master' 
Add fishes

See merge request veloren/veloren!1577
 2020-12-09 02:59:55 +00:00
Snowram
db78ffe043 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
704e37d3e5 changed kickers to use 3 leather 2020-12-08 16:27:21 -08: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
87e8c2189f Vacations are never over 2020-12-08 23:03:40 +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
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