2484 Commits

Author SHA1 Message Date
Ludvig Böklin
99d6cc04db Basic fluid dynamics and physical properties for entities 2021-04-20 17:38:19 +02:00
Joshua Barretto
2496c05d11 Merge branch 'better-crafting' into 'master'
Crafting station sprites in towns

See merge request veloren/veloren!2160
2021-04-20 15:08:36 +00:00
Joshua Barretto
bacabacaaa Made cooking pots glow 2021-04-20 15:39:46 +01:00
Joshua Barretto
056fa96a58 Fix block-snapping at low framerates 2021-04-20 14:59:59 +01:00
Joshua Barretto
342ec773d5 Account for FP imprecision in block-hopping 2021-04-20 14:54:21 +01:00
Joshua Barretto
e87ee6d8c7 Cleaned up client-side recipe handling 2021-04-20 12:33:22 +01:00
Monty
a0357fdd58 change cauldron spawning
cooking pot height
fmt
fmt, changelog
2021-04-20 02:48:13 +02:00
Monty
c40bd37452 more sprite stuff and crafting UI update
fix item images
fix CR display
2021-04-20 02:46:06 +02:00
Monty
afea896b5b fmt, add sprites 2021-04-20 02:46:04 +02:00
Joshua Barretto
b605048ae3 Added crafting stations 2021-04-20 02:45:59 +02:00
Marcel Märtens
c221209743 only have 1 Fn passed to tick fn 2021-04-20 01:49:45 +02:00
Marcel Märtens
e742020f42 include origin into system name 2021-04-20 01:30:27 +02:00
Marcel Märtens
302769d086 remove authc from common::net 2021-04-20 01:30:23 +02:00
Marcel Märtens
05d0eb9db4 seperate sys/state 2021-04-20 01:30:17 +02:00
Joshua Barretto
8f23d476e8 Rebalanced mist 2021-04-19 22:26:56 +01:00
Joshua Barretto
1bfe9f65d6 Fixed block-snapping 2021-04-19 21:46:51 +01:00
Joshua Barretto
c8a5e3ac51 Merge branch 'zesterer/econ-tweaks' into 'master'
Limit trading currency to sane amounts

See merge request veloren/veloren!2154
2021-04-19 10:46:17 +00:00
Joshua Barretto
94e40abab2 Limit trading currency to sane amounts 2021-04-19 10:04:28 +01:00
Sam
b0d9a3b4ba Overhauled dash melee. 2021-04-18 18:36:12 -04:00
Joshua Barretto
2c8f900299 Merge branch 'zesterer/econ-tweaks' into 'master'
Rebalanced economy somewhat

See merge request veloren/veloren!2148
2021-04-18 21:20:49 +00:00
Samuel Keiffer
9d145fccb5 Merge branch 'aweinstock/dodgesplosion' into 'master'
Unlock dodge roll iframes and staff explosion by default.

See merge request veloren/veloren!2146
2021-04-18 20:46:15 +00:00
Avi Weinstock
b16d97b39c Unlock dodge roll iframes and staff explosion by default. 2021-04-18 16:16:06 -04:00
Joshua Barretto
40ca69148c Allow trading items not sold by merchants 2021-04-18 20:07:00 +01:00
Joshua Barretto
f5f57f89a8 Trading stock limits 2021-04-18 18:58:26 +01:00
Samuel Keiffer
a0ed6cf978 Merge branch 'sam/permanent-spawn-safezone' into 'master'
Safezone is now permanently in existence at spawn.

See merge request veloren/veloren!2144
2021-04-17 23:44:10 +00:00
Sam
5cf40812d9 Safezone is now permanently in existence at spawn. 2021-04-17 17:33:54 -04:00
Ben Wallis
9525c4d64e Changed plugin load errors to debug and reworded plugin init/load error messages 2021-04-17 22:04:14 +01:00
Ben Wallis
07e6f8fbd9 Implemented inventory sorting 2021-04-17 22:04:08 +01:00
Avi Weinstock
29146fddbc Added /server_physics admin command. 2021-04-17 13:44:22 -04:00
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