Benoît du Garreau
|
60ba9d5b87
|
Apply suggestion
- Remove default value for CharacterAbility
- Put back accidentally removed comment
|
2020-12-17 12:06:32 +01:00 |
|
Benoît du Garreau
|
780be6787d
|
Fix clippy lints
|
2020-12-17 12:06:28 +01:00 |
|
Benoît du Garreau
|
bd962ce2ab
|
Update CHANGELOG
|
2020-12-17 12:06:24 +01:00 |
|
Benoît du Garreau
|
3052ba5f65
|
cargo fmt
|
2020-12-17 12:06:22 +01:00 |
|
Benoît du Garreau
|
8bc4b887a8
|
Move the asset module to a single file
|
2020-12-17 12:06:13 +01:00 |
|
Benoît du Garreau
|
db18cc1770
|
Use assets_manager to load assets
|
2020-12-17 12:06:07 +01:00 |
|
Marcel
|
7ae0b813ff
|
Merge branch 'james/hashbrown' into 'master'
Switch from std to hashbrown
See merge request veloren/veloren!1621
|
2020-12-17 10:55:13 +00:00 |
|
jiminycrick
|
26239394be
|
Switched to hashbrown everywhere
|
2020-12-17 10:31:35 +01:00 |
|
Marcel
|
69f03250a1
|
Merge branch 'yusdacra/update-cargonix' into 'master'
nix chore: regenerate Cargo.nix
See merge request veloren/veloren!1629
|
2020-12-17 07:57:37 +00:00 |
|
Marcel
|
f5adde38f2
|
Merge branch 'xMAC94x/dependencies' into 'master'
update specs
See merge request veloren/veloren!1645
|
2020-12-16 14:20:04 +00:00 |
|
Marcel Märtens
|
100e858d79
|
fix wrong alignment
|
2020-12-16 15:17:17 +01:00 |
|
Marcel Märtens
|
04b71f9dc8
|
update specs
|
2020-12-16 14:31:16 +01:00 |
|
Marcel
|
c55541a557
|
Merge branch 'xMAC94x/dependencies' into 'master'
xMAC94x/dependencies
See merge request veloren/veloren!1643
|
2020-12-16 12:35:20 +00:00 |
|
Marcel Märtens
|
1f2f9905a3
|
update guillotiere
|
2020-12-16 10:56:00 +01:00 |
|
Marcel Märtens
|
075933d60b
|
get rid of some insecure dependencies
|
2020-12-16 10:42:36 +01:00 |
|
Marcel
|
91ad5657a5
|
Merge branch 'xMAC94x/dependencies' into 'master'
update chrossbeam, tracy, prometheus (and reduce server deps to crossbeam-channel)
See merge request veloren/veloren!1641
|
2020-12-16 09:33:34 +00:00 |
|
Justin Shipsey
|
3e635c8af7
|
Merge branch 'slipped/animtweaks' into 'master'
accel based run
See merge request veloren/veloren!1628
|
2020-12-16 08:07:38 +00:00 |
|
Justin Shipsey
|
0d98896df8
|
accel based run
|
2020-12-16 08:07:38 +00:00 |
|
Marcel Märtens
|
1ea395a47f
|
update further crates
|
2020-12-16 08:56:21 +01:00 |
|
Marcel Märtens
|
bcb4c075ed
|
update chrossbeam, tracy, prometheus (and reduce server deps to crossbeam-channel)
|
2020-12-16 00:51:07 +01:00 |
|
Joshua Barretto
|
7b4b191f21
|
Merge branch 'ccgauche/fix-memory-overwrite' into 'master'
ccgauche/fix memory overwrite
See merge request veloren/veloren!1631
|
2020-12-15 17:09:17 +00:00 |
|
ccgauche
|
8b6d94fef0
|
Updated buffer
|
2020-12-15 16:04:55 +01:00 |
|
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 veloren/veloren!1634
|
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 veloren/veloren!1637
|
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 veloren/veloren!1639
|
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 veloren/veloren!1635
|
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 #885
See merge request veloren/veloren!1633
|
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 veloren/veloren!1632
|
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 veloren/veloren!1627
|
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 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 |
|