Ludvig Böklin
6b52ea89b4
Add more specific masses to objects
2021-04-29 11:46:03 +02:00
Ben Wallis
b0aca9a348
Merge branch 'xvar/item-serialization' into 'master'
...
Changed Item serialization to not send ItemDef struct across the network
See merge request veloren/veloren!2215
2021-04-28 20:50:32 +00:00
Ben Wallis
14caae3667
Changed Item serialization to only send item_definition_id across the network rather than the whole ItemDef
2021-04-28 21:00:25 +01:00
DaforLynx
2e0272ce28
Town music
2021-04-28 05:07:59 +00:00
Ludvig Böklin
34660462e9
Glider physics
2021-04-27 14:41:48 +00:00
jshipsey
f845f2bd11
fix glide wield
2021-04-26 23:17:04 -04:00
Sam
1a7779beb3
Added angle check for new npcs.
2021-04-25 22:19:30 -04:00
jshipsey
a0a75b1921
comments
2021-04-25 22:02:32 -04:00
jshipsey
2c74a86170
skill adjustments, ori changes
2021-04-25 22:02:32 -04:00
jshipsey
c01fd86f44
ori fixes
2021-04-25 22:02:30 -04:00
Joshua Barretto
c6d1963f10
Merge branch 'zesterer/small-fixes' into 'master'
...
Small fixes
See merge request veloren/veloren!2201
2021-04-25 23:03:23 +00:00
Joshua Barretto
94b6fa6da3
Don't use movement efficiency for orientation
2021-04-25 23:00:30 +01:00
Joshua Barretto
3af4793762
Minor control over velocity when in the air
2021-04-25 22:37:25 +01:00
Marcel
35584d0344
Merge branch 'xMAC94x/reduce_deps' into 'master'
...
remove some unused deps Yuri found
See merge request veloren/veloren!2197
2021-04-25 20:22:31 +00:00
Marcel Märtens
1842b2d6eb
remove some unused deps Yuri found
2021-04-25 20:18:20 +02:00
Sam
6848851dc3
Cleaned up tweaks in ui and allowed sfx choosing to scale to amount of sfx variants provided.
2021-04-25 13:09:10 -04:00
Sam
372eff2a02
Initial SCT implementation to display blocks.
2021-04-25 13:09:09 -04:00
Sam
d2d8d43410
Addressed testing feedback.
...
Particles better.
2021-04-25 13:09:08 -04:00
Sam
b9d6bd2fd2
Parrying no longer requires releasing the block button, and instead can parry if block happened in buildup.
2021-04-25 13:09:07 -04:00
Sam
288a6f3a82
Blocking now works if no weapon is equipped in main hand.
...
Added temp sfx for blocking and parrying.
Added temp particles for successful parry.
Tweaked values of default block ability.
2021-04-25 13:09:02 -04:00
Sam
f5ec23df48
Parrying
2021-04-25 13:08:42 -04:00
Sam
91c6288213
Melee weapons can now block.
2021-04-25 13:08:42 -04:00
Sam
0170a38ebc
Removed unwraps in buffs
2021-04-25 12:01:21 -04:00
Snowram
c16ec43938
Body specific beam offsets
2021-04-25 04:07:12 +02:00
Snowram
8f54a0bf31
More phoenix AI work
...
More phoenix AI work
2021-04-25 04:07:12 +02:00
Snowram
8cf8e51962
Phoenix npc + AI (WIP)
2021-04-25 04:07:11 +02:00
Snowram
ab26efa970
Improves bird_large anims
2021-04-25 04:07:09 +02:00
Snowram
bd84677906
Day period dependant wildlife spawns
2021-04-25 02:14:51 +02:00
Snowram
fd177c9669
Breathe and stun anims
2021-04-25 02:14:50 +02:00
Snowram
eb98360183
Cockatrice bird_large conversion
2021-04-25 02:14:50 +02:00
Snowram
bc95484863
Swaps bird_small skeleton to a new bird_large
2021-04-25 02:14:49 +02:00
Ada Lovegirls
01c30868eb
Add option to load English string as fallback if string missing
2021-04-24 14:39:35 +00:00
Ygor Souza
71b8426592
Add basic distance check to shockwave hit test
...
Before checking if the entity hitbox intersects the shockwave shell, we
do a basic check that the entity is close enough to be hit, considering
its radius.
This fixes the unlimited vertical range problem, since the distance is
measured in 3D.
2021-04-24 03:09:45 +02:00
Ygor Souza
e59f1e8d28
Skip physics pass for arrows stuck on surfaces
...
This keeps the arrow velocity from changing, which is what was causing
the ProjectileHit outcome to be pushed multiple times for the same
arrow, since the outcome checks if the arrow velocity is above a given
threshold.
2021-04-22 23:03:04 +02:00
Marcel
e14f8b9745
Merge branch 'aweinstock/deflate-terrain' into 'master'
...
Compress terrain chunks with deflate. Includes a benchmark showing that this...
See merge request veloren/veloren!2166
2021-04-22 17:12:53 +00:00
Monty Marz
b69eb61e7b
Add handles to lanterns, fix cooking pot scale
2021-04-22 17:12:07 +00:00
jshipsey
9d82b20891
remove 0.8, add snow's mixed_vel idea for other bodies
2021-04-22 00:04:39 -04:00
Dominik Broński
1d25016459
Merge branch 'lboklin/arrow-turret-drag-fix' into 'master'
...
Fix ArrowTurret drag coefficient
See merge request veloren/veloren!2175
2021-04-21 20:17:44 +00:00
Imbris
51c0f8733c
Quick physics perf fix
2021-04-21 14:03:23 -04:00
Imbris
1af4a04231
Revert "Merge branch 'revert-b10718c5' into 'master'"
...
This reverts merge request !2172
2021-04-21 17:10:13 +00:00
Joshua Barretto
880236f223
Merge branch 'zesterer/lanterns' into 'master'
...
Made characters carry lanterns higher when possible
See merge request veloren/veloren!2169
2021-04-21 16:40:20 +00:00
Ludvig Böklin
37713cb4ad
Fix ArrowTurret drag coefficient
2021-04-21 18:26:23 +02:00
Imbris
68539a751b
Merge branch 'revert-b10718c5' into 'master'
...
Revert "Merge branch 'imbris/agent-opt' into 'master'"
See merge request veloren/veloren!2172
2021-04-21 15:06:35 +00:00
Imbris
699a5493ec
Merge branch 'lboklin/simplify-buoyancy' into 'master'
...
Simplify buoyancy for performance reasons
See merge request veloren/veloren!2171
2021-04-21 15:06:31 +00:00
Joshua Barretto
ed7cc12213
Made characters carry lanterns higher when possible
2021-04-21 15:59:29 +01:00
Ludvig Böklin
a1744182b3
Simplify buoyancy for performance reasons
2021-04-21 16:19:02 +02:00
Ludvig Böklin
6e364665cb
Prevent drag forces from causing something to come to a complete stop
2021-04-21 16:13:51 +02:00
Imbris
fd672980c4
Revert "Merge branch 'imbris/agent-opt' into 'master'"
...
This reverts merge request !2024
2021-04-21 14:10:06 +00:00
Avi Weinstock
308ad4d81e
Cleanup errors introduced in rebase.
2021-04-20 23:34:17 -04:00
Avi Weinstock
15e32e5655
Move terrain compression code to common_net and disable redundant LZ4 compression on the terrain stream.
2021-04-20 23:24:24 -04:00
Avi Weinstock
6d9de520f3
Compress terrain chunks with deflate. Includes a benchmark showing that this makes them around 70% smaller, and is the same speed as LZ4.
2021-04-20 23:23:53 -04:00
Imbris
76ff00757f
Appease clippy, add CHANGELOG entry
2021-04-20 15:29:20 -04:00
Imbris
e17477979f
Remove extra chunk cloning and parallelize serialization in the server terrain sys
2021-04-20 15:25:05 -04:00
Imbris
e750c9d570
Switch agent target search to use a spatial grid, add convience method for querying the aabr of a circle
2021-04-20 15:25:04 -04:00
Imbris
a76fdbc325
Expose CachedSpatialGrid resource that is updated by the physics system, move BuildAreas into its own module, removed unused ExecMode
2021-04-20 15:25:04 -04:00
Imbris
26222a0a2d
Rename common-sys to common-systems and rearrange common-state slightly
2021-04-20 15:25:04 -04:00
Ludvig Böklin
762c68cfbb
Basic fluid dynamics and physical properties for entities
2021-04-20 17:38:19 +02:00
Joshua Barretto
bcf9a8089f
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
68004bc39c
Made cooking pots glow
2021-04-20 15:39:46 +01:00
Joshua Barretto
a19212daf7
Fix block-snapping at low framerates
2021-04-20 14:59:59 +01:00
Joshua Barretto
9ff7db9b1c
Account for FP imprecision in block-hopping
2021-04-20 14:54:21 +01:00
Joshua Barretto
36e95e0c03
Cleaned up client-side recipe handling
2021-04-20 12:33:22 +01:00
Monty
86445af09c
change cauldron spawning
...
cooking pot height
fmt
fmt, changelog
2021-04-20 02:48:13 +02:00
Monty
a4d56e7843
more sprite stuff and crafting UI update
...
fix item images
fix CR display
2021-04-20 02:46:06 +02:00
Monty
a1fe7c12c3
fmt, add sprites
2021-04-20 02:46:04 +02:00
Joshua Barretto
5598d07944
Added crafting stations
2021-04-20 02:45:59 +02:00
Marcel Märtens
7348e399e0
only have 1 Fn passed to tick fn
2021-04-20 01:49:45 +02:00
Marcel Märtens
485a477503
include origin into system name
2021-04-20 01:30:27 +02:00
Marcel Märtens
425063e24e
remove authc from common::net
2021-04-20 01:30:23 +02:00
Marcel Märtens
5862920f32
seperate sys/state
2021-04-20 01:30:17 +02:00
Joshua Barretto
4ad5257e40
Rebalanced mist
2021-04-19 22:26:56 +01:00
Joshua Barretto
ed20a66b20
Fixed block-snapping
2021-04-19 21:46:51 +01:00
Joshua Barretto
b700d9a641
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
324148d9a3
Limit trading currency to sane amounts
2021-04-19 10:04:28 +01:00
Sam
ce7581037c
Overhauled dash melee.
2021-04-18 18:36:12 -04:00
Joshua Barretto
cb817c0313
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
60d38cc03b
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
0404250300
Unlock dodge roll iframes and staff explosion by default.
2021-04-18 16:16:06 -04:00
Joshua Barretto
352fce239e
Allow trading items not sold by merchants
2021-04-18 20:07:00 +01:00
Joshua Barretto
cac9ac6807
Trading stock limits
2021-04-18 18:58:26 +01:00
Samuel Keiffer
1892ec571d
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
416fe5c2af
Safezone is now permanently in existence at spawn.
2021-04-17 17:33:54 -04:00
Ben Wallis
0e83de205b
Changed plugin load errors to debug and reworded plugin init/load error messages
2021-04-17 22:04:14 +01:00
Ben Wallis
a4cdb89987
Implemented inventory sorting
2021-04-17 22:04:08 +01:00
Avi Weinstock
af47c0dc21
Added /server_physics admin command.
2021-04-17 13:44:22 -04:00
Samuel Keiffer
c962c5f12e
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
85ee4c8cd1
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
d5a887f195
m2 staff
2021-04-16 00:48:20 +03:00
gGmMsS123
e33961e1fa
M2 Staff Final Touch
2021-04-16 00:34:24 +03:00
gGmMsS123
0d956610ec
Added burning debuff for Staff M2
2021-04-15 23:34:28 +03:00
Avi Weinstock
2fb7575d60
Address MR 2126 comments.
2021-04-15 15:17:39 -04:00
jshipsey
8f20d17c9a
attacking movement tweaks
2021-04-15 12:13:50 -04:00
jshipsey
896d2a5b63
combat tweaks
2021-04-15 11:43:52 -04:00
Avi Weinstock
50d0314a75
Add a toggle to negotiate the use of server-authoritative physics.
2021-04-15 08:50:17 -04:00
Justin Shipsey
f7f2eb4b9b
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
c88df846a7
Fixes animation parameters so a 2h weapon in the offhand slot doesn't look wonky.
2021-04-14 17:38:37 -04:00
Sam
94042bdf79
Stats adjusted for 2h. Poise adjusted by handedness.
2021-04-14 15:03:37 -04:00
holychowders
568a8d9666
Resolve Issue #978 - Extract SkillSet Into Its Own Component
2021-04-14 15:35:34 +00:00
jshipsey
161382d06a
changelog
2021-04-13 20:19:35 -04:00
jshipsey
ea9b871374
loot tables, clippy, animation tweaks
2021-04-13 20:18:59 -04:00
Sam
0b10ffc715
You can now roll without a weapon equipped.
2021-04-13 20:18:58 -04:00
jshipsey
b53e1653f6
initial wield testing
2021-04-13 20:18:58 -04:00
Ben Wallis
1de94a9979
* 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
a4bd47f340
Support quantity + use Enum for autocompletion + Address comments
2021-04-12 20:07:34 +02:00
Vincent Foulon
0692562533
New Command: "kit" + Removed Command: "debug"
...
Update CHANGELOG.md
Update CHANGELOG.md
2021-04-12 18:53:36 +02:00
Marcel
54024ce401
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
9db290d4ea
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
ddf6a26577
Give NPCs the ability to use potions.
2021-04-11 23:47:29 +00:00
Joshua Yanovski
af94753ad9
Remove panics and unwraps, part 1.
...
Also fixes various other miscellaneous bugs.
2021-04-10 10:03:21 +02:00
Marcel Märtens
1a9425526b
remove spamming of the logs
2021-04-08 23:55:13 +02:00
Imbris
0eecc61ddf
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
d80db38bc9
Remove TRADE capability, use trade_site attribute instead
2021-04-08 19:06:57 +02:00
Vincent Foulon
bc1797a240
Address comments
2021-04-08 18:33:00 +02:00
holychowders
a4b00a3b97
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
a30cbaf735
Move Behavior to Agent's Component
2021-04-07 22:11:29 +02:00
Vincent Foulon
dbee13f9be
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
45fb9f3211
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
a0157ac5f5
use bitflags instead of HashSet
2021-04-07 17:37:21 +02:00
Vincent Foulon
114715908a
fix tag removing
2021-04-07 17:26:54 +02:00
Vincent Foulon
b1718cf578
Use HashSet instead of Vec
2021-04-07 17:26:48 +02:00
Vincent Foulon
211ab02897
Use Behavior::CanTrade instead of Agent::trade_for_site + addressed comments
2021-04-07 17:26:42 +02:00
Vincent Foulon
18694b30ad
Use Behavior into Agent
2021-04-07 17:26:12 +02:00
Vincent Foulon
41314e9098
Create Behavior component
2021-04-07 17:21:53 +02:00
Marcel
45b4349bc7
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
16871208f2
Add topographic option to map
2021-04-06 09:16:17 -07:00
James Melkonian
8ee1fc4a0f
Add layers to minimap
2021-04-06 08:42:08 -07:00
James Melkonian
bacda06dba
Added map layers
2021-04-06 08:42:07 -07:00
James Melkonian
70ede7f34d
Topographic map
2021-04-06 08:42:06 -07:00
Avi Weinstock
2c4612bff1
Fix loadout_builder panic.
2021-04-06 10:34:13 -04:00
Marcel
f0cabf1add
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
3c50321a80
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
ba0b6c309b
Flattened roll progression.
2021-04-05 17:50:53 -04:00
Sam
a7e39bc8c9
Nerfs
2021-04-05 17:38:52 -04:00
Avi Weinstock
56137aff92
Address MR 2062 comments: avoid an expect-equivalent pattern.
2021-04-05 11:29:10 -04:00
Louis Pearson
91a647e35f
Return none from depot get if stale id used
2021-04-05 06:16:23 -06:00
Marcel
69891f0b70
Merge branch 'login-trim-username' into 'master'
...
login trim username, improve validation, social ordering #1040
Closes #1040
See merge request veloren/veloren!2042
2021-04-04 22:09:16 +00:00
Marcel
958c75642c
Merge branch 'christof/stats_per_price' into 'master'
...
output stats per value for all categories in the trade pricing test
See merge request veloren/veloren!2057
2021-04-04 18:35:39 +00:00
Avi Weinstock
a1cfd9ea3c
Make merchants spawn with stacks of stackable items.
2021-04-04 13:47:05 -04:00
Monty Marz
06bbb7f0ff
Crafting Tabs and more item tags
2021-04-04 13:02:27 +00:00
DaforLynx
6734198104
Adds on-hit combat sfx
2021-04-04 03:04:02 +00:00
Joshua Yanovski
4be0f1b02e
Merge branch 'sam/hashset-touch-entities' into 'master'
...
Changed touch_entities from a vec to a hashset.
See merge request veloren/veloren!2056
2021-04-03 22:06:05 +00:00
Christof Petig
d3bdaaec1a
output stats per value for all categories in the trade pricing test
2021-04-03 23:22:34 +02:00
Joshua Yanovski
143fe3876d
Merge branch 'sam/use-lottery-result' into 'master'
...
Handled error in setting stack size for item quantity in lottery.
See merge request veloren/veloren!2055
2021-04-03 20:11:12 +00:00
Sam
18eed650f4
Changed touch_entities from a vec to a hashset.
2021-04-03 15:13:04 -04:00
Samuel Keiffer
8d9f63404e
Merge branch 'sam/combat-ratings' into 'master'
...
Tweaks to Combat Rating Calculation
See merge request veloren/veloren!2051
2021-04-03 17:33:34 +00:00
Sam
fd61b94b5d
Handled error in setting stack size for item quantity in lottery.
2021-04-03 11:37:57 -04:00
Sam
ca1a93ba21
Actually committed bone staff fix.
2021-04-03 10:26:32 -04:00
Samuel Keiffer
69b64e26c7
Merge branch 'sam/loot-table-features' into 'master'
...
Loot Table Rework
See merge request veloren/veloren!2046
2021-04-03 08:45:53 +00:00
Justin Shipsey
d99627e1dd
Merge branch 'refactor-cell' into 'master'
...
refactor Cell back to 4 byte size #993
Closes #993
See merge request veloren/veloren!1997
2021-04-03 07:56:06 +00:00
Snowram
9a3f6d8261
Substitutes DPS for CR in item tooltip
2021-04-03 00:10:31 -04:00
