Marcel Märtens
d7df741671
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 20:17:29 +01:00
Marcel
f6028f4ae3
Merge branch 'xMAC94x/metrics_fixes' into 'master'
...
get rid of a lazy_static and update agent multithreaded metrics
See merge request veloren/veloren!1865
2021-03-09 12:59:00 +00:00
Marcel
d229ab1eb9
Merge branch 'aweinstock/critical-stats' into 'master'
...
Add critical chance and critical multiplier stats to weapons.
See merge request veloren/veloren!1864
2021-03-09 10:55:36 +00:00
Marcel Märtens
77dea4980c
get rid of a lazy_static and update agent multithreaded metrics
2021-03-09 11:52:57 +01:00
Avi Weinstock
d8f0a1c426
Add critical chance and critical multiplier stats to weapons.
2021-03-08 23:27:25 -05:00
Marcel Märtens
4ebfbdde0f
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
f353f14703
change Name from VSystem to System
2021-03-08 13:15:00 +01:00
Marcel Märtens
6b88545481
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
c515fece28
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
89774980b4
First commit
2021-03-07 22:32:52 +01:00
Marcel
e29964ead1
Merge branch 'sarrakitty/fireworks' into 'master'
...
added a white firework
See merge request veloren/veloren!1856
2021-03-07 18:37:35 +00:00
Joshua Barretto
911acdd9db
Fixed clippy warnings and fmt
2021-03-07 14:25:07 +00:00
Joshua Barretto
db573f6b2d
Turn giant trees into proper sites
2021-03-07 14:25:07 +00:00
Joshua Barretto
862cd5fe49
fmt
2021-03-07 14:25:03 +00:00
Joshua Barretto
a229d65932
Static light improvements, fixed lighting update bug
2021-03-07 14:25:02 +00:00
Joshua Barretto
9875e2c025
Began work on CSG-based primitive tree site structure generation system
2021-03-07 14:25:02 +00:00
Joshua Barretto
7d94c3600f
New town layouts, initial progress
2021-03-07 14:25:02 +00:00
Joshua Barretto
6274987fa6
Fixed snow blocking all light
2021-03-07 14:25:01 +00:00
Joshua Barretto
620e2000d2
Experimental cliffs, use column alt for world map
2021-03-07 14:25:01 +00:00
Joshua Barretto
717bbbf23e
Better static light propagation between translucent objects
2021-03-07 14:25:01 +00:00
Joshua Barretto
6af0e77efd
Better stairs
2021-03-07 14:25:01 +00:00
Joshua Barretto
0c302bb020
Lanterns in trees
2021-03-07 14:25:01 +00:00
Joshua Barretto
6fc7d2a906
Faster More interesting giant trees, better oaks, hives on branches
2021-03-07 14:25:01 +00:00
Joshua Barretto
185b1c3053
Specialised giant trees
2021-03-07 14:25:01 +00:00
Joshua Barretto
7d526da735
Experimental giant mother trees
2021-03-07 14:25:01 +00:00
Joshua Barretto
e30c625d81
More tree variety, denser forests
2021-03-07 14:25:01 +00:00
Joshua Barretto
68b0aa5c50
sync
2021-03-07 14:25:00 +00:00
Joshua Barretto
9cf13ac3b2
Simple coral
2021-03-07 14:25:00 +00:00
Joshua Barretto
6dd0f73c2d
Fixed clipping issues, faster generation
2021-03-07 14:25:00 +00:00
Joshua Barretto
23f0dfb078
Began work on new sites
2021-03-07 14:25:00 +00:00
Sarra
ab12df50cc
added white firework
2021-03-07 03:59:04 -05:00
Sarra
db3bc1b9bb
added a white firework
2021-03-07 03:48:50 -05:00
Avi Weinstock
22fcc6417c
Make fireworks recursively shoot more fireworks (95% average replication).
2021-03-06 14:05:51 -05:00
Marcel
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
Joshua Yanovski
2dd7089e52
Bring vek up to date so we can bump rustc (hopefully).
2021-03-04 05:46:59 +01:00
Sam
39a580b5ee
Added test that all items are properly formatted and valid. Fixed items that were broken.
2021-03-03 16:45:36 -05:00
James Melkonian
018d51b1a0
Move agent data into structs
2021-03-02 15:51:43 -08:00
James Melkonian
0c25896b2c
Fix fleeing and combat a little
2021-03-02 15:51:40 -08:00
James Melkonian
29c5ae5af9
Fix interaction and clean up, broken fleeing
2021-03-02 15:51:38 -08:00
James Melkonian
045ec011c9
Behavior tree minus interacting
2021-03-02 15:51:32 -08:00
James Melkonian
8bdadc47b5
Initial behavior tree refactoring
2021-03-02 15:49:58 -08:00
ccgauche
7f4411ba1f
Merge branch 'master' into 'ccgauche/plugin-player-join-event'
...
# Conflicts:
# CHANGELOG.md
2021-03-02 09:45:15 +00:00
Sam
d02c61ad8a
Item use is now goes through a control action rather than a control event.
2021-03-01 20:51:08 -05:00
Justin Shipsey
9ad8804b60
Merge branch 'armor-org' into 'master'
...
armor org
See merge request veloren/veloren!1835
2021-03-02 01:29:46 +00:00
Ben Wallis
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
Jesus Bracho
c0573cca44
Implement stacking and splitting
2021-03-02 00:08:46 +00:00
ccgauche
db9991ce6d
Adressed all comments
2021-03-01 22:24:02 +01:00
heydabop
bfc82f7236
Fixes #974 - convert tool/weapon equip time to floating point seconds
2021-03-01 15:06:39 -06:00
ccgauche
9628dfaf99
Fixed comments
2021-03-01 21:29:18 +01:00
ccgauche
dbd4d70b79
Lots of improvement in pointer management (switched from i32 to u64) + New event implemented
2021-03-01 19:00:44 +01:00
