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,080 Commits 151 Branches 18 Tags 2.1 GiB
9e62a6c322
Commit Graph

6080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yusuf Bera Ertan
9e62a6c322
nix: update README, remove nixGL selection from dev shell (which also removes envrc-nvidia), update envrc to be used by both flakes, tidy up some stuff 2020-12-12 17:10:54 +03:00
Yusuf Bera Ertan
9f8ec7e010
nix: refactor crateDeps in common to look better 2020-12-12 17:10:54 +03:00
Yusuf Bera Ertan
4c61914b91
nix: remove version from package names 2020-12-12 17:10:54 +03:00
Yusuf Bera Ertan
dd68285d79
nix: fix veloren version string in game, remove obsolete utils 2020-12-12 17:10:54 +03:00
Marcel
fc7a3748c0 Merge branch 'xMAC94x/move' into 'master' 
move tools and chat-cli in src/bin and examples

See merge request veloren/veloren!1620
 2020-12-12 01:50:56 +00:00
Marcel Märtens
eba3532386 move tools and chat-cli in src/bin and examples 2020-12-12 02:12:00 +01:00
Marcel
413f0853c2 Merge branch 'xMAC94x/fix-benchmark' into 'master' 
it seems like that the TAGUUID must start with a Alphabetic char

See merge request veloren/veloren!1617
 2020-12-12 01:08:57 +00:00
Marcel
e54b4d5797 Merge branch 'DaforLynx/campfire-loading-tip' into 'master' 
Loading screen tip for campfire healing

See merge request veloren/veloren!1601
 2020-12-12 00:29:57 +00:00
DaforLynx
70814ee922 Loading screen tip for campfire healing 2020-12-12 00:29:57 +00:00
Marcel
9b1bc41f6e Merge branch 'jacki/german' into 'master' 
Updated de_DE translation

See merge request veloren/veloren!1572
 2020-12-11 23:51:00 +00:00
Tobias Frisch
23e3964059 Updated de_DE translation 
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
 2020-12-11 23:51:00 +00:00
Marcel
1c1d19dbb6 Merge branch 'VincentFoulon80-master-patch-13262' into 'master' 
Update French Translation

See merge request veloren/veloren!1600
 2020-12-11 23:29:44 +00:00
Vincent Foulon
2503d79567 Update French Translation 2020-12-11 23:29:44 +00:00
Marcel Märtens
58bda48bf0 it seems like that the TAGUUID must start with a Alphabetic char 2020-12-12 00:20:57 +01:00
Marcel
e438b4f85f Merge branch 'zesterer/small-fixes' into 'master' 
Prevented towns destroying trees, rocks, other towns, etc.

See merge request veloren/veloren!1611
 2020-12-11 20:33:58 +00:00
Marcel
c86769ecf3 Merge branch 'xMAC94x/remove_failure' into 'master' 
get rid of insecure dependency completly

See merge request veloren/veloren!1612
 2020-12-11 20:33:56 +00:00
Marcel
5cd4aa721f Merge branch 'xMAC94x/fix_injection' into 'master' 
fix sql injection

See merge request veloren/veloren!1615
 2020-12-11 18:42:52 +00:00
Marcel Märtens
9dae7f1cf6 fix sql injection 2020-12-11 19:09:11 +01:00
Joshua Barretto
316bddbf30 Prevented towns destroying trees, rocks, other towns, etc. 2020-12-11 16:53:21 +01:00
Marcel Märtens
534f083b08 get rid of insecure dependency completly 2020-12-11 16:13:57 +01:00
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