Commit Graph

541 Commits

Author SHA1 Message Date
João Capucho
7a9876760b
Voxygen: Allow zoom on minimap with kbd 2021-04-19 20:26:54 +01:00
João Capucho
7589331785
Voxygen: Add support for map zoom with keybind 2021-04-19 11:56:58 +01:00
Ben Wallis
a4cdb89987 Implemented inventory sorting 2021-04-17 22:04:08 +01: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
hqurve
6ac2b87006 Debug change visibility from settings_window works again 2021-04-14 19:24:28 -04:00
hqurve
9018ead8d0 Seem to have missed minimap again 2021-04-14 19:10:18 -04:00
hqurve
399795dbf1 simplified settings changing within hud and settings_window 2021-04-14 19:10:18 -04:00
hqurve
4503d5160c forgot to add minimap to settings_change 2021-04-14 19:10:17 -04:00
hqurve
df38dfbaf8 Wrapped settings changes from the ui into a single enum and handling moved to session/settings_change.rs 2021-04-14 19:10:17 -04:00
holychowders
568a8d9666 Resolve Issue #978 - Extract SkillSet Into Its Own Component 2021-04-14 15:35:34 +00:00
Adam Blanchet
0d7d069d41
Display keys based off of scancodes
Queries the OS to translate physical keyboard scancodes into
Strings that can be shown in the UI.
Addresses issues #861 and #354
2021-04-13 11:16:47 +02:00
mdx97
03abe234ee Fix diary toggling when escape menu is open. 2021-04-11 18:53:45 -05:00
hqurve
be42cc60c4 Added search to crafting and social windows, added i18n support to crafting tabs, fixed social window offset when group open, removed tabs in social window 2021-04-07 20:24:22 +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
Joshua Barretto
de9ad0942f Merge branch 'zesterer/follow-cam' into 'master'
Added auto camera setting

See merge request veloren/veloren!2071
2021-04-06 04:23:40 +00:00
Joshua Barretto
60e2ed3e7d Added auto camera setting 2021-04-05 23:24:31 +01:00
Hunter Parks
6af9662b03 Change cursor lock location to be center of screen
Changing the cursor coordinates to the middle of the screen had some
side effects. When a user would close a menu and re-open it back up
without moving the mouse, the cursor position would not change.
This commit takes care of that by changing how the HUD handles closing
menus via keyboard inputs.
2021-04-05 16:48:22 +02:00
Monty Marz
06bbb7f0ff Crafting Tabs and more item tags 2021-04-04 13:02:27 +00:00
Avi Weinstock
0122dca3c3 Allow fast stacking into and out of a trade with {ctrl,shift} click.
Shift click goes 1 at a time, Ctrl click automatically balances the trade w.r.t. that quantity.
2021-03-30 18:39:10 -04:00
Marcel Märtens
ccb78eeb5c move tracing code to own crate 2021-03-30 16:35:36 +02:00
Joshua Barretto
bed863c50c Added indicator text to terrain sprites 2021-03-30 01:04:23 +01:00
Snowram
b8ac90d049 Changelog, cleanup, clippy 2021-03-29 18:35:10 +02:00
Snowram
5b99b7ca18 Skillbar uses item tooltip 2021-03-29 18:34:45 +02:00
Snowram
d1e734b9b1 Tooltip now use ItemDesc instead of Item 2021-03-29 18:34:45 +02:00
Snowram
0405f04d53 More item tooltip UI layout 2021-03-29 18:34:45 +02:00
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
Snowram
0e259294d4 Allow Escape key to cancel trades 2021-03-25 01:42:14 +01:00
Avi Weinstock
6b343c2af9 Address MR 1962 review comments. 2021-03-23 18:41:13 -04:00
Avi Weinstock
4ec6b43693 Add a vertical camera clamp option and toggle to voxygen. 2021-03-23 18:22:32 -04: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
Marcel Märtens
6b23101fac update toolchain to nightly-2021-03-22 2021-03-22 16:41:04 +01:00
PersianKnight
b87514266d Bug fix debug info hotkey and axe skill tree text 2021-03-14 20:16:54 +03:30
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
PersianKnight
7c0fe70453 Improve default value of windows_size in Graphics and Help Windows in Interface Settings. 2021-03-13 19:09:38 +03:30
PersianKnight
e3c0ceb9fa Fixed Toggle Debug Info from Settings 2021-03-13 17:38:34 +03:30
PersianKnight
dcb32a7ff1 Separated InterfaceSettings from GameplaySettings 2021-03-12 22:45:44 +03:30
Joshua Barretto
a9bcaf0a37 Merge branch 'PersianKnight/Reset_to_Defaults_Buttons' into 'master'
Add Reset to Default Buttons for Interface, Gameplay and Sound Settings

See merge request veloren/veloren!1877
2021-03-11 21:29:11 +00:00
PersianKnight
3b3ffe30e9 Add Reset to Default Buttons for Interface, Gameplay and Sound Settings 2021-03-11 22:09:30 +03:30
Monty Marz
935aec743d cleanup, icons 2021-03-09 17:59:45 -05:00
Sam
940b4b5de7 Combo counter now uses outcomes. 2021-03-09 17:59:42 -05:00
Monty
c29cb037e7 better combo indicator animation 2021-03-09 17:59:41 -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
c5f74e528d Animation for cast aura, combo information passed to skillbar. 2021-03-09 17:59:40 -05:00
Marcel
8c868aebc7 Merge branch 'xMAC94x/common_ecs' into 'master'
Move Specs code to own common_ecs create, put tracy and macros into common_base

See merge request veloren/veloren!1863
2021-03-09 09:48:53 +00:00