Commit Graph

6107 Commits

Author SHA1 Message Date
ccgauche
6ca24828bc added unsafe on function 2020-12-14 17:43:32 +01:00
ccgauche
e66e736de2 Fixed memory issue now using alloc 2020-12-14 17:07:05 +01:00
Joshua Barretto
a8c469c9bf Merge branch 'plugins' into 'master'
Plugins and codebase refactor

See merge request veloren/veloren!1625
2020-12-14 00:53:09 +00:00
Samuel Keiffer
7f7fc3a757 Merge branch 'nahua/replace_sceptre_m2_sound' into 'master'
Issue 872: Replace explosion sound with heal bomb sound for sceptre M2

See merge request veloren/veloren!1618
2020-12-13 23:18:30 +00:00
Joshua Barretto
d3eaa73c26 Moved plugin API to Uid instead of usize for entity IDs, hello plugin to an example 2020-12-13 23:08:15 +00:00
Marcel
a6471d25c8 Merge branch 'yusdacra/fix-nix-veloren-version-string' into 'master'
More Nix fixes, better Nix README among other UX

See merge request veloren/veloren!1614
2020-12-13 22:13:46 +00:00
nahuakang
ef5efa738c Replace explosion sound with heal bomb sound for sceptre M2 2020-12-13 22:09:28 +01:00
Joshua Barretto
5b0e0e6f4c Updated changelog, fmt and clippy fixes 2020-12-13 17:40:15 +00:00
Joshua Barretto
ae8d65d2d9 Temporarily reverted toolchain for CI 2020-12-13 17:27:48 +00:00
Joshua Barretto
e5100040b4 Moved common networking code to common/net, clippy fixes 2020-12-13 17:23:45 +00:00
Joshua Barretto
7e3720e408 Moved common networking code to common/net, clippy fixes 2020-12-13 17:16:39 +00:00
Joshua Barretto
6539ceb5f4 Added .tar to LFS extensions 2020-12-13 17:15:33 +00:00
Joshua Barretto
1ffd18d093 Resolved plugin dependency cycle, allowing more interesting plugin API 2020-12-13 17:15:33 +00:00
Joshua Barretto
faa7c1c119 Better plugin API 2020-12-13 17:15:33 +00:00
ccgauche
3a7d19f60e Added parallelism to event execution using rayon 2020-12-13 17:15:33 +00:00
ccgauche
7c15621b32 Added plugin command support 2020-12-13 17:15:33 +00:00
Joshua Barretto
29aea4e818 Force type-correct hooks, renamed proc macro 2020-12-13 17:15:33 +00:00
Joshua Barretto
01efed677b Reorganised plugin crates 2020-12-13 17:15:32 +00:00
ccgauche
b501821006 Removed unsafe unsage in favour of unwrap_or and get 2020-12-13 17:15:03 +00:00
ccgauche
c2bc112e44 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
3a5386e047 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
cb19252226 Began work on plugin API and plugin loading 2020-12-13 17:13:57 +00:00
Yusuf Bera Ertan
9545b65e5f
nix: workaround an issue with crate2nix, change some errors to be more clear 2020-12-12 21:14:29 +03:00
Yusuf Bera Ertan
834d009f2e
nix: better instructions for nixGL 2020-12-12 17:53:48 +03:00
Yusuf Bera Ertan
f6c47d89d9
nix: add missing dependency xcb 2020-12-12 17:26:02 +03:00
Yusuf Bera Ertan
02fa679dc2
nix: regenerate Cargo.nix 2020-12-12 17:11:51 +03:00
Yusuf Bera Ertan
124bf069c8
nix: add bundle subcommand usage 2020-12-12 17:10:55 +03:00
Yusuf Bera Ertan
8ccf5b3012
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
d4e6928aa6
nix: refactor crateDeps in common to look better 2020-12-12 17:10:54 +03:00
Yusuf Bera Ertan
354aa53ef4
nix: remove version from package names 2020-12-12 17:10:54 +03:00
Yusuf Bera Ertan
2f995af47f
nix: fix veloren version string in game, remove obsolete utils 2020-12-12 17:10:54 +03:00
Marcel
0eea9de5a1 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
118abb9bd4 move tools and chat-cli in src/bin and examples 2020-12-12 02:12:00 +01:00
Marcel
e1427286d3 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
451dee10e9 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
cb60473858 Loading screen tip for campfire healing 2020-12-12 00:29:57 +00:00
Marcel
66af498adc 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
87abadd384 Updated de_DE translation
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
2020-12-11 23:51:00 +00:00
Marcel
144264813a 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
e029a14568 Update French Translation 2020-12-11 23:29:44 +00:00
Marcel Märtens
6257961664 it seems like that the TAGUUID must start with a Alphabetic char 2020-12-12 00:20:57 +01:00
Marcel
2afd8f6ffa 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
bf59be6f2e 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
12cfdee5ee 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
0e19b48a48 fix sql injection 2020-12-11 19:09:11 +01:00
Joshua Barretto
89d8d112df Prevented towns destroying trees, rocks, other towns, etc. 2020-12-11 16:53:21 +01:00
Marcel Märtens
cc062ffaea get rid of insecure dependency completly 2020-12-11 16:13:57 +01:00
Marcel
97e0378bb4 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
b9c23d7d21 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
0f81d78c0d 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