e8eb2b3a6c
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
be4d8a7138
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
e04fa48186
Merge branch 'entropy9s/irontyouforgettingsomething' into 'master'
...
Add Iron Ingots
See merge request veloren/veloren!1658
2020-12-23 03:25:50 +00:00
3c1e1c6733
Converts npcs names file to ron
2020-12-23 00:58:25 +01:00
e62c77f452
i am stupid and forgot iron ingots, whoops.
2020-12-22 13:07:23 -08:00
4a8d8c2cf5
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
53d5a9373e
fixing #881
...
- Multiple buffs make the UI icons flicker
2020-12-22 15:40:57 +00:00
3466d638fe
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
9af232c6e9
Merge branch 'entropy9s/BasicIngredients' into 'master'
...
Basic Crafting Ingredients
See merge request veloren/veloren!1609
2020-12-18 20:28:44 +00:00
44ffd74957
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
8f9db19a4a
Glider mid-air deploy and gliding energy-cost
2020-12-18 19:16:06 +01:00
1ace001fde
Fix debug items
2020-12-18 18:11:48 +01:00
ace47766f9
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
5f9984df12
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
6f331e0435
changed sec count to be consistent w/ other foods
2020-12-17 12:43:33 -08:00
5a63366666
Merge branch 'entropy9s/BasicIngredients' of https://gitlab.com/veloren/veloren into entropy9s/BasicIngredients
2020-12-17 12:41:03 -08:00
55c49f88e6
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
8aac030ecd
Fix bad specifier breaking on Windows
2020-12-17 17:22:02 +00:00
d2da8d671f
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
37d6fbc3ce
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
78e9f3de28
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
989683d2d3
Improve world::Index
2020-12-17 12:08:04 +01:00
1c4e334cd4
Apply suggestion
...
- Remove default value for CharacterAbility
- Put back accidentally removed comment
2020-12-17 12:06:32 +01:00
ce9d706ed4
Fix clippy lints
2020-12-17 12:06:28 +01:00
850eb1c293
Update CHANGELOG
2020-12-17 12:06:24 +01:00
7b4aa6d4cc
cargo fmt
2020-12-17 12:06:22 +01:00
d090eefb00
Move the asset module to a single file
2020-12-17 12:06:13 +01:00
0cf164f33a
Use assets_manager to load assets
2020-12-17 12:06:07 +01:00
6ecff460bf
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
60d5d62eef
Switched to hashbrown everywhere
2020-12-17 10:31:35 +01:00
52c37e1de0
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
f12c0de6fc
Merge branch 'xMAC94x/dependencies' into 'master'
...
update specs
See merge request veloren/veloren!1645
2020-12-16 14:20:04 +00:00
ea84cb138f
fix wrong alignment
2020-12-16 15:17:17 +01:00
e8003a44dd
update specs
2020-12-16 14:31:16 +01:00
4196f0adfd
Merge branch 'xMAC94x/dependencies' into 'master'
...
xMAC94x/dependencies
See merge request veloren/veloren!1643
2020-12-16 12:35:20 +00:00
a1b50a86c4
update guillotiere
2020-12-16 10:56:00 +01:00
e3307344ab
get rid of some insecure dependencies
2020-12-16 10:42:36 +01:00
24a840bc6b
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
a365ca7e9d
Merge branch 'slipped/animtweaks' into 'master'
...
accel based run
See merge request veloren/veloren!1628
2020-12-16 08:07:38 +00:00
e7249210f6
accel based run
2020-12-16 08:07:38 +00:00
107fd432f5
update further crates
2020-12-16 08:56:21 +01:00
26918d10c9
update chrossbeam, tracy, prometheus (and reduce server deps to crossbeam-channel)
2020-12-16 00:51:07 +01:00
198b1970a7
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
2b9dee0727
Updated buffer
2020-12-15 16:04:55 +01:00
cff08ac8ae
Delete lib.rs
2020-12-15 16:04:14 +01:00
754b149316
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
5600d93844
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
242ee1d2de
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
494436be01
Hid plugins behind a feature flag to resolve Windows CI issue
2020-12-15 11:14:26 +00:00
56121cea6a
Added memory caching and reallocation prevention
2020-12-15 09:29:57 +01:00
