6507 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Joshua Barretto	92bc0d98e5	Merge branch 'Quibble/boss-stairs-fix' into 'master' ... Fix #689 - dungeon without stairs to boss floor Closes #689 See merge request veloren/veloren!1781	2021-02-16 02:59:05 +00:00
Samuel Keiffer	9226d92cd1	Merge branch 'aweinstock/item-tags' into 'master' ... Implement tags for items, allowing a crafting recipe to take any item with that tag as input. See merge request veloren/veloren!1778	2021-02-16 01:05:54 +00:00
Avi Weinstock	d4907197b3	Implement tags for items, allowing a crafting recipe to take any item with that tag as input. ... - Added a recipe that turns any of the cloth equipment dropped by villagers into 1x cloth scraps. - Animate placeholder items for tagged crafting.	2021-02-16 01:05:54 +00:00
Lippy13	4a96334b4f	Fix #689 - dungeon without stairs to boss floor	2021-02-16 00:54:44 +00:00
Imbris	81d8b72822	Merge branch 'aweinstock/trade-implementation' into 'master' ... Aweinstock/trade implementation See merge request veloren/veloren!1775	2021-02-14 19:16:52 +00:00
Avi Weinstock	f86f22f0e8	MR 1775 review fixes. ... - Separate `invite` machinery from `group_manip` into it's own thing (includes renaming `group_invite` to `invite` where applicable). - Move some invite/trade machinery to `ControlEvent`. - Make `TradePhase` a proper enum instead of a bunch of bools. - Make `TradeId` a proper newtype. - Remove trades from `Trades` on accept (previously was only on decline). - Typo fixes/misc cleanup. - Add bullet point for trading to the changelog.	2021-02-14 11:13:56 -05:00
Avi Weinstock	a1176284d2	Polish trading implementation and address review comments. ... - Fix item swapping edge case - Document more assumptions/edge cases - fmt and clippy - s/ServerGeneral::GroupInvite/ServerGeneral::Invite/ - Use `Client::current` in `Client::is_dead`	2021-02-14 11:11:35 -05:00
Joshua Barretto	bf0c9b05ac	Merge branch 'snowram/fix-staicases-lights' into 'master' ... Fixes lights positions and orientations in staircases See merge request veloren/veloren!1776	2021-02-14 01:17:53 +00:00
Snowram	4200948407	Fixes lights positions and orientations in staircases	2021-02-13 22:27:37 +01:00
Avi Weinstock	7a37538f06	Implement actual inventory-manipulation part of trading server side.	2021-02-12 18:43:10 -05:00
Avi Weinstock	e0f4bb3dc6	Trade implementation progress. ... - Accept/decline buttons that submit the proper messages - A phase2 screen that renders the (item, quantity) pairs as text - More checks in the trade state machine server-side.	2021-02-12 18:43:10 -05:00
Avi Weinstock	2b9129d290	Implement enough of a trade UI that dragging & dropping items into it round-trips between clients.	2021-02-12 18:43:09 -05:00
Avi Weinstock	231c104355	Trade implementation progress. ... - Server messages now bring up the trade window. - When a trade is declined, it closes the window on both clients.	2021-02-12 18:43:09 -05:00
Avi Weinstock	b259acaa59	Trade implementation progress. ... - State machine for modifying trades. - ServerGeneral/ClientGeneral messages.	2021-02-12 18:43:09 -05:00
Avi Weinstock	94ef4a6917	Plumb trade requests through the group invite UI, such that they can be accepted/declined without impacting the counterparty's movement.	2021-02-12 18:43:09 -05:00
Avi Weinstock	9c62289cad	Initial draft of trade UI (creates a placeholder window that acts like crafting in terms of bringing up the bag, defaulting to the "r" key).	2021-02-12 18:43:09 -05:00
Snowram	5f1b8b1c50	Merge branch 'Sarrakitty/gliders' into 'master' ... Sarrakitty/gliders See merge request veloren/veloren!1771	2021-02-12 09:49:53 +00:00
Justin Shipsey	467174b0cc	Merge branch 'DaforLynx/crickets' into 'master' ... Makes crickect sfx more realistic, more varied, and temperature-based. See merge request veloren/veloren!1773	2021-02-12 00:54:43 +00:00
DaforLynx	2d71ca0f41	Added crickets blocktype, added 3 new cricket sounds, made crickets chirp consistently, made frogs more sporadic	2021-02-12 00:54:42 +00:00
Sarra	084acf6bf7	fit models, adjusted drop rates	2021-02-11 09:29:26 -05:00
Sarra	895679a128	tweaked a few things with the moth glider	2021-02-10 20:14:50 -05:00
Sarra	5942611db9	basic gliders	2021-02-10 19:02:36 -05:00
Sarra	331d9bf1c0	moth glider	2021-02-10 19:02:36 -05:00
Justin Shipsey	923c323ca1	Merge branch 'nward/chat-input-color-icon-rebased' into 'master' ... Rebase !1447 Chat input color and icon reflect channel message is sent to. See merge request veloren/veloren!1769	2021-02-10 19:42:59 +00:00
Quellus	22501ccf64	Rebase !1447 Chat input color and icon reflect channel message is sent to.	2021-02-10 19:42:59 +00:00
Imbris	1504ca1846	Merge branch 'Quibble/win-compile-fix' into 'master' ... Fix compile error under Windows See merge request veloren/veloren!1770	2021-02-10 05:52:56 +00:00
Imbris	93da46e1c1	Merge branch 'aweinstock/sort-crafting' into 'master' ... Crafting UI: sort items lexicographically by craftability and then alphabetically. See merge request veloren/veloren!1767	2021-02-10 04:04:42 +00:00
Lippy13	47d877b888	Fix compile error under Windows	2021-02-10 03:38:01 +00:00
Joshua Barretto	e995932fe3	Merge branch 'snowram/dungeon-lights' into 'master' ... Adds lights to dungeons See merge request veloren/veloren!1759	2021-02-10 02:01:46 +00:00
Avi Weinstock	e5eab42a17	Crafting UI: sort items lexicographically by craftability and then alphabetically.	2021-02-09 19:30:54 -05:00
Snowram	c5481e6c83	Refactor, addresses more comments	2021-02-10 00:34:37 +01:00
Snowram	509a71bdc7	Adresses some comments, various visual tweaks	2021-02-10 00:30:23 +01:00
Snowram	17fe9519b3	Adds lights to dungeons	2021-02-10 00:30:23 +01:00
Samuel Keiffer	30a1299ce4	Merge branch 'sam/better-inventory-loadout-swapping' into 'master' ... Restricts when players can change their loadout to non-attack states See merge request veloren/veloren!1761	2021-02-09 18:23:55 +00:00
Imbris	e80b2b1c6b	Merge branch 'update-native-dialog' into 'master' ... Update native_dialog to 0.5.2 See merge request veloren/veloren!1760	2021-02-09 00:30:38 +00:00
Sam	97153fc8e6	Changing main tool while in wield state moves character back to idle state.	2021-02-08 17:25:40 -05:00
Snowram	8944027eb1	Merge branch 'Sarrakitty/Small_fixes' into 'master' ... Sarrakitty/small fixes See merge request veloren/veloren!1764	2021-02-08 20:37:24 +00:00
Sarra Kitty	357fb8ad79	Sarrakitty/small fixes	2021-02-08 20:37:24 +00:00
Sam	7e3ec94207	Inventory manipulations are now only for input from the client, and are no longer directly sent as a server event. Slot manipulations do that instead.	2021-02-08 13:55:50 -05:00
Sam	d6ffb1cea5	Loadout manipulations now emit a separate event from client instead of hackily intercepting inventory manipulations in common.	2021-02-08 12:31:17 -05:00
Sam	7289ee89fa	Server events directly emitted in states now.	2021-02-08 12:01:48 -05:00
Sam	45be7dd64d	Eradicated clones	2021-02-08 12:01:48 -05:00
Sam	a7e43b760f	Extended what states inventory manipulations touching the loadout could affect.	2021-02-08 12:01:47 -05:00
Sam	b7496b438f	Inventory changes that modify the loadout now go through a control action instead of a control event.	2021-02-08 12:01:47 -05:00
Forest Anderson	f6a0360521	Merge branch 'angel/add-github-mirror-action' into 'master' ... Added Action that will mirror the Gitlab repo to Github See merge request veloren/veloren!1763	2021-02-08 15:50:50 +00:00
Forest Anderson	1bcdef613e	Added Action that will mirror the Gitlab repo to Github	2021-02-08 09:55:43 -05:00
Samuel Keiffer	2abb4ac472	Merge branch 'swilliams/mindflayer-loot-table' into 'master' ... Made Mindflayer drops exclusive to the Mindflayer. See merge request veloren/veloren!1762	2021-02-07 19:04:20 +00:00
Scott Williams	0799d7fd1f	Added a miniboss loot table for the stonework defender, made damaged bag, glider, and root of evil mindflayer exclusive drops.	2021-02-07 19:04:20 +00:00
Imbris	61a02c5527	Update native_dialog to 0.5.2	2021-02-07 00:48:57 -05:00
Samuel Keiffer	b9dc561199	Merge branch 'sam/fix-roll' into 'master' ... Fixes roll being free See merge request veloren/veloren!1757	2021-02-06 22:15:06 +00:00