2455 Commits

Author SHA1 Message Date
Samuel Keiffer
a62598c62c Merge branch 'gGmMsS/Burning' into 'master'
Added burning debuff for Staff M2

See merge request veloren/veloren!2134
2021-04-15 23:51:33 +00:00
Imbris
0a44ec852a Merge branch 'aweinstock/server-authoritative-physics' into 'master'
Aweinstock/server authoritative physics

See merge request veloren/veloren!2126
2021-04-15 22:24:00 +00:00
gGmMsS123
191d60266a m2 staff 2021-04-16 00:48:20 +03:00
gGmMsS123
90a47a20ea M2 Staff Final Touch 2021-04-16 00:34:24 +03:00
gGmMsS123
db8d189ebd Added burning debuff for Staff M2 2021-04-15 23:34:28 +03:00
Avi Weinstock
26fbe51786 Address MR 2126 comments. 2021-04-15 15:17:39 -04:00
jshipsey
16869933b7 attacking movement tweaks 2021-04-15 12:13:50 -04:00
jshipsey
599981fca4 combat tweaks 2021-04-15 11:43:52 -04:00
Avi Weinstock
1064e3777b Add a toggle to negotiate the use of server-authoritative physics. 2021-04-15 08:50:17 -04:00
Justin Shipsey
f4a97a27f5 Merge branch 'sam/2h-offhand-anim-fixes' into 'master'
2 Hand Offhand Animation Fixes

See merge request veloren/veloren!2129
2021-04-15 01:21:52 +00:00
Sam
b76181aaa0 Fixes animation parameters so a 2h weapon in the offhand slot doesn't look wonky. 2021-04-14 17:38:37 -04:00
Sam
207e7d45a3 Stats adjusted for 2h. Poise adjusted by handedness. 2021-04-14 15:03:37 -04:00
holychowders
793e7982b0 Resolve Issue #978 - Extract SkillSet Into Its Own Component 2021-04-14 15:35:34 +00:00
jshipsey
3640656a02 changelog 2021-04-13 20:19:35 -04:00
jshipsey
ce168a17f7 loot tables, clippy, animation tweaks 2021-04-13 20:18:59 -04:00
Sam
9bbfe163c4 You can now roll without a weapon equipped. 2021-04-13 20:18:58 -04:00
jshipsey
f94169ed22 initial wield testing 2021-04-13 20:18:58 -04:00
Ben Wallis
1fbea66a66 * Replaced diesel with rusqlite and refinery
* Added "migration of migrations" to transfer the data from the __diesel_schema_migrations table to the refinery_schema_history table
* Removed all down migrations as refinery does not support down migrations
* Changed all diesel up migrations to refinery naming format
* Added --sql-log-mode parameter to veloren-server-cli to allow SQL tracing and profiling
* Added /disconnect_all_players admin command
* Added disconnectall CLI command
* Fixes for several potential persistence-related race conditions
2021-04-13 22:05:47 +00:00
Vincent Foulon
bdbbc23b9c Support quantity + use Enum for autocompletion + Address comments 2021-04-12 20:07:34 +02:00
Vincent Foulon
65ef568d70 New Command: "kit" + Removed Command: "debug"
Update CHANGELOG.md

Update CHANGELOG.md
2021-04-12 18:53:36 +02:00
Marcel
39d4d84f15 Merge branch 'DaforLynx/more-music' into 'master'
Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds

See merge request veloren/veloren!2102
2021-04-12 00:43:08 +00:00
DaforLynx
e1ca34d9e8 Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds 2021-04-12 00:43:08 +00:00
Avi Weinstock
5bf4048419 Give NPCs the ability to use potions. 2021-04-11 23:47:29 +00:00
Joshua Yanovski
909f2c4680 Remove panics and unwraps, part 1.
Also fixes various other miscellaneous bugs.
2021-04-10 10:03:21 +02:00
Marcel Märtens
1b38cfbd2d remove spamming of the logs 2021-04-08 23:55:13 +02:00
Imbris
fd30663156 Merge branch 'vfoulon80/behavior-component' into 'master'
New Component: Behavior

See merge request veloren/veloren!2033
2021-04-08 19:16:28 +00:00
Vincent Foulon
5809116afa Remove TRADE capability, use trade_site attribute instead 2021-04-08 19:06:57 +02:00
Vincent Foulon
7c4da6e501 Address comments 2021-04-08 18:33:00 +02:00
holychowders
261802a0d1 Fix issue #1061 - Combat Rating is Affected by Buffs
Replaced `stats` with `None` into the calculation for damage reduction
2021-04-07 17:09:51 -07:00
Vincent Foulon
39bf6826f2 Move Behavior to Agent's Component 2021-04-07 22:11:29 +02:00
Vincent Foulon
8cb001e91b Finally Behavior isn't good enough as a component, Remove it from ECS and include it onto Agent directly 2021-04-07 22:02:57 +02:00
Vincent Foulon
e0da6aa572 Address comments
- make Behavior's capabilities and state private
 - Typo in a comment
 - add basic tests

Apply 1 suggestion(s) to 1 file(s)

Remove comments in agent.rs
2021-04-07 22:02:42 +02:00
Vincent Foulon
c33e73bbed use bitflags instead of HashSet 2021-04-07 17:37:21 +02:00
Vincent Foulon
738f074f89 fix tag removing 2021-04-07 17:26:54 +02:00
Vincent Foulon
4d10230f54 Use HashSet instead of Vec 2021-04-07 17:26:48 +02:00
Vincent Foulon
72d0067e5c Use Behavior::CanTrade instead of Agent::trade_for_site + addressed comments 2021-04-07 17:26:42 +02:00
Vincent Foulon
822db0895c Use Behavior into Agent 2021-04-07 17:26:12 +02:00
Vincent Foulon
ccf89c4275 Create Behavior component 2021-04-07 17:21:53 +02:00
Marcel
ea2db98598 Merge branch 'james/topo-map' into 'master'
Adds topographic map option and allows for map layers

See merge request veloren/veloren!2074
2021-04-07 09:34:13 +00:00
James Melkonian
7bb62615df Add topographic option to map 2021-04-06 09:16:17 -07:00
James Melkonian
44715100c1 Add layers to minimap 2021-04-06 08:42:08 -07:00
James Melkonian
3578116eee Added map layers 2021-04-06 08:42:07 -07:00
James Melkonian
5d3acb0c2e Topographic map 2021-04-06 08:42:06 -07:00
Avi Weinstock
d2e2f30f47 Fix loadout_builder panic. 2021-04-06 10:34:13 -04:00
Marcel
af2a9c0f45 Merge branch 'aweinstock/stackable-merchants' into 'master'
Make merchants spawn with stacks of stackable items.

See merge request veloren/veloren!2062
2021-04-06 08:14:33 +00:00
Samuel Keiffer
d8b8fd1d97 Merge branch 'sam/consolidate-roll' into 'master'
Flattened roll progression.

See merge request veloren/veloren!2073
2021-04-06 03:31:46 +00:00
Sam
31e9577182 Flattened roll progression. 2021-04-05 17:50:53 -04:00
Sam
8c0c0b9d4e Nerfs 2021-04-05 17:38:52 -04:00
Avi Weinstock
edb68601a3 Address MR 2062 comments: avoid an expect-equivalent pattern. 2021-04-05 11:29:10 -04:00
Louis Pearson
07341cc67f Return none from depot get if stale id used 2021-04-05 06:16:23 -06:00