Imbris
e583afbdaf
Merge branch 'sarrakitty/fireworks' into 'master'
...
made firework explosions colorful
See merge request veloren/veloren!1851
2021-03-05 17:48:56 +00:00
Imbris
9caef83915
Merge branch 'cargo-override' into 'master'
...
Cargo.nix override instead of requiring manual intervention
See merge request veloren/veloren!1647
2021-03-05 17:04:29 +00:00
Snowram
d243f12b20
Merge branch 'vfoulon80/convert-fr-translations' into 'master'
...
Split the french translation into multiple files
See merge request veloren/veloren!1672
2021-03-05 12:23:08 +00:00
Vincent Foulon
503f44f0c2
Split the french translation into multiple files
2021-03-05 12:23:08 +00:00
Sarra
df78d4654a
made firework explosions colorful
2021-03-05 01:22:29 -05:00
Marcel
a7ecd8e180
Merge branch 'vfoulon80/skilltree-icons' into 'master'
...
implement the new skilltree icons
See merge request veloren/veloren!1794
2021-03-04 18:37:33 +00:00
Vincent Foulon
4b23a3b307
implement the new skilltree icons
2021-03-04 18:37:32 +00:00
Marcel
7b0734ad91
Merge branch 'sam/asset-validation-tests' into 'master'
...
Added Item Validation Test
See merge request veloren/veloren!1849
2021-03-04 15:46:12 +00:00
Marcel
faeacb8ce2
Merge branch 'aweinstock/stack-trading' into 'master'
...
Allow using stack splitting into or out of a trade.
See merge request veloren/veloren!1850
2021-03-04 14:34:05 +00:00
Joshua Yanovski
674ff96096
Merge branch 'sharp/bump-vek' into 'master'
...
Bring vek up to date so we can bump rustc (hopefully).
See merge request veloren/veloren!1848
2021-03-04 12:56:05 +00:00
Marcel
d2cc47258b
Merge branch 'Rotsuoy/SavannaGrass' into 'master'
...
Rotsuoy/SavannaGrassUpdate
See merge request veloren/veloren!1725
2021-03-04 10:32:58 +00:00
Joshua Yanovski
e7cd5fedf4
Bring vek up to date so we can bump rustc (hopefully).
2021-03-04 05:46:59 +01:00
Avi Weinstock
33bed4a2ad
Allow using stack splitting into or out of a trade.
2021-03-03 18:19:10 -05:00
Sam
7e8556406d
Added test that all items are properly formatted and valid. Fixed items that were broken.
2021-03-03 16:45:36 -05:00
Samuel Keiffer
d57f2d7e32
Merge branch 'armor-org-fix-3' into 'master'
...
Fixed debug back armor. Removed leather_3 item.
See merge request veloren/veloren!1847
2021-03-03 20:13:39 +00:00
Sam
eaa240fdc0
Fixed debug back armor. Removed leather_3 item.
2021-03-03 15:05:51 -05:00
Marcel
e9f2c024ec
Merge branch 'xMAC94x/mpsc' into 'master'
...
Change the way Network is dropped.
Closes #46
See merge request veloren/veloren!1846
2021-03-03 15:19:44 +00:00
Marcel Märtens
0d44b14c4f
Changelog:
...
-Savanna grasses now only spawn in the savanna and no longer bleed into desert and temperate biomes
-Cacti now only spawn in the desert and density of large cacti has decreased
-Dead bushes are largely unchanged and still spawn in both the savanna and desert with some bleed into temperate biomes
2021-03-03 15:06:34 +01:00
Joshua Barretto
9e8576610f
Merge branch 'james/behavior-tree' into 'master'
...
Transitions agent system from a FSM to a behavior tree
See merge request veloren/veloren!1801
2021-03-03 13:48:25 +00:00
Marcel Märtens
d7a4bae537
fix #46 🥳
2021-03-03 12:37:09 +01:00
Marcel Märtens
0f591dfcdd
Change the way Network is dropped.
...
Instead of keeping Runtime and manually spawn a task on `drop` this task is spawned at start and will wait to be triggered.
The `drop` methods then wait for completion, UNLESS they are in a async context, then they MUST NOT BLOCK (deadlock potential), so they defer it to the Runtime and HOPE for the runtime to exist long enough.
This get rid of the weird `block_in_place` which is only accessable with `rt-multi-threaded` and has some disadvantages.
We also wont requiere the runtime to be active all the time. Though its needed for a clean shutdown
2021-03-03 11:28:40 +01:00
James Melkonian
bf466bff87
Address comments
2021-03-02 19:55:28 -08:00
James Melkonian
84193ebbf5
Move agent data into structs
2021-03-02 15:51:43 -08:00
James Melkonian
17dd5a22aa
Fix fleeing and combat a little
2021-03-02 15:51:40 -08:00
James Melkonian
ba4cb9636d
Fix interaction and clean up, broken fleeing
2021-03-02 15:51:38 -08:00
James Melkonian
b234c45cf8
Behavior tree minus interacting
2021-03-02 15:51:32 -08:00
James Melkonian
b1aac8921f
Initial behavior tree refactoring
2021-03-02 15:49:58 -08:00
Samuel Keiffer
aa552097d9
Merge branch 'snowram/fix-leatherset-objectlights' into 'master'
...
Snowram/fix leatherset objectlights
See merge request veloren/veloren!1844
2021-03-02 20:25:18 +00:00
Snowram
8b6688581a
Fixes light offset for objects
2021-03-02 19:28:33 +01:00
Snowram
fdf9fcc06f
Fixes leather sets
2021-03-02 19:28:29 +01:00
Joshua Barretto
d3d757b59f
Merge branch 'ccgauche/plugin-states' into 'master'
...
Added a Global State API in plugins
See merge request veloren/veloren!1843
2021-03-02 18:26:13 +00:00
ccgauche
a0d2fffc90
Reduced unsafe
2021-03-02 17:41:28 +01:00
ccgauche
b43afd4920
Added a Global State API in plugins
2021-03-02 17:15:19 +01:00
Justin Shipsey
258d2e27ad
Merge branch 'tadabito/fix-crafting-panic' into 'master'
...
update cloth item tag to fix panic during crafting
See merge request veloren/veloren!1842
2021-03-02 14:41:17 +00:00
Joshua Barretto
1370bc4cf1
Merge branch 'ccgauche/plugin-player-join-event' into 'master'
...
Lots of improvement in pointer management (switched from i32 to u64) + New event implemented
See merge request veloren/veloren!1837
2021-03-02 12:47:52 +00:00
Tadabito
d97a65d3af
update cloth item tag to fix panic during crafting
2021-03-02 10:31:21 +00:00
ccgauche
384e731bd0
Update CHANGELOG.md
2021-03-02 09:46:08 +00:00
ccgauche
2bb54137a0
Merge branch 'master' into 'ccgauche/plugin-player-join-event'
...
# Conflicts:
# CHANGELOG.md
2021-03-02 09:45:15 +00:00
Samuel Keiffer
d6addc776c
Merge branch 'armor-org-fix-2' into 'master'
...
Migration for missed backpacks
See merge request veloren/veloren!1841
2021-03-02 04:27:44 +00:00
Sam
e4cc802d6c
Migration for missed backpacks
2021-03-01 23:27:20 -05:00
Samuel Keiffer
35bdeebb58
Merge branch 'sam/item-use-as-action' into 'master'
...
Item use is now goes through a control action rather than a control event.
Closes #979
See merge request veloren/veloren!1839
2021-03-02 03:25:55 +00:00
Samuel Keiffer
8a2b87c71b
Merge branch 'armor-org-fix-1' into 'master'
...
Migration to fix sturdy red backpack
See merge request veloren/veloren!1840
2021-03-02 02:48:34 +00:00
Sam
9c788e2e3f
Migration to fix sturdy red backpack
2021-03-01 21:37:14 -05:00
Sam
06ecf398db
Item use is now goes through a control action rather than a control event.
2021-03-01 20:51:08 -05:00
Justin Shipsey
c9e8302cda
Merge branch 'armor-org' into 'master'
...
armor org
See merge request veloren/veloren!1835
2021-03-02 01:29:46 +00:00
Ben Wallis
026188f7e2
Merge branch 'item-stacking-and-splitting' into 'master'
...
Implement stacking and splitting
Closes #904
See merge request veloren/veloren!1802
2021-03-02 00:08:47 +00:00
Jesus Bracho
6b1ba22d1f
Implement stacking and splitting
2021-03-02 00:08:46 +00:00
Samuel Keiffer
f80fef110f
Merge branch 'heydabop/974-equip-time-float' into 'master'
...
Fixes #974 - convert tool/weapon equip time to floating point seconds
Closes #974
See merge request veloren/veloren!1838
2021-03-01 23:24:48 +00:00
jshipsey
8a82e1aa37
final asset corrections, fix glider anim
2021-03-01 17:37:47 -05:00
ccgauche
ad492d2343
Fixed clippy warning
2021-03-01 22:44:18 +01:00
