Joshua Barretto
f479231b15
Merge branch 'glowy-shiny-pretty' into 'master'
...
Glowy shiny pretty
See merge request veloren/veloren!1874
2021-03-11 17:37:33 +00:00
Joshua Barretto
6e0807f3f5
Cheaper and less broken material reflection/glow
2021-03-11 13:56:11 +00:00
Joshua Barretto
09e32cb952
Initial implementation of glow/shininess
2021-03-10 18:58:25 +00:00
Sam
de5ef03ac4
Auras will now refresh buffs if a buff was already present that had a lesser duration.
...
Attack effects can now have multiple requirements.
Fix for sceptre heal not requiring energy.
Nerfed warding aura protection.
Added icon for warding aura.
Changelog.
2021-03-09 18:03:06 -05:00
Sam
16222948a3
Sceptre skill tree and migration.
2021-03-09 18:02:07 -05:00
Sam
c13e84aff5
Aura duration separated from cast duration in aura state
...
Healing beam now requires combo > 0 to enter character state
Removed last vestiges of old sceptre abilities
Combo extended to most other attacks
Cast aura state renamed to basic aura
2021-03-09 18:02:00 -05:00
Sam
940b4b5de7
Combo counter now uses outcomes.
2021-03-09 17:59:42 -05:00
Sam
398370ca51
Changed lifesteal beam particles to look better.
...
Warding aura now just provides damage reduction instead of invulnerability. Also with a longer duration and less movespeed penalty.
2021-03-09 17:59:41 -05:00
Sam
b6f4543a14
Fixed beam offsets, told healing beam to use beam animation.
2021-03-09 17:59:40 -05:00
Sam
c6a222340e
Particles for lifesteal beam. Changed how frontend recognized beams.
2021-03-09 17:59:39 -05:00
Sam
18edc1092b
Basic beam now generates combo. Healing beam now consumes combo, and requires combo to heal.
2021-03-09 17:59:33 -05:00
Sam
43874a4aa5
Added healing beam character state.
...
This was done as there was a lot of special casing in basic beam to account for healing.
2021-03-09 17:58:20 -05:00
Sam
a1bbc136fc
New abilities for sceptre are done
2021-03-09 17:56:38 -05: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
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
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
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
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
heydabop
bfc82f7236
Fixes #974 - convert tool/weapon equip time to floating point seconds
2021-03-01 15:06:39 -06: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
Sam
f304fe0f10
Fix a few asset paths for armors.
2021-03-01 00:58:43 -05:00
Samuel Keiffer
0497a437a4
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
7e34f1225f
Migration for armor re-organization.
2021-03-01 00:42:35 -05:00
jshipsey
8944115f8e
more asset organization
2021-02-28 22:18:43 -05:00
Samuel Keiffer
537efdd47e
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
d09baadab2
Added command: '/safezone'
2021-02-28 18:14:59 -05:00
Sam
a88ad7b971
Added invulnerability debuff. Currently tied to campfire spawned with '/campfire' command.
2021-02-28 15:02:03 -05:00
Avi Weinstock
7e458ecd40
During a trade, allow requesting items from the counterparty's inventory (prequisite for NPC trading).
2021-02-28 10:13:49 -05:00
Sam
d818ea2f1d
Fixes being stuck in roll when interrupting combo melee.
2021-02-28 08:50:33 -05:00
Samuel Keiffer
cb267ac3ee
Merge branch 'sam/combo-comp' into 'master'
...
Combo now persists as a compnent, rather than a field on a state
See merge request veloren/veloren!1828
2021-02-28 02:42:40 +00:00
Joshua Barretto
b9b36e0bf5
Merge branch 'zesterer-master-patch-28400' into 'master'
...
Fix jump routes not being pathed
See merge request veloren/veloren!1706
2021-02-28 00:41:38 +00:00
Sam
b25a376995
Re-allowed for what stage you were on to persist through a roll
2021-02-27 19:24:18 -05:00
Sam
404c7f0905
Combo melee now checks combo
2021-02-27 18:24:28 -05:00
Joshua Barretto
6051c06462
fmt
2021-02-27 23:21:01 +00:00
Sam
f24433c8cf
Added combo component
2021-02-27 14:55:06 -05:00
Sam
238fcaf5f1
Particle rebase fixes
2021-02-27 01:42:47 -05:00
jshipsey
8d316aac8c
feedback adjustments
2021-02-27 01:42:47 -05:00
jshipsey
0a353576dc
address comments
2021-02-27 01:42:47 -05:00
Snowram
17112926e7
Adds harvester npc
2021-02-27 01:42:47 -05:00
jshipsey
51bc74b2a5
visual weapon variation, adjust minotaur dash, keyframed golem quake
2021-02-27 01:42:47 -05:00
jshipsey
16a44cd532
minotaur moves, added claygolem
2021-02-27 01:42:47 -05:00
jshipsey
417f4638ed
balance pass 2
2021-02-27 01:42:47 -05:00
jshipsey
79ec9115f5
rebase, yeti in dungeon
2021-02-27 01:42:47 -05:00
jshipsey
e06ebf3507
initial balance
2021-02-27 01:42:47 -05:00
Snowram
858fbe1a6c
Adds yeti npc
2021-02-27 01:42:46 -05:00
Snowram
1b9815dc34
Adds 3 new npcs, tusk ram new design
2021-02-27 01:42:46 -05:00
Sam
53b0ba286a
Ice particles for Wendigo
2021-02-27 01:42:46 -05:00
jshipsey
ce3b2141e1
theropod retrofit, some more moves
2021-02-27 01:42:46 -05:00
jshipsey
5792faa992
some new moves, combine biped weapons into one file
2021-02-27 01:42:46 -05:00
jshipsey
57d5e90ddd
full bipedsmall armor swaps
2021-02-27 01:42:46 -05:00
jshipsey
cb59c8017e
anim tweaks, more loadout setup
2021-02-27 01:42:46 -05:00
jshipsey
aa4237b019
BL improvements, various fixes
2021-02-27 01:42:45 -05:00
jshipsey
e4e25e20c9
rebase
2021-02-27 01:42:45 -05:00
jshipsey
ca3248cc93
new dungeon setups, new npcs, weapon specific loadouts, anims
2021-02-27 01:42:45 -05:00
jshipsey
ac16a8900d
bow
2021-02-27 01:42:45 -05:00
jshipsey
66664f3f89
the stabs
2021-02-27 01:42:45 -05:00
unknown
559ece5ede
More npcs work
2021-02-27 01:42:45 -05:00
unknown
6f18d16aa2
Add new quadmeds npcs with rough offsets
2021-02-27 01:42:44 -05:00
Snowram
f48fea57f4
Sahagin, Adlet npcs
2021-02-27 01:42:43 -05:00
jshipsey
7cf723bb9d
gnome
2021-02-27 01:42:43 -05:00
jshipsey
266986626d
biped_small setup
2021-02-27 01:42:43 -05:00
Samuel Keiffer
a99a78abdb
Merge branch 'sam/improve-aura-buffs' into 'master'
...
Auras now apply a buff only once, instead of applying a buff every second.
See merge request veloren/veloren!1824
2021-02-27 03:21:47 +00:00
Snowram
1172c2f2c3
Merge branch 'Sarrakitty/OceanFlora' into 'master'
...
added coral reefs, kelp forests, and seagrass
See merge request veloren/veloren!1819
2021-02-27 01:52:33 +00:00
Sam
64a809ee5b
Made comments more descriptive
2021-02-26 18:15:24 -05:00
Sam
45dd36be07
Auras now apply a buff only once, instead of applying a buff every second.
...
Also supports for buffs persisting a period of time after leaving the aura.
Campfire regen slightly buffed.
2021-02-26 17:57:01 -05:00
Samuel Keiffer
8e07174c1d
Merge branch 'aweinstock/coin-item' into 'master'
...
Add a coin item and make amounts visible on dropped items.
See merge request veloren/veloren!1821
2021-02-26 04:17:12 +00:00
