Commit Graph

2832 Commits

Author SHA1 Message Date
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
Vincent Foulon
e06870702f Add skill for swimming speed 2021-03-21 15:58:38 +01:00
RedlineTriad
606420c5e1
Sort the playerlist alphabetically 2021-03-21 10:22:33 +01:00
Vincent Foulon
d0aa68a9d2 Add climbing speed and cost 2021-03-20 17:17:28 +01:00
Avi Weinstock
0ef42e3854 Address MR 1945 review comments. 2021-03-19 19:53:17 -04:00
Vincent Foulon
80635004a4 Remove unwraps when asset loading fails 2021-03-18 12:56:17 +00:00
Vincent Foulon
eafa69ee4c allow loading animations to be contributed from a manifest file 2021-03-17 23:41:28 +01:00
Vincent Foulon
62b945dab1 Add new random loading animations 2021-03-17 18:15:25 +01: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
a286eb084a create a wrapper around rayon, slowjobpool, that spawns on rayon but drop feed it 2021-03-16 13:31:04 +01:00
Joshua Barretto
6f10a56589 Optimised entity sync code, increased animation throttling distance 2021-03-16 02:49:33 +00:00
James Melkonian
6ea43cfd75 Various RtSim and Agent Interaction Fixes 2021-03-16 01:30:35 +00:00
Joshua Barretto
0312c06295 Fixed sliding when wielding 2021-03-15 14:18:56 +00:00
Marcel
5b21ee7200 Merge branch 'aweinstock/airship-mvp-rebased' into 'master'
Airships

See merge request veloren/veloren!1888
2021-03-15 11:37:12 +00:00
Forest Anderson
0049976da9 Merge branch 'aweinstock/tradefixes-20210314' into 'master'
Client-side trade fixes: update recipe cache and always put client on the same...

See merge request veloren/veloren!1904
2021-03-15 04:52:09 +00: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
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
afd99788b2 Made animations and friction ground-relative 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
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
Avi Weinstock
95992ead4d Client-side trade fixes: update recipe cache and always put client on the same side of the screen as their inventory. 2021-03-14 21:41:47 -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
Imbris
a558d42da7 Merge branch 'snowram/new-npcs' into 'master'
Snowram/new npcs

See merge request veloren/veloren!1896
2021-03-15 00:10:46 +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
b5d501199d Secondary input now fully functional 2021-03-14 17:26:53 -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
PersianKnight
b87514266d Bug fix debug info hotkey and axe skill tree text 2021-03-14 20:16:54 +03:30
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
fcdd7f1c8b Merge branch 'imbris/tracy-tweaks' into 'master'
Improvements for tracy server analysis and other misc tweaks

See merge request veloren/veloren!1891
2021-03-13 22:26:26 +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
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
42d57ccb92 The appearance of the reset buttons has improved. 2021-03-13 17:42:52 +03:30
PersianKnight
e3c0ceb9fa Fixed Toggle Debug Info from Settings 2021-03-13 17:38:34 +03:30
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
Samuel Keiffer
4022937da7 Merge branch 'PersianKnight/InterfaceSettings' into 'master'
Separated InterfaceSettings from GameplaySettings

See merge request veloren/veloren!1887
2021-03-13 01:55:18 +00:00
DaforLynx
99261bf105 Many small changes to audio code, mainly sfx - changelog in MR 2021-03-12 15:00:09 -08:00
PersianKnight
dcb32a7ff1 Separated InterfaceSettings from GameplaySettings 2021-03-12 22:45:44 +03:30
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
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
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