Marcel
276e408786
Merge branch 'aweinstock/validate-char-create' into 'master'
...
Validate starting item and body type server-side.
See merge request veloren/veloren!1869
2021-03-10 01:42:42 +00:00
Marcel
0e5f63735b
Merge branch 'ccgauche/move-back-register-to-system' into 'master'
...
Moved back register to a system
See merge request veloren/veloren!1868
2021-03-10 00:56:33 +00:00
Avi Weinstock
ad31b40aea
Validate starting item and body type server-side.
2021-03-09 18:28:25 -05:00
ccgauche
734891738f
Moved back register to a system
2021-03-09 21:16:23 +01:00
Marcel Märtens
51cf530877
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 20:17:29 +01:00
Marcel Märtens
1fd0e15e29
get rid of a lazy_static and update agent multithreaded metrics
2021-03-09 11:52:57 +01:00
Marcel Märtens
c0129b0505
Move Specs code to own common_ecs create, put tracy and macros into common_base
2021-03-09 00:54:01 +01:00
Marcel Märtens
7c3d5d04ba
change Name from VSystem to System
2021-03-08 13:15:00 +01:00
Marcel Märtens
e527d443f4
update state to system name. This will break grafana boards and thus needs an adjustment
2021-03-08 11:51:18 +01:00
Marcel Märtens
1876db56ae
switch server to the new Registry struct, this gets rid of RegistryFn pattern and simplyfies stuff, its a result of the Prometheus-tracy crate
2021-03-08 11:51:16 +01:00
Marcel Märtens
7a47c6e19f
restructure server metrics
...
- get rid of old SysTimers for each system in favour of VSystem tracking
- move metrics generation from lib.rs to own system
- code cleanup
- remove time tracking in common::sys
2021-03-08 11:51:13 +01:00
Marcel Märtens
77aa787b94
Implement a VSystem trait that can be implemented by Systems.
...
It will autodo some things, like track start and time and export those in system metrics
Add a origin and implement it for all Systems in Veloren
2021-03-08 11:51:04 +01:00
ccgauche
801a4a9f0f
First commit
2021-03-07 22:32:52 +01:00
Avi Weinstock
c5a959a60b
Make the probabilities data to assert that the expected value is less than 1.
2021-03-06 15:11:19 -05:00
Avi Weinstock
83870aae43
Make fireworks recursively shoot more fireworks (95% average replication).
2021-03-06 14:05:51 -05:00
Avi Weinstock
61c9ff90e4
Increase MAX_CHASE_DIST from 20 to 250, so enemies don't ignore you if you're fireballing them from a hallway.
2021-03-06 10:50:04 -05:00
ccgauche
aa0373ba0e
Fixed tracy
2021-03-05 19:02:33 +01:00
Joshua Yanovski
e7cd5fedf4
Bring vek up to date so we can bump rustc (hopefully).
2021-03-04 05:46:59 +01: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
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
b1aac8921f
Initial behavior tree refactoring
2021-03-02 15:49:58 -08:00
Snowram
fdf9fcc06f
Fixes leather sets
2021-03-02 19:28:29 +01:00
ccgauche
2bb54137a0
Merge branch 'master' into 'ccgauche/plugin-player-join-event'
...
# Conflicts:
# CHANGELOG.md
2021-03-02 09:45:15 +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
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
Jesus Bracho
6b1ba22d1f
Implement stacking and splitting
2021-03-02 00:08:46 +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
ccgauche
43dfefe367
Separated the registration system into two files
2021-03-01 22:35:22 +01:00
ccgauche
32b16d71ce
Adressed all comments
2021-03-01 22:24:02 +01:00
ccgauche
cc06cbce83
Fixed comments
2021-03-01 21:29:18 +01:00
ccgauche
612a507bc6
Updated CI + Changelog
2021-03-01 19:28:27 +01:00
ccgauche
927b2868ec
Lots of improvement in pointer management (switched from i32 to u64) + New event implemented
2021-03-01 19:00:44 +01:00
Samuel Keiffer
c06e36fe6b
Merge branch 'sam/invulnerability-buff' into 'master'
...
Invulnerability Buff
Closes #965
See merge request veloren/veloren!1834
2021-03-01 05:46:46 +00:00
Sam
0ec709bf17
Migration for armor re-organization.
2021-03-01 00:42:35 -05:00
jshipsey
f4a10912b0
more asset organization
2021-02-28 22:18:43 -05:00
Samuel Keiffer
a2c19cd047
Merge branch 'aweinstock/trade-requestitem' into 'master'
...
During a trade, allow requesting items from the counterparty's inventory...
See merge request veloren/veloren!1829
2021-03-01 02:39:36 +00:00
Sam
884e74cab8
Added command: '/safezone'
2021-02-28 18:14:59 -05:00
Sam
e582c2bdc6
Added invulnerability debuff. Currently tied to campfire spawned with '/campfire' command.
2021-02-28 15:02:03 -05:00
Avi Weinstock
1831efd8e4
During a trade, allow requesting items from the counterparty's inventory (prequisite for NPC trading).
2021-02-28 10:13:49 -05:00
Sam
fbba22ac2f
Made changes to fix torvus
2021-02-27 22:42:11 -05:00
Sam
2aa332b5e2
Combo melee now checks combo
2021-02-27 18:24:28 -05:00
Sam
8003b5d570
Added combo component
2021-02-27 14:55:06 -05:00
jshipsey
8efc53fcef
feedback adjustments
2021-02-27 01:42:47 -05:00
