Commit Graph

324 Commits

Author SHA1 Message Date
5b8842fac3 Merge branch 'deny-trade-on-exit' into 'master'
Denies any active trades on exit to char select.

See merge request veloren/veloren!2111
2021-04-12 23:00:38 +00:00
883977a42f Denies any active trades on exit to char select. 2021-04-12 23:00:38 +00:00
0692562533 New Command: "kit" + Removed Command: "debug"
Update CHANGELOG.md

Update CHANGELOG.md
2021-04-12 18:53:36 +02:00
5bfdd5f1af Add combat music transitions based on number of enemies in player radius. 2021-04-11 22:08:40 -04:00
fd317417fb Merge branch 'aweinstock/npcpotions' into 'master'
Give NPCs the ability to use potions.

See merge request veloren/veloren!2092
2021-04-11 23:47:30 +00:00
ddf6a26577 Give NPCs the ability to use potions. 2021-04-11 23:47:29 +00:00
8a25ebb59a Show ctrl-click and shift-click usage in item tooltips during trades. 2021-04-11 22:56:02 +00:00
6772e71aaa UI fixes and more 2021-04-11 03:49:47 +00:00
5cbdf1850c Fix travellers stuck in town
There was an off by one error in the code that negates the progress
along paths that are reversed.
2021-04-08 05:10:04 -06:00
54d0c0f098 Update the changelog 2021-04-07 17:38:09 -07:00
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
16871208f2 Add topographic option to map 2021-04-06 09:16:17 -07:00
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
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
60e2ed3e7d Added auto camera setting 2021-04-05 23:24:31 +01:00
4dde9f84b0 Merge branch 'huntertparks/fix-cursor-not-locking' into 'master'
Fixes #520 and #840 - locks cursor to screen when menu is not open

Closes #840 and #520

See merge request veloren/veloren!2069
2021-04-05 21:40:24 +00:00
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
7df0413be4 Fixes #520 and #840 - locks cursor to screen when menu is not open
Rather than lock the cursor to the middle of the screen, the cursor will
move to it's last known coordinates when a menu or the minimap is not
open.
2021-04-05 16:37:40 +02:00
b8c474057c More cheese is less cheese
Update CHANGELOG.md
fmt
Update crafting.rs
2021-04-05 13:40:12 +02:00
a1cfd9ea3c Make merchants spawn with stacks of stackable items. 2021-04-04 13:47:05 -04:00
78f130a3b2 Add a cheese counter in the bag display. 2021-04-04 11:14:25 -04:00
06bbb7f0ff Crafting Tabs and more item tags 2021-04-04 13:02:27 +00:00
6734198104 Adds on-hit combat sfx 2021-04-04 03:04:02 +00:00
Sam
9ad5b0f6b7 Changelog. Fixed a few qualities. 2021-04-02 23:04:36 -04:00
b7dbadc32f Add colors for buy/sell tooltips based on site prices. 2021-04-02 17:44:02 -04:00
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
3c19713e63 Merge branch 'zesterer/sprite-text' into 'master'
Added text prompts to sprites

See merge request veloren/veloren!2034
2021-03-30 11:41:14 +00:00
bed863c50c Added indicator text to terrain sprites 2021-03-30 01:04:23 +01:00
b0acbda236 Improved archery with feedback sfx and particles 2021-03-29 21:52:04 +01:00
b8ac90d049 Changelog, cleanup, clippy 2021-03-29 18:35:10 +02:00
5bf17779ec Updated changelog, fmt 2021-03-28 18:07:01 +01:00
40f2c59401 Reclassify Glowing Remains as Armor for econsim. 2021-03-28 10:29:40 -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
Sam
a5b7477e96 Added summon minions ability to mindflayer 2021-03-27 21:05:05 -04:00
b03a207957 Update CHANGELOG.md 2021-03-28 00:53:40 +00:00
79cc3af058 Merge branch 'swilliams/character-randomization-fix' into 'master'
Character Creation Randomization Fix

See merge request veloren/veloren!2004
2021-03-27 15:58:34 +00:00
9ca0388561 Character Creation Randomization Fix 2021-03-27 15:58:34 +00:00
7879466f32 Merge branch 'aweinstock/diamond-prices' into 'master'
Improve econsim's handling of diamond prices by lowering the implied homicide rate.

See merge request veloren/veloren!2005
2021-03-27 15:29:19 +00:00
4b62a99ed9 Improve econsim's handling of diamond prices by lowering the implied homicide rate. 2021-03-27 10:50:16 -04:00
21f794f84c Use Depot instead of Store for BuildArea 2021-03-27 07:54:02 -06:00
2b0c71bfca Remove internal feature from CHANGELOG.md 2021-03-26 06:29:23 -06:00
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
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
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
c4a6875133 Fix airships getting stuck in trees and campfires spawning too close to new-style dungeon stairs. 2021-03-24 15:42:37 -04:00
cfb55b4881 Add an additional kind of stairs to dungeons. 2021-03-23 18:17:00 -04:00
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
f2c01409a2 Merge branch 'sam/continuous-roll' into 'master'
Roll Tweaks

See merge request veloren/veloren!1975
2021-03-23 09:46:21 +00:00
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