e724ac072e
Merge branch 'sarrakitty/fireworks' into 'master'
...
made firework explosions colorful
See merge request veloren/veloren!1851
2021-03-05 17:48:56 +00:00
726cfcb8c9
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
e2d4799f7d
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
6e66cecce7
Split the french translation into multiple files
2021-03-05 12:23:08 +00:00
4284ce0411
made firework explosions colorful
2021-03-05 01:22:29 -05:00
cb305536e8
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
fb953cc7f4
implement the new skilltree icons
2021-03-04 18:37:32 +00:00
875bdd8d71
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
a68afa1fad
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
7146ff2676
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
a1405f7ec6
Merge branch 'Rotsuoy/SavannaGrass' into 'master'
...
Rotsuoy/SavannaGrassUpdate
See merge request veloren/veloren!1725
2021-03-04 10:32:58 +00:00
2dd7089e52
Bring vek up to date so we can bump rustc (hopefully).
2021-03-04 05:46:59 +01:00
0472956b5c
Allow using stack splitting into or out of a trade.
2021-03-03 18:19:10 -05:00
39a580b5ee
Added test that all items are properly formatted and valid. Fixed items that were broken.
2021-03-03 16:45:36 -05:00
dd2097ac75
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
ae856edb31
Fixed debug back armor. Removed leather_3 item.
2021-03-03 15:05:51 -05:00
ef1ee4c4fa
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
c681992367
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
eb4ce49937
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
a55ec20c74
fix #46 🥳
2021-03-03 12:37:09 +01:00
9028578bc8
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
f9fc015680
Address comments
2021-03-02 19:55:28 -08:00
018d51b1a0
Move agent data into structs
2021-03-02 15:51:43 -08:00
0c25896b2c
Fix fleeing and combat a little
2021-03-02 15:51:40 -08:00
29c5ae5af9
Fix interaction and clean up, broken fleeing
2021-03-02 15:51:38 -08:00
045ec011c9
Behavior tree minus interacting
2021-03-02 15:51:32 -08:00
8bdadc47b5
Initial behavior tree refactoring
2021-03-02 15:49:58 -08:00
c9a656908d
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
f4278840c6
Fixes light offset for objects
2021-03-02 19:28:33 +01:00
2b7b9f887b
Fixes leather sets
2021-03-02 19:28:29 +01:00
a96ae2b2e1
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
bece2cfc76
Reduced unsafe
2021-03-02 17:41:28 +01:00
6dffd1a9e2
Added a Global State API in plugins
2021-03-02 17:15:19 +01:00
c74cdaeb65
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
0f969f6e59
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
f75f36a2c5
update cloth item tag to fix panic during crafting
2021-03-02 10:31:21 +00:00
356f09d780
Update CHANGELOG.md
2021-03-02 09:46:08 +00:00
7f4411ba1f
Merge branch 'master' into 'ccgauche/plugin-player-join-event'
...
# Conflicts:
# CHANGELOG.md
2021-03-02 09:45:15 +00:00
23dd98bf42
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
55b980a57c
Migration for missed backpacks
2021-03-01 23:27:20 -05:00
f16c137635
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
1f48e9833f
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
3a88ab5bb3
Migration to fix sturdy red backpack
2021-03-01 21:37:14 -05:00
d02c61ad8a
Item use is now goes through a control action rather than a control event.
2021-03-01 20:51:08 -05:00
9ad8804b60
Merge branch 'armor-org' into 'master'
...
armor org
See merge request veloren/veloren!1835
2021-03-02 01:29:46 +00:00
0f7ff21c20
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
c0573cca44
Implement stacking and splitting
2021-03-02 00:08:46 +00:00
4da91f7f4e
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
308045cfc9
final asset corrections, fix glider anim
2021-03-01 17:37:47 -05:00
e327b18c4a
Fixed clippy warning
2021-03-01 22:44:18 +01:00
