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,162 Commits 151 Branches 18 Tags 2.1 GiB
1ace001fde
Commit Graph

6162 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcel
fcdace7236 Merge branch 'xMAC94x/switch_ci_db' into 'master' 
switch host to mac94.de, because song is affraid of sql injection into a...

See merge request veloren/veloren!1613
 2020-12-11 15:13:09 +00:00
Marcel Märtens
d46271f052 switch host to mac94.de, because song is affraid of sql injection into a public db which doesn't cause any harm 2020-12-11 15:58:41 +01:00
Marcel
e426780ed2 Merge branch 'xMAC94x/enhanceBench' into 'master' 
upload benchmark to central ci db

See merge request veloren/veloren!1417
 2020-12-11 13:48:43 +00:00
Ben Wallis
fd6bdb5760 Merge branch 'hash-fix' into 'master' 
Fix nix rust channel hash mismatch

See merge request veloren/veloren!1610
 2020-12-11 13:10:17 +00:00
Ludvig Böklin
3870f9d6b3 Fix nix rust channel hash mismatch 2020-12-11 13:36:56 +01:00
Marcel Märtens
9ec2a602e6 escape ENV variables with a randomly generated 16 char tag. remove installation of postgres client and move it to docker container 2020-12-11 13:26:04 +01:00
Ben Wallis
4e4da15fe6 Merge branch 'flake' into 'master' 
Provide flake.nix

See merge request veloren/veloren!1607
 2020-12-11 12:00:04 +00:00
Ludvig Böklin
3f498522db 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
c5f5409774 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
f9d4d744a0 Better group frame placement 2020-12-10 21:31:19 +01:00
Snowram
ecdbd1c5d6 Makes consumables heal faster 2020-12-10 18:06:32 +01:00
Pfauenauge90
6d1bae67d0 adjust mindflayer strength, fix en translation, update es_la translation, fix undead eyes 2020-12-10 18:06:31 +01:00
Monty Marz
f2ba7cc297 add baobabs, fix map difficulty, make mushrooms lootable 2020-12-10 18:06:29 +01:00
Marcel Märtens
dad5bf3aff upload benchmark to central ci db 
```sql
CREATE TABLE benchmarks(
    "timestamp" timestamptz NOT NULL DEFAULT (current_setting('veloren.timestamp')::timestamptz),
    branch text NOT NULL DEFAULT current_setting('veloren.branch'),
    sha text NOT NULL DEFAULT current_setting('veloren.sha'),
    "group" text NULL,
    "function" text NULL,
    "value" text NULL,
    throughput_num numeric NULL,
    throughput_type text NULL,
    sample_measured_value numeric NOT NULL,
    unit text NULL,
    iteration_count numeric NULL
);
```
 2020-12-10 16:19:41 +01:00
Marcel
3c9e8a4479 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
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