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,149 Commits 151 Branches 18 Tags 2.1 GiB
37d6fbc3ce
Commit Graph

6149 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Barretto
7963ad930c Moved common networking code to common/net, clippy fixes 2020-12-13 17:16:39 +00:00
Joshua Barretto
097fff8ad6 Added .tar to LFS extensions 2020-12-13 17:15:33 +00:00
Joshua Barretto
027842f832 Resolved plugin dependency cycle, allowing more interesting plugin API 2020-12-13 17:15:33 +00:00
Joshua Barretto
8e937a50ca Better plugin API 2020-12-13 17:15:33 +00:00
ccgauche
b18eda37b5 Added parallelism to event execution using rayon 2020-12-13 17:15:33 +00:00
ccgauche
cae81e625e Added plugin command support 2020-12-13 17:15:33 +00:00
Joshua Barretto
2743825181 Force type-correct hooks, renamed proc macro 2020-12-13 17:15:33 +00:00
Joshua Barretto
780f54ac90 Reorganised plugin crates 2020-12-13 17:15:32 +00:00
ccgauche
05aee7df18 Removed unsafe unsage in favour of unwrap_or and get 2020-12-13 17:15:03 +00:00
ccgauche
c95f57cafd Fixed comments 
- Would be better to remove the iterator and just collect with a loop to avoid extra allocations
 - tructure
 - A HashSet is probably better
 - Usefull -> Useful
 - I'd have thought plugin-api-derive is a better name
 2020-12-13 17:14:39 +00:00
ccgauche
ee7fb990c3 Added plugin system 
Added a plugin system based on wasmer-runtime
 - Support Action (Print handled)
 - Support Events (PluginLoadEvent handled)
 2020-12-13 17:14:37 +00:00
Joshua Barretto
12b29ea174 Began work on plugin API and plugin loading 2020-12-13 17:13:57 +00:00
Yusuf Bera Ertan
9ecaba8552
nix: workaround an issue with crate2nix, change some errors to be more clear 2020-12-12 21:14:29 +03:00
Yusuf Bera Ertan
c5a7db06fb
nix: better instructions for nixGL 2020-12-12 17:53:48 +03:00
Yusuf Bera Ertan
23d1abc8a6
nix: add missing dependency xcb 2020-12-12 17:26:02 +03:00
Yusuf Bera Ertan
b75a5ab32c
nix: regenerate Cargo.nix 2020-12-12 17:11:51 +03:00
Yusuf Bera Ertan
64812249ad
nix: add bundle subcommand usage 2020-12-12 17:10:55 +03:00
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