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

6315 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Entropy
b8394009f3 changed sec count to be consistent w/ other foods 2020-12-17 12:43:33 -08:00
Entropy
76da70bc3e Merge branch 'entropy9s/BasicIngredients' of https://gitlab.com/veloren/veloren into entropy9s/BasicIngredients 2020-12-17 12:41:03 -08:00
Ben Wallis
cc6a9f65a2 Merge branch 'a1phyr/fix_windows_build' into 'master' 
Fix bad specifier breaking on Windows

See merge request veloren/veloren!1648
 2020-12-17 18:33:18 +00:00
Benoît du Garreau
f983f9e915 Fix bad specifier breaking on Windows 2020-12-17 17:22:02 +00:00
Marcel
7d1eb4604b Merge branch 'a1phyr/use_assets_manager' into 'master' 
Use `assets_manager` to load assets

See merge request veloren/veloren!1624
 2020-12-17 12:25:29 +00:00
Marcel
7d68c415fd Merge branch 'entropicdrifter/refactor-attacker-name' into 'master' 
Create and use get_attacker_name method

See merge request veloren/veloren!1529
 2020-12-17 11:53:36 +00:00
Marcel
05519ee293 Merge branch 'test_util' into 'master' 
Add simple tests to utils description functions

See merge request veloren/veloren!1526
 2020-12-17 11:20:19 +00:00
Benoît du Garreau
2c94b05e99 Improve world::Index 2020-12-17 12:08:04 +01:00
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