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

6183 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Acrimon
d99750f746
update authc 2020-12-28 16:42:40 +01:00
Ben Wallis
6adac970ef Merge branch 'master' into 'master' 
Update pt_BR.ron 

See merge request veloren/veloren!1664
 2020-12-27 00:09:13 +00:00
Nícolas Wildner
f59a92ab7c Update pt_BR.ron 2020-12-27 00:09:12 +00:00
Monty Marz
c1d243dd3b Merge branch 'glider' into 'master' 
Adding new glider variants

See merge request veloren/veloren!1660
 2020-12-24 02:54:18 +00:00
Sarra Kitty
81f656ba81 new gliders 
added sandraptor glider

added sandraptor glider

stuff

working on other raptor gliders

adding file and placeholder model (copy of morpho) for monarch butterfly gliders

adding models for snow and wood raptor gliders

added a proper model for the monarch glider

adding crafting recipies for raptor gliders, and raptor feather item for the recipe. Made monarch and morpho rare drops in cave loot table

made raptors drop their feathers

fmt
 2020-12-24 02:54:18 +00:00
Justin Shipsey
25f09921e0 Merge branch 'snowram/npcs-names-json-to-ron' into 'master' 
Converts npcs names file to ron

See merge request veloren/veloren!1659
 2020-12-23 07:43:57 +00:00
Monty Marz
5daf8fa98d Merge branch 'entropy9s/irontyouforgettingsomething' into 'master' 
Add Iron Ingots

See merge request veloren/veloren!1658
 2020-12-23 03:25:50 +00:00
unknown
9405a7f6a5 Converts npcs names file to ron 2020-12-23 00:58:25 +01:00
Entropy
43d172a61b i am stupid and forgot iron ingots, whoops. 2020-12-22 13:07:23 -08:00
Joshua Barretto
a0f71f9070 Merge branch 'Frinksy/fix-buff-flickering' into 'master' 
fixing #881 - Buff UI flickering

Closes #881

See merge request veloren/veloren!1654
 2020-12-22 15:40:57 +00:00
Frinksy
fd554827a0 fixing #881 
- Multiple buffs make the UI icons flicker
 2020-12-22 15:40:57 +00:00
Justin Shipsey
0df66ff6d0 Merge branch 'gliding-energy-cost' into 'master' 
Glider mid-air deploy and gliding energy-cost

See merge request veloren/veloren!1626
 2020-12-18 21:18:32 +00:00
Justin Shipsey
e7a885df4d Merge branch 'entropy9s/BasicIngredients' into 'master' 
Basic Crafting Ingredients

See merge request veloren/veloren!1609
 2020-12-18 20:28:44 +00:00
Ben Wallis
e2366e1ce9 Merge branch 'a1phyr/fix_debug_items' into 'master' 
Fix debug command

See merge request veloren/veloren!1650
 2020-12-18 19:15:09 +00:00
Ludvig Böklin
ec35d5d75e Glider mid-air deploy and gliding energy-cost 2020-12-18 19:16:06 +01:00
Benoît du Garreau
c7c1d87a6e Fix debug items 2020-12-18 18:11:48 +01:00
Imbris
ebb9cd24d1 Merge branch 'Frinksy/scancodes' into 'master' 
Working towards #861 - Use scancodes for (at minimum) key remapping

See merge request veloren/veloren!1642
 2020-12-18 10:33:57 +00:00
Adam Blanchet
e3b9de37fb working towards #861 - 
Use scancodes for (at minimum) key remapping

added ScanCode fallback for when winit doesn't provide a VirtualKeyCode

renamed SKey to ScanKey
 2020-12-18 10:01:30 +01:00
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