Sam
da677e8ea6
Abilities can now be referred to by the asset id.
2021-11-10 17:30:19 -05:00
Imbris
ee6b8b6828
Merge branch 'imbris/leak-fix' into 'master'
...
Potential fix for leak when inventory is open
See merge request veloren/veloren!2995
2021-11-10 22:15:25 +00:00
Sam
4309e1ff9b
Did voxygen stuff for ability pool.
2021-11-09 21:20:41 -05:00
Sam
d33ff9f17e
Ability pool updates after switching weapons now.
2021-11-09 19:51:06 -05:00
Sam
a8bec0280c
Ability pool mostly functional.
2021-11-09 12:56:07 -05:00
Imbris
a7e1d3218f
Potential fix for leak when inventory is open
2021-11-09 01:21:45 -05:00
Imbris
38a50d175c
Merge branch 'socksonme/fix_item_drop_texture' into 'master'
...
Temporary fix to the textures of dropped items
See merge request veloren/veloren!2993
2021-11-09 06:12:17 +00:00
Socksonme
0a4df2b158
Temporary fix to the textures of dropped items
2021-11-09 06:12:16 +00:00
Imbris
79afad626b
Merge branch 'socksonme/pushback_require_collider' into 'master'
...
Make the collider component be required for entity pushback
See merge request veloren/veloren!2954
2021-11-09 06:11:07 +00:00
Joshua Barretto
9866befac4
Merge branch 'lilypads' into 'master'
...
Jungles and Rivers update
See merge request veloren/veloren!2978
2021-11-08 22:51:22 +00:00
DemonicOnPc
b7ac542ebb
fixes to branch after my whoops
2021-11-08 17:09:19 -05:00
DemonicOnPc
a9cedee277
Update scatter.rs
2021-11-08 17:09:17 -05:00
DemonicOnPc
7fc57c027b
Fixes to jungle sprites and lillypads
2021-11-08 17:09:15 -05:00
DemonicOnPc
c6dd425203
Update sprite_manifest.ron
2021-11-08 17:09:12 -05:00
DemonicOnPc
9514cd71c6
Jungle and River update
...
-Added Lillypads to rivers
-Added new types of reeds
-Added reeds to water
-Added more Ferns/Flowers/Plants to jungles
2021-11-08 17:09:11 -05:00
Joshua Barretto
6b4abddc4e
Added floating scatter
2021-11-08 17:04:45 -05:00
Samuel Keiffer
7438252560
Merge branch 'increasing_witch_lantern_droprate_' into 'master'
...
Minor edits
See merge request veloren/veloren!2979
2021-11-03 21:27:47 +00:00
Youssef Fahmy
6c52d4ca5e
Minor edits
2021-11-03 21:27:47 +00:00
Joshua Barretto
715ff845a4
Merge branch 'zesterer/site2' into 'master'
...
Added rtsim villagers to site2 towns
See merge request veloren/veloren!2857
2021-11-02 16:50:52 +00:00
Joshua Barretto
8bab7d2cfb
Merge branch 'cherry-pick-a5e64af1' into 'master'
...
Update crate for keyboard-keynames
See merge request veloren/veloren!2982
2021-11-02 09:18:18 +00:00
Jon Nettleton
836c948086
Update crate for keyboard-keynames
...
This revision includes a fix for supporting Aarch64 platforms
Signed-off-by: Jon Nettleton <jon@solid-run.com>
(cherry picked from commit a5e64af19972b555cb3b61396324f6a315285bac)
2021-11-02 08:49:17 +00:00
Joshua Barretto
de087ae992
Added site2 worldgen feature
2021-11-01 22:53:38 +00:00
Joshua Barretto
16889b2b3e
Fixed house supports
2021-11-01 22:19:49 +00:00
Joshua Barretto
9ce057212b
Trading for travelers
2021-11-01 22:19:49 +00:00
Joshua Barretto
0cb88139c9
Made merchants work in new sites
2021-11-01 22:19:49 +00:00
Joshua Barretto
4b8bf94320
Used correct entity configs
2021-11-01 22:19:49 +00:00
Joshua Barretto
4acffb9cfb
New CSG API for site2
2021-11-01 22:19:49 +00:00
Joshua Barretto
e3ab8fc8ce
Added rtsim merchants to site2
2021-11-01 22:19:49 +00:00
Joshua Barretto
bacb2aa504
Better town layout
2021-11-01 22:19:49 +00:00
Joshua Barretto
4a9581b54d
Fixed house entrances
2021-11-01 22:19:49 +00:00
Joshua Barretto
8e2ca9cdec
Added rtsim villagers to site2 towns
2021-11-01 22:19:49 +00:00
Joshua Barretto
80c4e3de19
Merge branch 'tijnvdheuvel/newSFX' into 'master'
...
Merge "Tijnvdheuvel/new sfx" New Truffler & Fungome SFX
See merge request veloren/veloren!2977
2021-11-01 21:15:35 +00:00
Justin Shipsey
08a3a1b1b8
Merge branch 'oolnokk/new_male_dwarf_customization_options' into 'master'
...
Oolnokk/More Dwarf Male Customization Options
See merge request veloren/veloren!2980
2021-11-01 04:40:54 +00:00
Oolnokk
b6f137bb7a
Changes to formatting
2021-10-31 23:49:46 -04:00
Oolnokk
3618a0e5f5
Changes to formatting
2021-10-31 23:44:29 -04:00
Oolnokk
b67558c1ba
2 new beards, four new hairstyles and 1 new eye option for dwarf males
2021-10-31 22:58:25 -04:00
Samuel Keiffer
e692f49463
Merge branch 'sam/potion-tweaks' into 'master'
...
Potion tweaks
See merge request veloren/veloren!2976
2021-10-31 21:12:08 +00:00
Sam
560f73d296
Addressed review feedback.
2021-10-31 16:39:47 -04:00
Samuel Keiffer
be64c3687e
Merge branch 'slipped/tweaks' into 'master'
...
hats
See merge request veloren/veloren!2966
2021-10-31 05:35:11 +00:00
jshipsey
913a2725e8
changelog
2021-10-31 01:19:21 -04:00
jshipsey
b1e9d9664b
adjust models, last fixes
2021-10-30 23:42:18 -04:00
Justin Shipsey
beefdfe840
Delete frame-trace_1635388024283.json
2021-10-30 23:42:17 -04:00
jshipsey
f69e3c9fbc
more hats
2021-10-30 23:42:17 -04:00
jshipsey
c2b7d3bb44
good hat rendering
2021-10-30 23:42:16 -04:00
jshipsey
a05c1ea4c5
switch to new matcell variant
2021-10-30 23:42:15 -04:00
jshipsey
97a3c1e713
simple hats
2021-10-30 23:42:15 -04:00
jshipsey
3915aa7aac
support for hollow voxels ty zesterer
2021-10-30 23:42:14 -04:00
jshipsey
5cc54b34bd
headbands
2021-10-30 23:42:13 -04:00
Justin Shipsey
85abea5814
Merge branch 'evelyntsmg/more_gliders' into 'master'
...
Add new gliders
See merge request veloren/veloren!2785
2021-10-30 20:48:04 +00:00
Evelyn
91477f7a5c
Add new gliders
2021-10-30 20:48:04 +00:00
