Snowram
aa71dcb9c7
Make the new tooltip item specific
2021-03-29 18:34:45 +02:00
Snowram
4786f84afd
New tooltip
2021-03-29 18:34:45 +02:00
Vincent Foulon
a35fa19409
Implement a basic dialogue system
2021-03-29 14:47:42 +00:00
Sam
71ba9b6a54
Mindflayer balance tweaks.
2021-03-29 10:44:46 -04:00
Treeco
12cf8847c8
Added command to teleport to sites by name
2021-03-28 17:02:17 +01:00
Avi Weinstock
40f2c59401
Reclassify Glowing Remains as Armor for econsim.
2021-03-28 10:29:40 -04:00
Marcel
519c01a888
Merge branch 'christof/item_price_fix' into 'master'
...
Fix the price category of the newly added items
See merge request veloren/veloren!2010
2021-03-28 09:25:52 +00:00
Christof Petig
66d0948d06
Fix the price category of the newly added items
2021-03-28 09:25:51 +00:00
Sam
f117a57083
Switched to using ForceUpdate to forcefully update the client position after a blink
2021-03-27 21:33:45 -04:00
Sam
ade466a12b
Removed potential for divide by zero
2021-03-27 21:06:21 -04:00
Sam
0e3b0a9ee7
Repalced stone golems with 10 husks in T5 dungeon miniboss rooms.
2021-03-27 21:06:18 -04:00
jshipsey
558c82ee54
flayer anims
2021-03-27 21:05:16 -04:00
Sam
91ddcaa155
Particles for summoned minions
2021-03-27 21:05:15 -04:00
Sam
1edf79d109
Moved all legendaries to mindflayer loot table.
2021-03-27 21:05:12 -04:00
Sam
4ec387af82
Added particles for lifesteal effect
2021-03-27 21:05:12 -04:00
Sam
5966b1541d
Mindflayer can now lifesteal off of its own minions
2021-03-27 21:05:11 -04:00
Sam
50e832b6d0
Mindflayer summons husks instead of dogs now
2021-03-27 21:05:10 -04:00
Snowram
39c8efe11f
Adds husk npc
2021-03-27 21:05:09 -04:00
Sam
f9835e78da
Pets no longer drop loot on death. Code to determine targeting of pets is less hacky and now takes into account alignment of their owner.
2021-03-27 21:05:07 -04:00
Sam
720482d994
Gave mindflayer AI.
...
Fixed particles and made them sync across network.
2021-03-27 21:05:06 -04:00
Sam
a5b7477e96
Added summon minions ability to mindflayer
2021-03-27 21:05:05 -04:00
Sam
30da614e89
Added dimensional door ability for mindflayer
2021-03-27 21:05:05 -04:00
Sam
f1156c9ce5
Added necrotic vortex attack to mindflayer
2021-03-27 21:05:03 -04:00
Sam
0d3795112c
Added cursed flame attack to mindflayer
2021-03-27 21:05:03 -04:00
Sam
46799daed2
Switched normalized function to try_normalized
2021-03-27 19:05:48 -04:00
Louis Pearson
165065725e
Add build_area_list command
...
* Reworks CanBuild to use HashSet
* Removes player argument from build permission, use sudo instead
2021-03-27 07:54:02 -06:00
Louis Pearson
21f794f84c
Use Depot instead of Store for BuildArea
2021-03-27 07:54:02 -06:00
Louis Pearson
f08c4e6585
Add commands to manage build areas
2021-03-27 07:54:02 -06:00
Louis Pearson
77d48657c6
Store build areas outside of CanBuild component
2021-03-27 07:54:02 -06:00
Louis Pearson
120a0cd9a7
Limit build mode to bounding box
2021-03-27 07:54:02 -06:00
Louis Pearson
eade0540b2
Add permit_build command
...
This commit separates permission to build from building mode, allowing
build to become a NoAdmin command (since players will first need
permission from an Admin to enter build mode)
2021-03-27 07:54:02 -06:00
Marcel
da5c73c84b
Merge branch 'refactor-login' into 'master'
...
refactor handling of duplicate login #1015
Closes #1015
See merge request veloren/veloren!1992
2021-03-27 13:49:09 +00:00
Sam
6c2de7d70e
Fixed boost having ridiculous velocity.
2021-03-26 16:11:25 -04:00
Scott Williams
d35475eaef
Added leather scraps recipe
2021-03-26 16:44:38 +00:00
Marcel
843850a4b8
Merge branch 'aweinstock/tradepricing' into 'master'
...
Get SitePricing information to clients, and use it to display coin-denominated...
See merge request veloren/veloren!1991
2021-03-26 00:17:39 +00:00
Louis Pearson
0a294bcf56
Use older version of Store and introduce Depot
...
Removal of items in Store can cause get to fail. It has been reverted to
an older version that did not support removal. The newer version is now
called Depot and changed so that None is returned if the item does
not exist instead of crashing.
2021-03-25 07:41:53 -06:00
aljazerzen
0ea102dc9c
refactor handling of duplicate login
2021-03-25 12:33:56 +01:00
Avi Weinstock
8d90548331
Get SitePricing information to clients, and use it to display coin-denominated prices in voxygen on tooltips during a trade. Also boost merchant spawn rate slightly.
2021-03-25 02:11:58 -04:00
Marcel
28952f6d7b
Merge branch 'aweinstock/agent-retargetting' into 'master'
...
In `agent::Sys`, perform target selection periodically to avoid agents going...
See merge request veloren/veloren!1985
2021-03-24 22:22:04 +00:00
Christof Petig
aa6a75808f
adapt unit test
2021-03-24 07:37:46 +01:00
Christof Petig
acba98366a
loop over slots_mut instead of using an index
2021-03-24 07:37:46 +01:00
Christof Petig
a83a74d216
replace an unwrap by returning an Option
2021-03-24 07:37:45 +01:00
Avi Weinstock
ebc8e945d4
In agent::Sys, perform target selection periodically to avoid agents going after their target too singlemindedly.
2021-03-23 23:00:05 -04:00
Joshua Barretto
21b20ea75e
Merge branch 'aweinstock/enable-rtsim-airships' into 'master'
...
Enable RtSim Airships.
See merge request veloren/veloren!1973
2021-03-23 14:29:43 +00:00
Marcel
f2c01409a2
Merge branch 'sam/continuous-roll' into 'master'
...
Roll Tweaks
See merge request veloren/veloren!1975
2021-03-23 09:46:21 +00:00
Avi Weinstock
75f1b0f5e0
Remove level from create_ship and CreateShip.
2021-03-23 10:44:42 +01:00
Avi Weinstock
deb9358c3a
Add ServerEvent::CreateShip, and use it instead of CreateNpc for RtSim airships.
2021-03-23 10:44:37 +01:00
Avi Weinstock
49f39fb752
Make more systems work with an optional health component, to allow disabling health on rtsim airships (so that players can't hammer them out of the sky).
2021-03-23 10:44:32 +01:00
Joshua Barretto
456ceab6d0
Remove eye height check for beam
2021-03-23 10:43:22 +01:00
Joshua Barretto
695f6c52fe
Added raycast check to beams
2021-03-23 10:43:18 +01:00
heydabop
0e3f7625a9
Fix #962 - kick old client and add new client on duplicate login
2021-03-22 19:15:24 -05:00
Sam
356bb5baee
If roll input remains held, allows you to keep rolling and stay in roll state.
...
You can now jump to interrupt the recovery portion of roll.
Jumping out of roll slightly increases jump strength.
2021-03-22 18:47:13 -04:00
Marcel Märtens
6b23101fac
update toolchain to nightly-2021-03-22
2021-03-22 16:41:04 +01:00
Marcel Märtens
3d45262ebb
warn when a single system takes longer than 500ms
2021-03-22 14:26:05 +01:00
Samuel Keiffer
4356f67bed
Merge branch 'loot-tables' into 'master'
...
Loot tables
See merge request veloren/veloren!1968
2021-03-22 09:39:35 +00:00
Samuel Keiffer
f65cd1e771
Loot tables
2021-03-22 09:39:35 +00:00
Justin Shipsey
f57af6f776
Merge branch 'slipped/animtweaks' into 'master'
...
airship movement bits
See merge request veloren/veloren!1967
2021-03-22 08:49:04 +00:00
Samuel Keiffer
1374900928
Merge branch 'sam/combat-fixes' into 'master'
...
Fixes gaining combo by shooting loot bag
See merge request veloren/veloren!1953
2021-03-22 02:01:22 +00:00
jshipsey
31747d8ff1
airship movement bits
2021-03-21 21:43:49 -04:00
Joshua Barretto
7ae4230dc8
Merge branch 'zesterer/pick' into 'master'
...
Pickaxe
See merge request veloren/veloren!1959
2021-03-22 00:19:42 +00:00
Joshua Barretto
6ea5aa796b
Faster pick, less vibrant block selection
2021-03-21 20:38:08 +00:00
Joshua Barretto
fb3980e273
Outcome for block destruction, take select_pos from ControllerInputs
2021-03-21 20:10:05 +00:00
Joshua Barretto
003e76113f
Fetch InputAttr from controller
2021-03-21 19:11:44 +00:00
Marcel
983523c463
Merge branch 'vfoulon80/climbing-skill' into 'master'
...
Add climbing speed and cost
See merge request veloren/veloren!1950
2021-03-21 18:35:44 +00:00
Marcel
e64258afcf
Merge branch 'xMAC94x/tracing_slowjob' into 'master'
...
harden slowjob code
See merge request veloren/veloren!1961
2021-03-21 18:34:21 +00:00
Marcel Märtens
a77578a25b
harden slowjob code
2021-03-21 18:45:23 +01:00
Joshua Barretto
b45df7fe10
Switched to BasicMelee
2021-03-21 17:45:01 +00:00
Joshua Barretto
347e1022a0
Initial implementation of pickaxe
2021-03-21 16:09:16 +00:00
Vincent Foulon
e06870702f
Add skill for swimming speed
2021-03-21 15:58:38 +01:00
Vincent Foulon
9e11a574d2
remove CharacterAbility::Climb
2021-03-21 00:35:34 +01:00
Vincent Foulon
d0df01fe51
move climbing skill adjustment into climb module
2021-03-21 00:22:04 +01:00
Avi Weinstock
1351b9515c
Update fall damage calculations.
2021-03-20 18:46:34 -04:00
Vincent Foulon
8b01abde67
address comments
2021-03-20 22:56:54 +01:00
Sam
d7090315ff
Increased combo duration by 50%
2021-03-20 16:44:18 -04:00
Sam
92c9e8c477
Fixed gaining combo by shooting loot bags
2021-03-20 16:26:10 -04:00
Vincent Foulon
d0aa68a9d2
Add climbing speed and cost
2021-03-20 17:17:28 +01:00
Marcel Märtens
2733ba2e27
Change the version number to 0.9
2021-03-20 13:07:09 +01:00
Samuel Keiffer
d489ade082
Parallelized beam
2021-03-19 20:18:36 +00:00
Imbris
9fb44e5674
More voxel collision speedups by reducing the common cases from 5 to 3 voxel iterations
2021-03-18 21:20:22 -04:00
Snowram
e5afb2fcf7
Various visual fixes
2021-03-18 22:53:06 +01:00
Marcel Märtens
e6e56f19f9
cleanup faster physics calc
2021-03-18 15:22:28 +01:00
Imbris
bf383d9562
Combine 5 things into 1
2021-03-18 14:26:32 +01:00
Imbris
99805f9a8d
Merge branch 'imbris/voxel-collider-broadphase' into 'master'
...
Spatial grid for voxel colliders as well as a basic bounding sphere test
See merge request veloren/veloren!1927
2021-03-18 07:03:04 +00:00
Marcel
a6cae66a54
Merge branch 'sam/fix-dash' into 'master'
...
Fixed dash
See merge request veloren/veloren!1933
2021-03-18 03:09:46 +00:00
Joshua Barretto
6c939b35b8
Merge branch 'zesterer/network-tweaks' into 'master'
...
Reduced rubber-banding and interpolation jerk without significantly impacting upon network usage
See merge request veloren/veloren!1935
2021-03-18 01:47:29 +00:00
Joshua Barretto
64c8f75a4f
Merge branch 'sam/remove-combat-last-pos' into 'master'
...
Shockwaves and beams no longer use last position in calculating if they hit.
See merge request veloren/veloren!1934
2021-03-18 01:07:18 +00:00
Sam
5384e5a01e
Fixed dash
2021-03-17 20:13:12 -04:00
DaforLynx
fbf4defa04
Adds sfx for Sceptre aura
2021-03-17 23:54:49 +00:00
Joshua Barretto
e8b053a09f
Reduced rubber-banding and interpolation jerk without significantly impacting upon network usage
2021-03-17 21:31:07 +00:00
Sam
2bceb2d3a6
Shockwaves and beams no longer use last position in calculating if they hit.
2021-03-17 17:24:39 -04:00
Marcel Märtens
49e5fe96df
add a check that at least 1 thread works for slowJobPool and for every configuration
2021-03-17 14:36:58 +01:00
Marcel Märtens
529eae2e9d
slowjob: allow at least 1 job of every type
2021-03-17 08:26:43 +01:00
Imbris
198cc7e75a
Remove extra instrumentation and the old voxel collider loop
2021-03-16 23:42:13 -04:00
Imbris
e70f097738
Spatial grid for voxel colliders as well as a basic bounding sphere test
...
before doing any actual expensive voxel collision checking
2021-03-16 23:32:03 -04:00
Monty Marz
e9cbac387e
new loading bg, staff models
...
item images
fix paths
loot tables, adjustments
Update main.ron
2021-03-16 23:23:24 +00:00
Marcel Märtens
b534282dcc
fix ci
2021-03-16 23:31:40 +01:00
Marcel
34b194d179
Merge branch 'aweinstock/forcedupdate-interpolation' into 'master'
...
Apply ForcedUpdate messages to the interpolation system, potentially improving...
See merge request veloren/veloren!1917
2021-03-16 22:23:04 +00:00
Marcel
ac904f59f0
Merge branch 'sam/invuln-fixes' into 'master'
...
Safezone fixes
See merge request veloren/veloren!1920
2021-03-16 22:20:42 +00:00
Sam
18173caefe
NPCs no longer target players inside safezones (and consider them to be defeated)
...
Warding aura no longer sometimes bypasses safezone invulnerability
2021-03-16 15:17:08 -04:00
Avi Weinstock
4d6fb0584a
Fix mounting by making deferred {pos,vel} writes optional in physics.
2021-03-16 14:04:28 -04:00
Avi Weinstock
62de0816e0
Apply ForcedUpdate messages to the interpolation system, potentially improving the handling of teleports.
2021-03-16 11:55:01 -04:00
Marcel Märtens
a286eb084a
create a wrapper around rayon, slowjobpool, that spawns on rayon but drop feed it
2021-03-16 13:31:04 +01:00
Marcel Märtens
0ec863b236
further experiments via a special Group
2021-03-16 09:59:05 +01:00
Marcel Märtens
8b6b463177
experiment with a slowjob that can return data
2021-03-16 09:58:58 +01:00
Imbris
8d9809ed25
update changelog, clippy fixes
2021-03-16 04:06:15 -04:00
Imbris
f2ff5c9655
Instrument all par joins, defer ubiquitous pos/vel writes with a component instead of using vecs
2021-03-16 03:50:45 -04:00
Imbris
6146adf5f0
Remove tweaks and plots
2021-03-16 03:50:45 -04:00
Imbris
4b6688ddfe
Add tracy plot for showing use_grid
2021-03-16 03:50:45 -04:00
Imbris
1306ccb6d9
Remove commented out radius list
2021-03-16 03:50:45 -04:00
Imbris
cfa0512cd0
Setup spatial grid for entity versus entity collisions
2021-03-16 03:50:45 -04:00
James Melkonian
6ea43cfd75
Various RtSim and Agent Interaction Fixes
2021-03-16 01:30:35 +00:00
Marcel
39ac300bef
Merge branch 'sam/buff-fix-test' into 'master'
...
Fif Buff Emission
See merge request veloren/veloren!1910
2021-03-15 22:46:44 +00:00
Sam
a983f5249f
Test
2021-03-15 17:35:53 -04:00
Joshua Barretto
578d81058a
Fixed incorrect velocity snapping on collision
2021-03-15 20:28:48 +00:00
Sam
0c7ea992c2
Mounting fix
2021-03-15 00:26:19 -04:00
Avi Weinstock
41342deab6
Cargo fmt after rebasing.
2021-03-14 23:23:03 -04:00
Avi Weinstock
9304ecab3d
Address Imbris's MR 1888 comments, and add changelog entry.
...
- Use Ori::{new,to_quat} and make the field private.
- Update/capitalize/add various comments.
- Implicitly drop scope guards where applicable.
- Take !Copy colliders by reference instead of cloning.
- s/cylinder_voxel_collision/box_voxel_collision/
- Unindent some physics code with a continue.
2021-03-14 23:21:46 -04:00
Joshua Barretto
1e9ee3d243
Improved climbing, block-hopping on airships
2021-03-14 23:21:45 -04:00
Avi Weinstock
546ee48073
Fix interpolation for possession, and make the mount point of airships above their deck.
2021-03-14 23:21:45 -04:00
Joshua Barretto
be9476a1ca
Fixed climbing/falling friction when on a wall
2021-03-14 23:21:45 -04:00
Joshua Barretto
6add95bd5c
Fixed block-snapping, climbing and airship takeoff
2021-03-14 23:21:44 -04:00
Avi Weinstock
23b1417275
Add hermite interpolation for position (disabled for now with a flag, since it breaks possession).
2021-03-14 23:20:48 -04:00
Joshua Barretto
29b93d791b
Made level flight work
2021-03-14 23:20:48 -04:00
Avi Weinstock
bbb11882e2
Add lerping of physics to extrapolated position, and enable sending updates for stopped entities.
2021-03-14 23:20:48 -04:00
Avi Weinstock
dad0012973
Get linear interpolation working for {Pos,Vel,Ori} with client-side timestamps.
2021-03-14 23:20:48 -04:00
Avi Weinstock
a71bacdce0
Add machinery for storing component buffers for interpolation.
2021-03-14 23:20:47 -04:00
Joshua Barretto
f6c6319952
Made entities rotate smoothly with airships, fixed rotation speeds
2021-03-14 23:20:47 -04:00
Joshua Barretto
e232a2e473
Fixed jumping inconsistencies, no block-snapping for ships
2021-03-14 23:20:46 -04:00
Joshua Barretto
8247c136bc
Prevented jumping airships
2021-03-14 23:17:29 -04:00
Joshua Barretto
b8a27f493c
Initial pass for gravity and air resistance for more stable physics
2021-03-14 23:17:29 -04:00
Joshua Barretto
71c07734f7
Slightly increase block-hop height for better airship block-hopping
2021-03-14 23:17:29 -04:00
Joshua Barretto
1af86ef2f8
Removed unnecessary matrix mul
2021-03-14 23:17:29 -04:00
Joshua Barretto
9424998e6e
Fixed arrows
2021-03-14 23:17:29 -04:00
Joshua Barretto
44f9932450
Properly propagate velocity steps during airship collision to avoid falling through airships
2021-03-14 23:17:28 -04:00
Joshua Barretto
6d8ba31e5b
Reduced air resistance for better-behaving airships
2021-03-14 23:17:28 -04:00
Joshua Barretto
a4e5ba0639
Fixed incorrectly reversed orientation matrix
2021-03-14 23:17:28 -04:00
Joshua Barretto
7feb4942e3
Fixed incorrect wall climb direction on airships
2021-03-14 23:17:28 -04:00
Joshua Barretto
b2ab1046c8
Fewer precision issues by using player-relative coordinate space
2021-03-14 23:17:28 -04:00
Avi Weinstock
a32be4ac5a
Address MR 1888 review comments.
...
- Delete obsolete symbolic links.
- Add suggested comments.
- Remove dead code.
2021-03-14 23:17:28 -04:00
Avi Weinstock
aa56166c80
Fix fmt and clippy, and rename {psdr,psdw} to {read,write} in physics.
2021-03-14 23:17:26 -04:00
Joshua Barretto
40c284fd71
Relative velocity collisions
2021-03-14 23:14:26 -04:00
Joshua Barretto
3496c356e2
More relative motion changes
2021-03-14 23:14:26 -04:00
Avi Weinstock
5ff72a4a2e
/airship angle command and RtSim airships.
2021-03-14 23:14:26 -04:00
Joshua Barretto
e59b68c262
Mountable airships
2021-03-14 23:14:25 -04:00
Joshua Barretto
09142d99b8
Fixed water collision bug
2021-03-14 23:14:25 -04:00
Joshua Barretto
f44ca1898c
Made airship terrain hitboxes smaller
2021-03-14 23:14:25 -04:00
Joshua Barretto
f4b3d8145b
Smooth airship movement
2021-03-14 23:14:21 -04:00
Joshua Barretto
afd99788b2
Made animations and friction ground-relative
2021-03-14 23:09:52 -04:00
Joshua Barretto
e1e6403c63
Fixed airship collisions under rotation, added position increment for velocity when on ground
2021-03-14 23:09:52 -04:00
Avi Weinstock
e9aab63a04
Account for model translation in the physics. The voxel collider still needs to be north-aligned for now.
2021-03-14 23:09:52 -04:00
James Melkonian
6ff054099f
Allow spawned airships to move
2021-03-14 23:09:52 -04:00
Avi Weinstock
bcd3799395
Airship fixes: figure culling, player hitbox bounds w.r.t. airships, physics state unioning.
2021-03-14 23:09:51 -04:00
Avi Weinstock
5d85775dcf
Airship progress: now possessable, and physics kind of works (desyncs from the visuals by a shift + scale, and rotation isn't done at all yet, but the contours are correct).
2021-03-14 23:09:51 -04:00
Avi Weinstock
8b9e84972a
Draft of airships (spawn command, visuals, some physics refactoring, no collision yet).
2021-03-14 23:09:49 -04:00
Marcel
5570b57282
Merge branch 'sam/yeet-inputs' into 'master'
...
Reworked Controller Inputs to use Control Actions
See merge request veloren/veloren!1900
2021-03-15 01:32:02 +00:00
Sam
ecff675cc4
Wielding now works again
...
Rolling now resumes combo states correctly again
Cleanup
2021-03-14 17:26:55 -04:00
Sam
ac6e192db4
Completely purged old method of inputs
2021-03-14 17:26:55 -04:00
Sam
be27289a7f
Inputs remain in queue while active, allowing interrupts and queued inputs to be more cleanly handled
2021-03-14 17:26:54 -04:00
Sam
b5d501199d
Secondary input now fully functional
2021-03-14 17:26:53 -04:00
Sam
21e6f4797c
Primary ability fully functional.
2021-03-14 17:26:53 -04:00
Sam
19c81f1528
Support for canceling an input. Boost state hooked up to system.
2021-03-14 17:26:52 -04:00
Sam
c6d8daaae3
Primary input now activated from control actions.
...
Moved a lot of key_state to a HashSet so that it is handled automatically.
2021-03-14 17:26:51 -04:00
Snowram
60dd47cdea
Theropod charge attack
2021-03-14 18:10:40 +01:00
Snowram
9d7e8957bb
Add new npcs
2021-03-14 14:24:35 +01:00
Christof Petig
15b11d9154
Implement /price_list (work in progress), stub for /buy and /sell
...
remove outdated economic simulation code
remove old values, document
add natural resources to economy
Remove NaturalResources from Place (now in Economy)
find closest site to each chunk
implement natural resources (the distance scale is wrong)
cargo fmt
working distance calculation
this collection of natural resources seem to make sense, too much Wheat though
use natural resources and controlled area to replenish goods
increase the amount of chunks controlled by one guard to 50
add new professions and goods to the list
implement multiple products per worker
remove the old code and rename the new code to the previous name
correctly determine which goods guards will give you access to
correctly estimate the amount of natural resources controlled
adapt to new server API
instrument tooltips
Now I just need to figure out how to store a (reference to) a closure
closures for tooltip content generation
pass site/cave id to the client
Add economic information to the client structure
(not yet exchanged with the server)
Send SiteId to the client, prepare messages for economy request
Make client::sites a HashMap
Specialize the Crafter into Brewer,Bladesmith and Blacksmith
working server request for economic info from within tooltip
fully operational economic tooltips
I need to fix the id clash between caves and towns though
fix overlapping ids between caves and sites
display stock amount
correctly handle invalid (cave) ids in the request
some initial balancing, turn off most info logging
less intrusive way of implementing the dynamic tool tips in map
further tooltip cleanup
further cleanup, dynamic tooltip not fully working as intended
correctly working tooltip visibility logic
cleanup, display labor value
separate economy info request in a separate translation unit
display values as well
nicer display format for economy
add last_exports and coin to the new economy
do not allocate natural resources to Dungeons (making town so much larger)
balancing attempt
print town size statistics
cargo fmt (dead code)
resource tweaks, csv debugging
output a more interesting town (and then all sites)
fix the labor value logic (now we have meaningful prices)
load professions from ron (WIP)
use assets manager in economy
loading professions works
use professions from ron file
fix Labor debug logic
count chunks per type separately
(preparing for better resource control)
better structured resource data
traders, more professions (WIP)
fix exception when starting the simulation
fix replenish function
TODO:
- use area_ratio for resource usage (chunks should be added to stock, ratio on usage?)
- fix trading
documentation clean up
fix merge artifact
Revise trader mechanic
start Coin with a reasonable default
remove the outdated economy code
preserve documentation from removed old structure
output neighboring sites (preparation)
pass list of neighbors to economy
add trade structures
trading stub
Description of purpose by zesterer on Discord
remember prices (needed for planning)
avoid growing the order vector unboundedly
into_iter doesn't clear the Vec, so clear it manually
use drain to process Vecs, avoid clone
fix the test server
implement a test stub (I need to get it faster than 30 seconds to be more useful)
enable info output in test
debug missing and extra goods
use the same logging extension as water, activate feature
update dependencies
determine good prices, good exchange goods
a working set of revisions
a cozy world which economy tests in 2s
first order planning version
fun with package version
buy according to value/priority, not missing amount
introduce min price constant, fix order priority
in depth debugging
with a correct sign the trading plans start to make sense
move the trade planning to a separate function
rename new function
reorganize code into subroutines (much cleaner)
each trading step now has its own function
cut down the number of debugging output
introduce RoadSecurity and Transportation
transport capacity bookkeeping
only plan to pay with valuable goods, you can no longer stockpile unused options
(which interestingly shows a huge impact, to be investigated)
Coin is now listed as a payment (although not used)
proper transportation estimation (although 0)
remove more left overs uncovered by viewing the code in a merge request
use the old default values, handle non-pileable stocks directly before increasing it
(as economy is based on last year's products)
don't order the missing good multiple times
also it uses coin to buy things!
fix warnings and use the transportation from stock again
cargo fmt
prepare evaluation of trade
don't count transportation multiple times
fix merge artifact
operational trade planning
trade itself is still misleading
make clippy happy
clean up
correct labor ratio of merchants (no need to multiply with amount produced)
incomplete merchant labor_value computation
correct last commit
make economy of scale more explicit
make clippy happy (and code cleaner)
more merchant tweaks (more pop=better)
beginning of real trading code
revert the update of dependencies
remove stale comments/unused code
trading implementation complete (but untested)
something is still strange ...
fix sign in trading
another sign fix
some bugfixes and plenty of debugging code
another bug fixed, more to go
fix another invariant (rounding will lead to very small negative value)
introduce Terrain and Territory
fix merge mistakes
2021-03-14 03:18:32 +00:00
Imbris
0127832172
Fix tracy not working in certain areas, add span to chunk gen, missing fmt, remove extra span, make voxygen use INFO level instead of TRACE in tracy mode
2021-03-13 13:30:20 -05:00
Imbris
2511b8959c
Add tracy entity count plot, span tweaks
2021-03-13 02:59:58 -05:00
Imbris
8d0b776f18
Move server-cli commands to separate file, tracy profiling par_join improvements, misc improvements
...
- remove overwritten logging setting in server-cli
- add server-cli command to load a random area for testing without a client
- make admin add/remove commands modify ingame players instead of needing to reconnect
- add spans to par_join jobs
- added test command that loads up an area of the world
- add tracy-world-server alias
- set debug directives to info for logging
2021-03-13 02:28:59 -05:00
jshipsey
49f496e290
intitial values
2021-03-12 00:58:12 -05:00
Marcel
93cab075f8
Merge branch 'xMAC94x/non_blocking_register' into 'master'
...
Auth requests are now done async, the register system is fetching it, via a PendingLogin component
See merge request veloren/veloren!1875
2021-03-11 21:51:55 +00:00
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
Samuel Keiffer
9b198b5cda
Merge branch 'sam/sceptre-overhaul' into 'master'
...
Overhaul sceptre
Closes #768
See merge request veloren/veloren!1845
2021-03-11 16:47:50 +00:00
Marcel Märtens
728bff610b
Allow HTTP auth servers again.
...
only `localhost` are allowed in a release build.
when debug assertions are on, others are also allowed.
This change undoes the changes to the settings, so compared to master, there is no effect
2021-03-11 17:24:52 +01:00
Marcel Märtens
a98e72c391
Auth requests are now done async, the register system is fetching it, via a PendingLogin component
...
The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without.
correct is now `auth.veloren.net`
incorrect is: `https://auth.veloren.net `
2021-03-11 17:05:02 +01:00
Joshua Barretto
6e0807f3f5
Cheaper and less broken material reflection/glow
2021-03-11 13:56:11 +00:00
Marcel Märtens
f8b7d96066
git push -fTransport ChunkRequests and Chunkupdates in a own stream. ChunkUpdates are very big and having them in a own stream, helps slow clients to keep up with entity syncs and
...
lagging a bit behind on terrain. Which is fine. Block Places and Block Pickup are not handled in this stream, as they go through the standart route of event handling.
2021-03-11 14:50:46 +01:00
Joshua Barretto
09e32cb952
Initial implementation of glow/shininess
2021-03-10 18:58:25 +00:00
ccgauche
67b24294d6
Change Ecs access system to allow write accesses to be used + reintroduced get_player_name
2021-03-10 19:36:53 +01:00
Marcel Märtens
b151a246c3
update specs to get rid of old deps
2021-03-10 13:22:17 +01:00
Marcel
81959c0a89
Merge branch 'ccgauche/move-back-register-to-system' into 'master'
...
Moved back register to a system
See merge request veloren/veloren!1868
2021-03-10 00:56:33 +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
ccgauche
10e5620642
Moved back register to a system
2021-03-09 21:16:23 +01:00
Marcel Märtens
d7df741671
update dependencies, including removal of some tracy deps as they are get through common/tracy
2021-03-09 20:17:29 +01:00
Marcel
f6028f4ae3
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
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
Marcel Märtens
77dea4980c
get rid of a lazy_static and update agent multithreaded metrics
2021-03-09 11:52:57 +01: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
