Sam
f23c5db806
New abilities for sceptre are done
2021-03-09 17:56:38 -05: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
0195d8031f
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
61e472dcbc
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
1fd0e15e29
get rid of a lazy_static and update agent multithreaded metrics
2021-03-09 11:52:57 +01:00
Avi Weinstock
e9357e1dd6
Add critical chance and critical multiplier stats to weapons.
2021-03-08 23:27:25 -05: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
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
Marcel
a7562e975e
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
081b290b45
Fixed clippy warnings and fmt
2021-03-07 14:25:07 +00:00
Joshua Barretto
71fdf0e333
Turn giant trees into proper sites
2021-03-07 14:25:07 +00:00
Joshua Barretto
65bd1a4ad1
fmt
2021-03-07 14:25:03 +00:00
Joshua Barretto
9b7ec491bb
Static light improvements, fixed lighting update bug
2021-03-07 14:25:02 +00:00
Joshua Barretto
863fb7c217
Began work on CSG-based primitive tree site structure generation system
2021-03-07 14:25:02 +00:00
Joshua Barretto
3735239fd7
New town layouts, initial progress
2021-03-07 14:25:02 +00:00
Joshua Barretto
5ec5497329
Fixed snow blocking all light
2021-03-07 14:25:01 +00:00
Joshua Barretto
b4cb4dce62
Experimental cliffs, use column alt for world map
2021-03-07 14:25:01 +00:00
Joshua Barretto
afddd76ce2
Better static light propagation between translucent objects
2021-03-07 14:25:01 +00:00
Joshua Barretto
a22c7c55e2
Better stairs
2021-03-07 14:25:01 +00:00
Joshua Barretto
8b752412d6
Lanterns in trees
2021-03-07 14:25:01 +00:00
Joshua Barretto
abef0960ac
Faster More interesting giant trees, better oaks, hives on branches
2021-03-07 14:25:01 +00:00
Joshua Barretto
4be9a7274b
Specialised giant trees
2021-03-07 14:25:01 +00:00
Joshua Barretto
54bb6484e8
Experimental giant mother trees
2021-03-07 14:25:01 +00:00
Joshua Barretto
d584955d81
More tree variety, denser forests
2021-03-07 14:25:01 +00:00
Joshua Barretto
330f3898d4
sync
2021-03-07 14:25:00 +00:00
Joshua Barretto
617a77ff8a
Simple coral
2021-03-07 14:25:00 +00:00
Joshua Barretto
ae071dcbd3
Fixed clipping issues, faster generation
2021-03-07 14:25:00 +00:00
Joshua Barretto
a2706cb546
Began work on new sites
2021-03-07 14:25:00 +00:00
Sarra
2d5d0c996f
added white firework
2021-03-07 03:59:04 -05:00
Sarra
7df4371ccd
added a white firework
2021-03-07 03:48:50 -05:00
Avi Weinstock
83870aae43
Make fireworks recursively shoot more fireworks (95% average replication).
2021-03-06 14:05:51 -05: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
Joshua Yanovski
e7cd5fedf4
Bring vek up to date so we can bump rustc (hopefully).
2021-03-04 05:46:59 +01: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
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
ccgauche
2bb54137a0
Merge branch 'master' into 'ccgauche/plugin-player-join-event'
...
# Conflicts:
# CHANGELOG.md
2021-03-02 09:45:15 +00: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
ccgauche
32b16d71ce
Adressed all comments
2021-03-01 22:24:02 +01:00
heydabop
839f599c49
Fixes #974 - convert tool/weapon equip time to floating point seconds
2021-03-01 15:06:39 -06:00
ccgauche
cc06cbce83
Fixed comments
2021-03-01 21:29:18 +01:00
