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,235 Commits 151 Branches 18 Tags
8661cb1ffc
Commit Graph

6235 Commits

Author SHA1 Message Date
ccgauche
12da49ccd9 Delete lib.rs 2020-12-15 16:04:14 +01:00
Marcel
fedfb50ace Merge branch 'HiggsTardigradeTau/fix-slow-motion-effect-after-lag' into 'master' 
Fixed slow motion effect after lag

See merge request
2020-12-15 14:31:05 +00:00
Marcel
1b3361c842 Merge branch 'james/healbomb-sfx-fix' into 'master' 
Healing bomb sfx fix

See merge request
2020-12-15 13:15:32 +00:00
Joshua Barretto
d5b017ceae Merge branch 'plugins' into 'master' 
Hide plugins behind a feature flag to resolve Windows CI issue

See merge request
2020-12-15 12:51:56 +00:00
Joshua Barretto
52a6717996 Hid plugins behind a feature flag to resolve Windows CI issue 2020-12-15 11:14:26 +00:00
ccgauche
e605c68cc1 Added memory caching and reallocation prevention 2020-12-15 09:29:57 +01:00
jiminycrick
ee281ecad0 Healing bomb sfx fix 2020-12-14 21:36:51 -08:00
Monty Marz
9b6dfad315 Merge branch 'hotifx' into 'master' 
Hotfix NPC inviting

See merge request
2020-12-15 02:14:37 +00:00
Monty
46bf4020d1 hotfix NPC inviting 2020-12-15 01:43:44 +01:00
Owen McCormick
ad8c41eabb Fixed slow motion effect after lag 2020-12-14 16:05:42 -08:00
Monty Marz
a9b2d6c5bb Merge branch 'pfau/group-map-indicators' into 'master' 
Group map indicators

Closes 

See merge request
2020-12-14 23:00:58 +00:00
Monty
0a9aed3d11 cleanup, changelog, small bugfixes 
fmt
fix rebase
fmt
 2020-12-14 21:52:24 +01:00
ccgauche
242e9a4ca8 Updated to zesterer suggestion 2020-12-14 21:48:37 +01:00
Monty Marz
23a808f721 group member indicator visuals 
functional group member indicators
adjust visuals
z-comparison
 2020-12-14 21:16:13 +01:00
Joshua Barretto
2f1ce07f5a Merge branch 'zesterer/gfx' into 'master' 
Made LoD water reflective

See merge request
2020-12-14 18:49:59 +00:00
Snowram
f08a9545d9 Merge branch 'snowram/objects-offsets-ron' into 'master' 
Put objects offsets into a .ron file

See merge request
2020-12-14 18:00:07 +00:00
ccgauche
3384c08990 Runned FMT 2020-12-14 18:46:04 +01:00
ccgauche
ac743dfef9 Fixed clippy warnings 2020-12-14 18:31:01 +01:00
ccgauche
27f7e00bbf added safety section 2020-12-14 18:22:03 +01:00
Joshua Barretto
1b88f1d9dc Made LoD water reflective 2020-12-14 16:52:33 +00:00
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
Yusuf Bera Ertan
f9617740cc
nix chore: regenerate Cargo.nix 2020-12-14 18:13:01 +03:00
Snowram
577447df76 Puts objects offsets into a .ron file 2020-12-14 02:43:49 +01:00
Joshua Barretto
a8c469c9bf Merge branch 'plugins' into 'master' 
Plugins and codebase refactor

See merge request
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
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
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