2061 Commits

Author	SHA1	Message	Date
Snowram	eb98360183	Cockatrice bird_large conversion	2021-04-25 02:14:50 +02:00
Snowram	bc95484863	Swaps bird_small skeleton to a new bird_large	2021-04-25 02:14:49 +02:00
Ada Lovegirls	01c30868eb	Add option to load English string as fallback if string missing	2021-04-24 14:39:35 +00:00
Ben Wallis	c6205875ee	Merge branch 'xvar/server-version-check' into 'master' ... Added client/server version mismatch warnings See merge request veloren/veloren!2184	2021-04-24 09:05:45 +00:00
Ben Wallis	2e08c2f76f	Added client/server version mismatch message when a network error is encountered during client init. ... Added warning banner on character select when successfully connected to a server with a mismatched version.	2021-04-24 09:08:30 +01:00
holychowders	516f2fec4a	Fix grammatical error in NPC message	2021-04-23 22:43:37 -07:00
Illia Denysenko	4e7aba5b3f	update uk_UA localization	2021-04-23 21:30:46 +00:00
Nícolas Wildner	6188bb9e96	update pt_br 20210422	2021-04-23 01:00:41 +00:00
Monty Marz	b69eb61e7b	Add handles to lanterns, fix cooking pot scale	2021-04-22 17:12:07 +00:00
jshipsey	9d82b20891	remove 0.8, add snow's mixed_vel idea for other bodies	2021-04-22 00:04:39 -04:00
Joshua Barretto	19184a49a7	Made the pit of tartarus less bad	2021-04-21 22:18:44 +01:00
Joshua Barretto	81ba200e48	Improve dynamic light reflection for hill climbing	2021-04-21 17:10:53 +01:00
Ludvig Böklin	762c68cfbb	Basic fluid dynamics and physical properties for entities	2021-04-20 17:38:19 +02:00
Monty	a1b4e0bdaf	remove old craftsman hammer, add migration	2021-04-20 03:34:11 +02:00
Joshua Barretto	11ba02130c	Made sprite/block selection effect more subtle	2021-04-20 02:46:07 +02:00
Joshua Barretto	483276b082	Made sprite/block selection effect more subtle	2021-04-20 02:46:06 +02:00
Monty	a4d56e7843	more sprite stuff and crafting UI update ... fix item images fix CR display	2021-04-20 02:46:06 +02:00
Monty	a1fe7c12c3	fmt, add sprites	2021-04-20 02:46:04 +02:00
Joshua Barretto	5598d07944	Added crafting stations	2021-04-20 02:45:59 +02:00
Joshua Barretto	c5455fa1a1	Merge branch 'zesterer/small-fixes' into 'master' ... Small fixes See merge request veloren/veloren!2163	2021-04-19 21:54:26 +00:00
Joshua Barretto	4ad5257e40	Rebalanced mist	2021-04-19 22:26:56 +01:00
Joshua Barretto	86287e8f0a	Fixed negative cloud density bug	2021-04-19 22:02:47 +01:00
Imbris	8c9d4dc3dd	Merge branch 'capucho/inactive-master' into 'master' ... Lower volume of window on focus loss See merge request veloren/veloren!2150	2021-04-19 20:39:49 +00:00
Marcel	c5caec4921	Merge branch 'capucho/map-kb-zoom' into 'master' ... Add keybindings for map/minimap zoom See merge request veloren/veloren!2161	2021-04-19 19:52:27 +00:00
João Capucho	164411cb43	Voxygen: Added translations for map zoom	2021-04-19 20:27:02 +01:00
Marcel	3c3aa3d325	Merge branch 'juliancoffee/update-uk_UA' into 'master' ... Update localization for uk_UA See merge request veloren/veloren!2155	2021-04-19 19:26:20 +00:00
Illia Denysenko	ef8926bc5c	Update localization for uk_UA	2021-04-19 19:26:20 +00:00
João Capucho	f23b515dd8	Voxygen: Add master volume sliders to the settings	2021-04-19 19:58:14 +01:00
Joshua Barretto	f0f3da529b	Fixed water shader, sky shader	2021-04-19 14:42:49 +01:00
Sam	ce7581037c	Overhauled dash melee.	2021-04-18 18:36:12 -04:00
Joshua Barretto	cb817c0313	Merge branch 'zesterer/econ-tweaks' into 'master' ... Rebalanced economy somewhat See merge request veloren/veloren!2148	2021-04-18 21:20:49 +00:00
Samuel Keiffer	60d38cc03b	Merge branch 'aweinstock/dodgesplosion' into 'master' ... Unlock dodge roll iframes and staff explosion by default. See merge request veloren/veloren!2146	2021-04-18 20:46:15 +00:00
Avi Weinstock	0404250300	Unlock dodge roll iframes and staff explosion by default.	2021-04-18 16:16:06 -04:00
Marcel	62fcdcd998	Merge branch 'nwildner/update_pt_BR_20210417' into 'master' ... update pt_br 20210417 See merge request veloren/veloren!2143	2021-04-18 19:33:39 +00:00
Nícolas Wildner	24b55d0f07	update pt_br 20210417	2021-04-18 19:33:39 +00:00
Joshua Barretto	352fce239e	Allow trading items not sold by merchants	2021-04-18 20:07:00 +01:00
Joshua Barretto	cac9ac6807	Trading stock limits	2021-04-18 18:58:26 +01:00
Joshua Barretto	250733a123	Better price rationalisation	2021-04-18 18:11:00 +01:00
Joshua Barretto	c0b71d0731	Removed legendaries from trading	2021-04-18 17:29:22 +01:00
Joshua Barretto	11683084ad	Use labour value for prices	2021-04-18 17:05:14 +01:00
Joshua Barretto	fcc23a4427	Normalised prices within sites	2021-04-18 15:09:21 +01:00
Joshua Barretto	b72e454148	Rebalanced economy somewhat	2021-04-18 14:08:48 +01:00
Ben Wallis	a4cdb89987	Implemented inventory sorting	2021-04-17 22:04:08 +01:00
Marcel	2a0c8e575f	Merge branch 'kinggred-master-patch-80352' into 'master' ... Update main.ron See merge request veloren/veloren!2123	2021-04-17 18:28:31 +00:00
Samuel Keiffer	a1d9ba15d9	Merge branch 'DaforLynx/normalize' into 'master' ... Normalize + shrink all sfx; tweaks to combat music; change footstep sounds See merge request veloren/veloren!2120	2021-04-16 00:35:15 +00:00
DaforLynx	f441c8c206	Normalize + shrink all sfx; tweaks to combat music; change footstep sounds	2021-04-16 00:35:13 +00:00
Samuel Keiffer	c962c5f12e	Merge branch 'gGmMsS/Burning' into 'master' ... Added burning debuff for Staff M2 See merge request veloren/veloren!2134	2021-04-15 23:51:33 +00:00
Imbris	85ee4c8cd1	Merge branch 'aweinstock/server-authoritative-physics' into 'master' ... Aweinstock/server authoritative physics See merge request veloren/veloren!2126	2021-04-15 22:24:00 +00: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
Avi Weinstock	2fb7575d60	Address MR 2126 comments.	2021-04-15 15:17:39 -04:00
jshipsey	8f20d17c9a	attacking movement tweaks	2021-04-15 12:13:50 -04:00
jshipsey	896d2a5b63	combat tweaks	2021-04-15 11:43:52 -04:00
Avi Weinstock	50d0314a75	Add a toggle to negotiate the use of server-authoritative physics.	2021-04-15 08:50:17 -04:00
Sam	c88df846a7	Fixes animation parameters so a 2h weapon in the offhand slot doesn't look wonky.	2021-04-14 17:38:37 -04:00
Stanisław Grupiński	fd7bf41678	Update main.ron	2021-04-14 12:40:02 +00:00
jshipsey	161382d06a	changelog	2021-04-13 20:19:35 -04:00
jshipsey	ea9b871374	loot tables, clippy, animation tweaks	2021-04-13 20:18:59 -04:00
jshipsey	42460f7e65	spins, combos	2021-04-13 20:18:59 -04:00
jshipsey	529f8eb5a6	more setups. chargeswing/dash anims	2021-04-13 20:18:59 -04:00
jshipsey	9a26024acb	alpha attacks	2021-04-13 20:18:59 -04:00
jshipsey	b53e1653f6	initial wield testing	2021-04-13 20:18:58 -04:00
Marcel	4c23be44dd	Merge branch 'socherbyc/assets' into 'master' ... Updates the Brazilian Portuguese (pt-BR) translation See merge request veloren/veloren!2118	2021-04-13 17:24:45 +00:00
Yuri Socher Bichibichi	c6dea3acca	Updates the Brazilian Portuguese (pt-BR) translation	2021-04-13 11:56:58 -03:00
Vincent Foulon	a4bd47f340	Support quantity + use Enum for autocompletion + Address comments	2021-04-12 20:07:34 +02:00
Vincent Foulon	0692562533	New Command: "kit" + Removed Command: "debug" ... Update CHANGELOG.md Update CHANGELOG.md	2021-04-12 18:53:36 +02:00
Samuel Keiffer	e1020945dd	Merge branch 'aweinstock/combat-music' into 'master' ... Add combat music transitions based on number of enemies in player radius. See merge request veloren/veloren!2077	2021-04-12 06:01:19 +00:00
Marcel	e4a67a9ba2	Merge branch 'juliancoffee/update-uk_UA' into 'master' ... Update localization for Ukrainian See merge request veloren/veloren!2107	2021-04-12 02:28:56 +00:00
Illia Denysenko	4ac8015ed9	Update localization for Ukrainian	2021-04-12 02:28:55 +00:00
Avi Weinstock	df4f44d946	Address MR 2077 review comments.	2021-04-11 22:08:42 -04:00
Avi Weinstock	7c34a96934	Make fade timings configurable, and stop combat music on death.	2021-04-11 22:08:41 -04:00
Avi Weinstock	f1b022cdee	Add new version of combat soundtrack, and change details of how transitions between tracks work.	2021-04-11 22:08:41 -04:00
Avi Weinstock	5bfdd5f1af	Add combat music transitions based on number of enemies in player radius.	2021-04-11 22:08:40 -04:00
Marcel	54024ce401	Merge branch 'DaforLynx/more-music' into 'master' ... Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds See merge request veloren/veloren!2102	2021-04-12 00:43:08 +00:00
DaforLynx	9db290d4ea	Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds	2021-04-12 00:43:08 +00:00
Marcel	5e7adc6767	Merge branch 'trade-help-tooltips' into 'master' ... Show ctrl-click and shift-click usage in item tooltips during trades. See merge request veloren/veloren!2101	2021-04-11 22:56:03 +00:00
Rickey Chamblee	8a25ebb59a	Show ctrl-click and shift-click usage in item tooltips during trades.	2021-04-11 22:56:02 +00:00
Marcel	d7a9ab7e23	Merge branch 'master' into 'master' ... Update and fix zh_CN See merge request veloren/veloren!2103	2021-04-11 22:56:00 +00:00
law4x	4403cd71a5	Update and fix zh_CN	2021-04-11 22:55:59 +00:00
Marcel	eca27a30b5	Merge branch 'danielduel/PL-local' into 'master' ... Add/Extend PL locale See merge request veloren/veloren!2091	2021-04-11 22:55:58 +00:00
BuildTools	c4294d968d	Add/modify Polish translations	2021-04-11 19:10:09 +02:00
Vincent Foulon	a2e92c6715	add new loader + move some images	2021-04-11 16:35:25 +02:00
Snowram	52a53963ec	Lossless compression of UI assets	2021-04-11 16:35:25 +02:00
Vincent Foulon	95f69fea36	remove unused images	2021-04-11 16:35:23 +02:00
Vincent Foulon	2097fbcacd	optimized all images	2021-04-11 16:35:23 +02:00
Vincent Foulon	7128c3d3f6	Asset reorganization + removed some unused and duplicates + reduce size of some images	2021-04-11 16:35:17 +02:00
Monty Marz	6772e71aaa	UI fixes and more	2021-04-11 03:49:47 +00:00
Marcel	99e494976d	Merge branch 'ccm7676/lang_bug_fix' into 'master' ... fixed the Select a Language text on languages where it was broken See merge request veloren/veloren!2089	2021-04-10 15:47:28 +00:00
Marcel	e6683bb764	Merge branch 'juliancoffee/uk_UA-localizaion' into 'master' ... Update localization files for Ukrainian See merge request veloren/veloren!2090	2021-04-10 14:54:13 +00:00
Illia Denysenko	4717ad25a8	Update localization files for Ukrainian	2021-04-10 14:54:12 +00:00
Marcel	12c3ee440e	Merge branch 'MigraineX/update-es-ES' into 'master' ... Updated the Spanish (ES) translation See merge request veloren/veloren!2094	2021-04-10 14:20:40 +00:00
MigraineX	07fd6f16f8	Updated the Spanish (ES) translation	2021-04-10 14:31:57 +02:00
Joshua Yanovski	af94753ad9	Remove panics and unwraps, part 1. ... Also fixes various other miscellaneous bugs.	2021-04-10 10:03:21 +02:00
Carl Marino	d2151ad76c	fixed the Select a Language text on languages where it was broken	2021-04-09 18:39:53 +02: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
Vincent Foulon	5e23c164e6	Add missing translations + Add "enemy_killed" text for villagers	2021-04-07 13:26:15 +02:00
James Melkonian	16871208f2	Add topographic option to map	2021-04-06 09:16:17 -07:00
Marcel	187a85e056	Merge branch 'renamenorsk_norskbokmål' into 'master' ... Rename Norsk to Norsk bokmål See merge request veloren/veloren!2064	2021-04-06 11:37:54 +00:00
Kim André Moen Bjørkede	2380f9e8c2	Rename Norsk to Norsk bokmål	2021-04-06 11:37:51 +00:00
Marcel	2ed85a2dc0	Merge branch 'tonyvu0605/VietTranslation' into 'master' ... Started Vietnamese Translation See merge request veloren/veloren!2059	2021-04-06 10:48:03 +00: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
Samuel Keiffer	3c50321a80	Merge branch 'sam/consolidate-roll' into 'master' ... Flattened roll progression. See merge request veloren/veloren!2073	2021-04-06 03:31:46 +00:00
Samuel Keiffer	f79493f7d0	Merge branch 'sam/sceptre-nerfs' into 'master' ... Sam/sceptre nerfs See merge request veloren/veloren!2072	2021-04-06 02:41:56 +00:00
Joshua Barretto	60e2ed3e7d	Added auto camera setting	2021-04-05 23:24:31 +01:00
Sam	ba0b6c309b	Flattened roll progression.	2021-04-05 17:50:53 -04:00
Sam	a7e39bc8c9	Nerfs	2021-04-05 17:38:52 -04:00
theCow61	b99c02401d	Change to auto walk/glide.	2021-04-05 16:07:17 -05:00
Marcel	88079cfd30	Merge branch 'japanese' into 'master' ... Add Japanese message translation See merge request veloren/veloren!2049	2021-04-05 13:38:30 +00:00
Monty Marz	06bbb7f0ff	Crafting Tabs and more item tags	2021-04-04 13:02:27 +00:00
DaforLynx	6734198104	Adds on-hit combat sfx	2021-04-04 03:04:02 +00:00
tonyvu0605	e0dbd5566d	Started Vietnamese Translation	2021-04-03 22:17:57 -04:00
Samuel Keiffer	8d9f63404e	Merge branch 'sam/combat-ratings' into 'master' ... Tweaks to Combat Rating Calculation See merge request veloren/veloren!2051	2021-04-03 17:33:34 +00:00
Sam	ca1a93ba21	Actually committed bone staff fix.	2021-04-03 10:26:32 -04:00
Justin Shipsey	debf88e42f	Merge branch 'vfoulon80/refine-item-icons' into 'master' ... Refine some item icons See merge request veloren/veloren!2045	2021-04-03 11:19:36 +00:00
Snowram	9a3f6d8261	Substitutes DPS for CR in item tooltip	2021-04-03 00:10:31 -04:00
Sam	27f178286d	Removed all rng matches in code to determine loot tables, and moved to loot tables specific for each sprite, creature, or dungeon.	2021-04-02 23:24:55 -04:00
Sam	9ad5b0f6b7	Changelog. Fixed a few qualities.	2021-04-02 23:04:36 -04:00
Sam	7c8242b5b1	Added unit test to validate contents of loot tables.	2021-04-02 23:04:35 -04:00
Sam	c8b8cd436e	Made item prices sane.	2021-04-02 23:04:34 -04:00
Sam	7eb1eefa13	Re-created item_price_calculation with new loot tables.	2021-04-02 23:04:34 -04:00
Sam	a2906168a6	Moved materials into their own loot tables.	2021-04-02 23:04:33 -04:00
Sam	cb638180f8	Moved food items into their own loot tables.	2021-04-02 23:04:32 -04:00
Sam	31e69021cb	Switched loot tables from declaring each weapon individually to just referencing a different loot table.	2021-04-02 23:04:31 -04:00
Sam	67916b44a7	Staff weapon tiering shuffle.	2021-04-02 23:04:30 -04:00
Sam	a2fc2abf83	Made staff and sceptre balancing sane. Created loot tables for staffs and sceptres.	2021-04-02 23:04:30 -04:00
Sam	2e37cefce5	Created weapon loot tables.	2021-04-02 23:04:29 -04:00
Sam	833f1f3309	Converted all armor in loot tables to reference armor set loot tables.	2021-04-02 23:04:28 -04:00
Sam	96b354c178	Consolidated loot tables by switching to CreatureMaterial where possible	2021-04-02 23:04:27 -04:00
Sam	247004d180	Loot tables can now recursively specify loot tables. Mercahnts broken.	2021-04-02 23:04:25 -04:00
Jun NOGATA	129a3de2eb	Add Japanese message translation	2021-04-03 01:50:10 +09:00
Vincent Foulon	62b2ad80fb	Refine Sewing Set	2021-04-02 18:19:39 +02:00
Vincent Foulon	49be1fd70c	Refine some item icons	2021-04-01 21:46:57 +02:00
Vincent Foulon	dcde8df365	address review comments	2021-04-01 19:13:08 +02:00
Vincent Foulon	c2a8feada5	Add dialogue when the Merchant is busy and randomize some trading dialogues	2021-03-31 19:06:41 +02:00
Snowram	4128f7fe45	Merge branch 'snowram/new-weapons-fix' into 'master' ... Fix a staff icon, some offset fixes, lower wolf spawn rate See merge request veloren/veloren!2025	2021-03-30 01:04:37 +00:00
Joshua Barretto	92afdaf423	Merge branch 'zesterer/small-fixes' into 'master' ... Bow improvements See merge request veloren/veloren!2032	2021-03-30 00:16:45 +00:00
Snowram	606dd64741	Fix a staff icon, some offset fixes, lower wolf spawn rate	2021-03-30 00:27:03 +02:00
Samuel Keiffer	12ec46c572	Merge branch 'sam/mindflayer-balancing' into 'master' ... Mindflayer balance tweaks. See merge request veloren/veloren!2031	2021-03-29 21:05:49 +00:00
Joshua Barretto	8f3233365d	Improved hit particles	2021-03-29 21:52:05 +01:00
Joshua Barretto	b0acbda236	Improved archery with feedback sfx and particles	2021-03-29 21:52:04 +01:00
Snowram	6adaac8106	Addresses comments	2021-03-29 18:35:12 +02:00
Snowram	b8ac90d049	Changelog, cleanup, clippy	2021-03-29 18:35:10 +02:00
Snowram	508e35ca17	Add several new i18n lines	2021-03-29 18:34:45 +02:00
Snowram	2c09180189	Set the item tooltip for every bag slots	2021-03-29 18:34:45 +02:00
Snowram	aa71dcb9c7	Make the new tooltip item specific	2021-03-29 18:34:45 +02:00
Sam	71ba9b6a54	Mindflayer balance tweaks.	2021-03-29 10:44:46 -04:00
Sam	f6e4626887	Fix emerald sceptre. Remove duplicate asset.	2021-03-28 21:19:01 -04:00
Snowram	c8e191e138	Merge branch 'snowram/new-scepters-starves' into 'master' ... Add new batch of starves and scepter (by Gemu) See merge request veloren/veloren!2022	2021-03-29 00:08:19 +00:00
Snowram	5295894105	Add new batch of starves and scepter (by Gemu)	2021-03-29 01:27:55 +02:00
Joshua Barretto	b660c53b4c	Revert to old sky colours for no clouds	2021-03-28 17:07:41 +01:00
Joshua Barretto	34a7667410	Toned down aurora	2021-03-28 17:07:41 +01:00
Treeco	ab596d2ae8	New default world map, default continent scale doubled	2021-03-28 17:07:38 +01:00
Joshua Barretto	f16c2b8b4c	Made clouds adjust to world dimensions correctly	2021-03-28 17:02:17 +01:00
Joshua Barretto	d8117b3b3d	Make caves and rtsim entities scale with map size, more cloud detail	2021-03-28 17:02:16 +01:00
Joshua Barretto	0bed52f63c	Properly simulate atmospheric scattering	2021-03-28 17:01:53 +01:00
Joshua Barretto	d53042c852	Client-side time of day interpolation	2021-03-28 17:01:53 +01:00
Joshua Barretto	19ef00085d	Softer and faster clouds with more verticality	2021-03-28 17:01:51 +01:00
Scott Williams	ef43d29627	Fix husk drops in miniboss rooms.	2021-03-28 10:39:20 +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
Monty	345ef1ca22	decay display for groups and overhead bars	2021-03-27 21:05:17 -04:00
jshipsey	558c82ee54	flayer anims	2021-03-27 21:05:16 -04:00
Sam	b0b114a7f8	Balance tweaks	2021-03-27 21:05:15 -04:00
Monty Marz	345b725478	decayed health texture	2021-03-27 21:05:14 -04:00
Monty Marz	cc70560027	WIP animation	2021-03-27 21:05:13 -04:00
Sam	1edf79d109	Moved all legendaries to mindflayer loot table.	2021-03-27 21:05:12 -04:00
Sam	6c611d632a	Mindflayer now only summons minions at set thresholds of health.	2021-03-27 21:05:11 -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	8e4aeff705	Improved mindflayer AI. Tweake some abilities.	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
Marcel	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
Scott Williams	9ca0388561	Character Creation Randomization Fix	2021-03-27 15:58:34 +00:00
Avi Weinstock	4b62a99ed9	Improve econsim's handling of diamond prices by lowering the implied homicide rate.	2021-03-27 10:50:16 -04: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	aa9180b20f	Moved rugged armour to cloth_item	2021-03-26 16:51:43 +00:00
Scott Williams	d35475eaef	Added leather scraps recipe	2021-03-26 16:44:38 +00:00
aljazerzen	0ea102dc9c	refactor handling of duplicate login	2021-03-25 12:33:56 +01:00
Lippy13	ff2583b3b9	Add missing seashells to the sprite manifest	2021-03-25 04:37:27 +00:00
Avi Weinstock	4ec6b43693	Add a vertical camera clamp option and toggle to voxygen.	2021-03-23 18:22:32 -04:00
Samuel Keiffer	8ed7da7c49	Merge branch 'master' into 'master' ... Update short_1.ron to make eligible for cloth scrap recipe See merge request veloren/veloren!1981	2021-03-23 19:29:56 +00:00
steanne	818aaed32a	Update short_1.ron to make eligible for cloth scrap recipe	2021-03-23 18:16:30 +00:00
Sam	31f4ef684d	Tweaked numbers	2021-03-22 17:26:55 -04: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
Joshua Barretto	6690854687	Merge branch 'zesterer/better-particle-emission' into 'master' ... Smoother particle emission for moving objects See merge request veloren/veloren!1965	2021-03-22 06:15:20 +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	f9612c1c26	Made pickaxe obtainable	2021-03-22 00:24:07 +00: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
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
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	985c26dd0a	improve climbing icon	2021-03-21 13:26:44 +01:00
Vincent Foulon	71d3bf5821	fix typo in sceptre aura skill	2021-03-20 22:12:43 +01:00
Sam	c8c368adec	Rebalanced a few stats	2021-03-20 16:28:03 -04:00
Vincent Foulon	8ef30dd2f3	fix one line from custist_alarm vector	2021-03-20 20:53:27 +01:00
Vincent Foulon	d4fbc78d06	Translate cultist_alarm in FR	2021-03-20 17:37:59 +01:00
Vincent Foulon	d0aa68a9d2	Add climbing speed and cost	2021-03-20 17:17:28 +01:00
Snowram	cb3bf0c884	Fix a missing dwarf hairstyle	2021-03-19 12:45:08 +01:00
Snowram	e5afb2fcf7	Various visual fixes	2021-03-18 22:53:06 +01:00
Sarra	eaaf65127d	cleaning up some tools	2021-03-18 22:52:50 +01:00
Sarra	d1e16a2a00	tweaking glow and shine	2021-03-18 22:52:40 +01:00
Marcel	9c95e971f2	Merge branch 'vfoulon80/loading-animations' into 'master' ... Add new random loading animations See merge request veloren/veloren!1931	2021-03-18 02:28:34 +00:00
DaforLynx	fbf4defa04	Adds sfx for Sceptre aura	2021-03-17 23:54:49 +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
Marcel	6e6878ca9e	Merge branch 'tormeh/add-monologue-strings' into 'master' ... Add monologue strings. See merge request veloren/veloren!1925	2021-03-17 08:45:27 +00:00
Marcel	684789c886	Merge branch 'vfoulon80/fr-skills' into 'master' ... [FR] translate skills.ron + missing keys See merge request veloren/veloren!1901	2021-03-17 01:25:12 +00:00
Vincent Foulon	6b0028907d	[FR] translate skills.ron + missing keys	2021-03-17 01:25:11 +00:00
Tormod G. Hellen	f695b11171	Add monologue strings.	2021-03-17 01:58:12 +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	f679103041	Merge branch 'sam/nerfs' into 'master' ... Nerfs See merge request veloren/veloren!1922	2021-03-16 22:22:04 +00:00
James Melkonian	6ea43cfd75	Various RtSim and Agent Interaction Fixes	2021-03-16 01:30:35 +00:00
Marcel	ad49318a63	Merge branch 'sam/explosion-fix' into 'master' ... Explosions now take into account hitbox of entity. See merge request veloren/veloren!1905	2021-03-15 22:26:28 +00:00
Sam	1b2a62d5a8	Nerfs	2021-03-15 17:36:58 -04:00
Sam	0576e30b9e	Nerfed aura	2021-03-15 14:23:28 -04:00
Sam	461ad6e339	Rebalanced explosion strengths	2021-03-15 00:36:07 -04:00
Joshua Barretto	5bc9f894ab	Fixed airship manifest offset	2021-03-14 23:17:29 -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	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
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	21e6f4797c	Primary ability fully functional.	2021-03-14 17:26:53 -04:00
DaforLynx	f924e047ac	Renamed 'Upscale Factor' to 'Internal Resolution' as per what was decided in #981	2021-03-14 12:18:29 -07: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
DaforLynx	99261bf105	Many small changes to audio code, mainly sfx - changelog in MR	2021-03-12 15:00:09 -08:00
Sam	803e42cc01	Fixed broken weapon.	2021-03-12 11:00:54 -05:00
jshipsey	49f496e290	intitial values	2021-03-12 00:58:12 -05:00
Sam	66181a7f8c	Rebalanced crit stats	2021-03-11 20:30:15 -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
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
omm	ef7b215f07	File structure for lang es_ES aligned with EN	2021-03-11 12:08:37 +00:00
Joshua Barretto	d1b58ebb36	More reflective weapons	2021-03-10 18:59:04 +00:00
Joshua Barretto	09e32cb952	Initial implementation of glow/shininess	2021-03-10 18:58:25 +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	d711c77468	Aura particles.	2021-03-09 17:59:45 -05:00
Monty Marz	935aec743d	cleanup, icons	2021-03-09 17:59:45 -05:00
Sam	cb1b26d717	Beam particle tweaks	2021-03-09 17:59:43 -05:00
Monty	49fcd6ee13	adjusted combo counter anim	2021-03-09 17:59:43 -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	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
Marcel	ee0ab197da	Merge branch 'updated_spanish_es_strings' into 'master' ... Updated strings Added missing translations in Spanish es_ES and retrieving localized text See merge request veloren/veloren!1866	2021-03-09 12:59:03 +00:00
tukilo	cea895ea24	Updated strings Added missing translations in Spanish es_ES and retrieving localized text	2021-03-09 12:30:53 +01:00
Avi Weinstock	d8f0a1c426	Add critical chance and critical multiplier stats to weapons.	2021-03-08 23:27:25 -05:00
Adam Blanchet	16b66f9cd6	Add reset button to graphics settings	2021-03-08 18:48:38 +01:00
Marcel	e29964ead1	Merge branch 'sarrakitty/fireworks' into 'master' ... added a white firework See merge request veloren/veloren!1856	2021-03-07 18:37:35 +00:00
Joshua Barretto	36d20e6990	Better docs, faster terrain meshing	2021-03-07 14:25:07 +00:00
Joshua Barretto	9910398917	Fixed snow biome trees	2021-03-07 14:25:07 +00:00
Joshua Barretto	0cbdc2b1b7	Better tree names	2021-03-07 14:25:07 +00:00
Joshua Barretto	db573f6b2d	Turn giant trees into proper sites	2021-03-07 14:25:07 +00:00
Monty	b6ac4e46fb	tree icon UI works and hover icon	2021-03-07 14:25:07 +00:00
Joshua Barretto	a54a3da102	Added tree map icon	2021-03-07 14:25:05 +00:00
Joshua Barretto	d4ce69df99	Static light flickering	2021-03-07 14:25:02 +00:00
Joshua Barretto	1d16f14dd5	Small fixes	2021-03-07 14:25:02 +00:00
Joshua Barretto	331375fd8f	Adjusted static lighting	2021-03-07 14:25:02 +00:00
Joshua Barretto	fe2479ee4c	Better LoD water prediction	2021-03-07 14:25:01 +00:00
Monty	8214c9df82	PoI icon	2021-03-07 14:25:01 +00:00
Joshua Barretto	31832e1245	Fixed wall leaking with dynamic light ambiance	2021-03-07 14:25:01 +00:00
Joshua Barretto	aabe1d7cfd	Point light ambiance for less harsh shadows	2021-03-07 14:25:01 +00:00
Joshua Barretto	100cafa91b	Directional baked lights for figures	2021-03-07 14:25:01 +00:00
Joshua Barretto	0c302bb020	Lanterns in trees	2021-03-07 14:25:01 +00:00
Joshua Barretto	185b1c3053	Specialised giant trees	2021-03-07 14:25:01 +00:00
Joshua Barretto	7d526da735	Experimental giant mother trees	2021-03-07 14:25:01 +00:00
Sarra	db3bc1b9bb	added a white firework	2021-03-07 03:48:50 -05:00
Imbris	575301c763	Merge branch 'Quibble/item-buff-tooltips' into 'master' ... Tooltips use item stats for buff information See merge request veloren/veloren!1820	2021-03-05 22:00:24 +00:00
Imbris	e724ac072e	Merge branch 'sarrakitty/fireworks' into 'master' ... made firework explosions colorful See merge request veloren/veloren!1851	2021-03-05 17:48:56 +00:00
Snowram	e2d4799f7d	Merge branch 'vfoulon80/convert-fr-translations' into 'master' ... Split the french translation into multiple files See merge request veloren/veloren!1672	2021-03-05 12:23:08 +00:00
Vincent Foulon	6e66cecce7	Split the french translation into multiple files	2021-03-05 12:23:08 +00:00
Sarra	4284ce0411	made firework explosions colorful	2021-03-05 01:22:29 -05:00
Marcel	cb305536e8	Merge branch 'vfoulon80/skilltree-icons' into 'master' ... implement the new skilltree icons See merge request veloren/veloren!1794	2021-03-04 18:37:33 +00:00
Vincent Foulon	fb953cc7f4	implement the new skilltree icons	2021-03-04 18:37:32 +00:00
Sam	39a580b5ee	Added test that all items are properly formatted and valid. Fixed items that were broken.	2021-03-03 16:45:36 -05:00
Sam	ae856edb31	Fixed debug back armor. Removed leather_3 item.	2021-03-03 15:05:51 -05:00
Lippy13	43c35f957f	Remove buff information from item description text	2021-03-03 00:25:12 +00:00
Snowram	2b7b9f887b	Fixes leather sets	2021-03-02 19:28:29 +01:00
Tadabito	f75f36a2c5	update cloth item tag to fix panic during crafting	2021-03-02 10:31:21 +00:00
Justin Shipsey	9ad8804b60	Merge branch 'armor-org' into 'master' ... armor org See merge request veloren/veloren!1835	2021-03-02 01:29:46 +00:00
jshipsey	308045cfc9	final asset corrections, fix glider anim	2021-03-01 17:37:47 -05:00
heydabop	bfc82f7236	Fixes #974 - convert tool/weapon equip time to floating point seconds	2021-03-01 15:06:39 -06:00
Sam	f304fe0f10	Fix a few asset paths for armors.	2021-03-01 00:58:43 -05:00
Samuel Keiffer	0497a437a4	Merge branch 'sam/invulnerability-buff' into 'master' ... Invulnerability Buff Closes #965 See merge request veloren/veloren!1834	2021-03-01 05:46:46 +00:00
Sam	7e34f1225f	Migration for armor re-organization.	2021-03-01 00:42:35 -05:00
jshipsey	8944115f8e	more asset organization	2021-02-28 22:18:43 -05:00
Samuel Keiffer	537efdd47e	Merge branch 'aweinstock/trade-requestitem' into 'master' ... During a trade, allow requesting items from the counterparty's inventory... See merge request veloren/veloren!1829	2021-03-01 02:39:36 +00:00
Sam	6ab4e2264e	Buff icon	2021-02-28 17:31:35 -05:00
Sam	531c38c3ad	Factored formatting of buff text out to a single function.	2021-02-28 16:04:33 -05:00
Imbris	b7bd0306e6	Merge branch 'Lerg/Issue_#976' into 'master' ... Issue #976 Some inputs are missing the ability to be rebound See merge request veloren/veloren!1832	2021-02-28 18:23:30 +00:00
Justin Shipsey	13df691f69	Merge branch 'heydabop/966-controller-y-invert' into 'master' ... #966 - Setting to invert controller Y axis See merge request veloren/veloren!1817	2021-02-28 18:02:04 +00:00
Lerg	94bd1f2605	Issue #976 Some inputs are missing the ability to be rebound because they are missing from the input iterator	2021-02-28 19:02:32 +03:00
Avi Weinstock	7e458ecd40	During a trade, allow requesting items from the counterparty's inventory (prequisite for NPC trading).	2021-02-28 10:13:49 -05:00
jshipsey	1a1020342e	re-org armor, common	2021-02-27 22:02:05 -05:00
Monty Marz	e5273e3a8e	reroute the F1 key to open the controls settings, removed loading screen tips about levels and the stats button	2021-02-27 19:02:26 +00:00
jshipsey	16720a6826	weapon/manifest tweaks	2021-02-27 10:44:55 -05:00
Sam	238fcaf5f1	Particle rebase fixes	2021-02-27 01:42:47 -05:00
jshipsey	0a353576dc	address comments	2021-02-27 01:42:47 -05:00
Snowram	17112926e7	Adds harvester npc	2021-02-27 01:42:47 -05:00
jshipsey	51bc74b2a5	visual weapon variation, adjust minotaur dash, keyframed golem quake	2021-02-27 01:42:47 -05:00
jshipsey	16a44cd532	minotaur moves, added claygolem	2021-02-27 01:42:47 -05:00
jshipsey	417f4638ed	balance pass 2	2021-02-27 01:42:47 -05:00
jshipsey	79ec9115f5	rebase, yeti in dungeon	2021-02-27 01:42:47 -05:00
jshipsey	e06ebf3507	initial balance	2021-02-27 01:42:47 -05:00
Snowram	858fbe1a6c	Adds yeti npc	2021-02-27 01:42:46 -05:00
jshipsey	30af3a4493	dash, spin, jump changes	2021-02-27 01:42:46 -05:00
Snowram	1b9815dc34	Adds 3 new npcs, tusk ram new design	2021-02-27 01:42:46 -05:00
Sam	53b0ba286a	Ice particles for Wendigo	2021-02-27 01:42:46 -05:00
jshipsey	ce3b2141e1	theropod retrofit, some more moves	2021-02-27 01:42:46 -05:00
jshipsey	5792faa992	some new moves, combine biped weapons into one file	2021-02-27 01:42:46 -05:00
jshipsey	57d5e90ddd	full bipedsmall armor swaps	2021-02-27 01:42:46 -05:00
Sam	df70976ff5	Fixed particles.	2021-02-27 01:42:46 -05:00
jshipsey	cb59c8017e	anim tweaks, more loadout setup	2021-02-27 01:42:46 -05:00
jshipsey	130d51786a	golem retrofit	2021-02-27 01:42:46 -05:00
Timo Kösters	a4513fe09d	Improve particles	2021-02-27 01:42:46 -05:00
jshipsey	952a77f94d	speedier weapons initial testing	2021-02-27 01:42:45 -05:00
jshipsey	aa4237b019	BL improvements, various fixes	2021-02-27 01:42:45 -05:00
jshipsey	e4e25e20c9	rebase	2021-02-27 01:42:45 -05:00
jshipsey	0dc8b2e482	rendering	2021-02-27 01:42:45 -05:00
jshipsey	ca3248cc93	new dungeon setups, new npcs, weapon specific loadouts, anims	2021-02-27 01:42:45 -05:00
jshipsey	ac16a8900d	bow	2021-02-27 01:42:45 -05:00
jshipsey	66664f3f89	the stabs	2021-02-27 01:42:45 -05:00
jshipsey	6a57dd25d0	wielding	2021-02-27 01:42:45 -05:00
jshipsey	31208e29ee	run anim tweaks	2021-02-27 01:42:45 -05:00
unknown	559ece5ede	More npcs work	2021-02-27 01:42:45 -05:00
unknown	6f18d16aa2	Add new quadmeds npcs with rough offsets	2021-02-27 01:42:44 -05:00
Snowram	f48fea57f4	Sahagin, Adlet npcs	2021-02-27 01:42:43 -05:00
jshipsey	7cf723bb9d	gnome	2021-02-27 01:42:43 -05:00
jshipsey	266986626d	biped_small setup	2021-02-27 01:42:43 -05:00
Snowram	1172c2f2c3	Merge branch 'Sarrakitty/OceanFlora' into 'master' ... added coral reefs, kelp forests, and seagrass See merge request veloren/veloren!1819	2021-02-27 01:52:33 +00:00
Sarra	02eb76416f	tweaking coral models and seagrass spawns	2021-02-25 23:39:41 -05:00
Samuel Keiffer	8e07174c1d	Merge branch 'aweinstock/coin-item' into 'master' ... Add a coin item and make amounts visible on dropped items. See merge request veloren/veloren!1821	2021-02-26 04:17:12 +00:00
Samuel Keiffer	6af9e58965	Merge branch 'add-gemu-models' into 'master' ... Add sword and bow models from backlog See merge request veloren/veloren!1818	2021-02-26 02:59:51 +00:00
Avi Weinstock	7d2e8f72eb	Add a coin item and make amounts visible on dropped items.	2021-02-25 21:31:30 -05:00
Sarra	1d4b8d4d99	correcting formatting and removing commented out code that wasn't supposed to be there	2021-02-25 20:41:57 -05:00
Snowram	2bab3cdced	Fixes weapons model and icon offsets	2021-02-26 02:37:59 +01:00
Samuel Keiffer	00937a4e8b	Merge branch 'aweinstock/modularforms' into 'master' ... Support modular weapon components made from a tagged material using the material as a multiplier. See merge request veloren/veloren!1815	2021-02-26 00:53:02 +00:00
Avi Weinstock	e1484c28c0	Finish plumbing MaterialStatsManifest. Fix issue with speed clamping when recursing through components. Improve statblocks in item tooltips.	2021-02-25 15:26:49 -05:00
Sarra	f39f5ab5d3	added coral reefs, kelp forests, and seagrass	2021-02-25 05:33:18 -05:00
Sam	017e037e69	Weapon offsets in humanoid manifest	2021-02-24 21:52:32 -05:00
Sam	b0b4a07b9e	Bows	2021-02-24 20:37:43 -05:00
Sam	84a5b3dcc5	Axes	2021-02-24 19:11:41 -05:00
Sam	ee5c9d78ca	Swords	2021-02-24 18:54:06 -05:00
heydabop	d4e3a3f29f	#966 - Add setting to invert controller camera Y axis	2021-02-24 10:39:44 -06:00
Snowram	914266c705	Merge branch 'nwildner/pt_BR_trade-updates' into 'master' ... pt br trade updates See merge request veloren/veloren!1810	2021-02-23 23:21:30 +00:00
Nícolas Wildner	e4f8a9ed6c	pt br trade updates	2021-02-23 23:21:30 +00:00
Avi Weinstock	78014d7d3b	Put material stats in their own manifest, and multiply a form's stats by the weighted average of the material multipliers.	2021-02-23 15:49:34 -05:00
Avi Weinstock	4e57678f34	Support modular weapon components made from a tagged material using the material as a multiplier.	2021-02-23 15:31:51 -05:00
Snowram	14c252d8b2	Merge branch 'snowram/turret' into 'master' ... Object animation, beam fixes, turret implementation See merge request veloren/veloren!1805	2021-02-23 20:16:56 +00:00
Imbris	f33d3873b4	Merge branch 'aweinstock/modular-weapon-rigging' into 'master' ... Support modular weapon voxel meshes being made by assembling their components. See merge request veloren/veloren!1806	2021-02-23 00:45:26 +00:00
Avi Weinstock	c3ac8a1b51	Support modular weapon voxel meshes being made by assembling their components.	2021-02-23 00:45:26 +00:00
Marcel	6081ebbe15	Merge branch 'sam/ecs-sys-struct' into 'master' ... Sam/ecs sys struct See merge request veloren/veloren!1813	2021-02-23 00:08:09 +00:00
Marcel	72bd0f42fc	Merge branch 'xMAC94x/prot_improvements' into 'master' ... xMAC94x/prot_improvements See merge request veloren/veloren!1796	2021-02-22 22:47:43 +00:00
Justin Shipsey	56f8e66d5d	Merge branch 'steanne-master-patch-91284' into 'master' ... Update _manifest.ron for minor typos in villager statements See merge request veloren/veloren!1807	2021-02-22 22:10:38 +00:00
Sam	2b5120319d	Character behavior system now uses immutable data struct	2021-02-22 15:30:53 -05:00
Snowram	684961b15c	Adds look_dir to anims, humanoid heads pivot fixes	2021-02-22 20:00:06 +01:00
Marcel Märtens	3f5c64bec0	Client::new can now resolve DNS requests, better networking error messages	2021-02-22 17:35:19 +01:00
steanne	838a0d8928	Update _manifest.ron for minor typos in villager statements	2021-02-22 00:04:02 +00:00
Snowram	4078eeb877	Various fixes to object animation, cleanup	2021-02-21 19:56:46 +01:00
Snowram	f25b2b1500	Various fixes to beam, body based interp	2021-02-21 19:17:56 +01:00
Snowram	e7bbf3981d	Object animation	2021-02-21 19:17:44 +01:00
Snowram	775224983b	Initial turret implementation	2021-02-21 18:23:54 +01:00
Sam	f5a74b4f33	Removed duplicate possess stick	2021-02-20 17:12:27 -05:00
Avi Weinstock	8bdbf4f7c9	Implement modular weapons. ... - Add ItemKind::ModularComponent, Item::components. - Add tool::StatKind::{Direct,Modular} for the modular weapons themselves. - Move ItemConfig from ItemDesc to Item, so components' stats can be taken into account. - Crafting stores into the components field. - Components/recipes/placeholders are created dynamically. - Show which components a modular weapon contains in the tooltip in voxygen. Squashed fixes: - `Item::duplicate` components in `Item::new_from_item_def`. - Speed of 1.0 for now.	2021-02-20 14:30:39 -05:00
Samuel Keiffer	479cf9fc4e	Merge branch 'sam/dual-wielding' into 'master' ... Dual wielding backend See merge request veloren/veloren!1787	2021-02-20 05:12:17 +00:00
Sam	eaf3e02e39	Addressed comments ... Fixed audio test	2021-02-19 19:55:23 -05:00
Sam	cfadd6da04	Added 1h swords.	2021-02-19 19:33:26 -05:00
Sam	d5ccc33abc	Factored out duplicate code into closures, consolidated ability handling logic to a single function.	2021-02-19 18:45:48 -05:00
Sam	bbfcde5e59	Re-deleted duplicate weapons that somehow reappeared.	2021-02-19 17:30:24 -05:00
Sam	411b4083b1	Added 1h hammers. ... Fixed audio tests.	2021-02-19 17:30:24 -05:00
Sam	50cbe42b07	Added one-handed axes.	2021-02-19 17:30:23 -05:00
Sam	12545dd372	Added handedness to weapon tooltips.	2021-02-19 17:30:23 -05:00
Sam	8f0cca074d	Dual wielding now uses skillbar abilities from multiple weapons.	2021-02-19 17:30:22 -05:00
Sam	fc01e9ea68	Handedness of weapons affects power and speed.	2021-02-19 17:30:21 -05:00
Sam	582c3f8459	Check for prerequisite skill in using an ability is no longer hardcoded.	2021-02-19 17:30:21 -05:00
Sam	341affdae2	Added hands field to all ron files of weapons. ... Removed weapons that were duplicated in weapons and npc_weapons from npc_weapons. Added migration to convert npc_weapons that ended up in anyone's inventory to weapon version. Consolidated debug boost and possess sticks into one debug_stick, and renamed the admin sword (with name cultist_purp_2h_boss-0) to admin_sword	2021-02-19 17:30:20 -05:00
Avi Weinstock	559ad7b7f5	Client-side trade improvements. ... - Add item tooltips in trade. - More localization support. - Fix bindings (R for trade, B for bag).	2021-02-19 15:20:27 -05:00
Nícolas Wildner	7a29cc9eff	creating char_selection.ron plus minor portuguese fixes for better formal language (like olhos - eyes and not olho)	2021-02-17 08:28:04 +00:00
TheThirdSpartan	f10f88081d	Small chat message formatting changes and fixed missing player alias during admin entity possession	2021-02-17 02:15:45 +00:00
Felix Huettner	b8d5b812e1	Allow minimap to always face north ... Some players prefer their minimap to always face north for better orientation.	2021-02-16 19:57:19 +01:00
Avi Weinstock	03d28f7d93	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
Avi Weinstock	abb5684883	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	e2b55e0706	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	e9b811b62b	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	250391656f	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	e54602c752	Merge branch 'Sarrakitty/gliders' into 'master' ... Sarrakitty/gliders See merge request veloren/veloren!1771	2021-02-12 09:49:53 +00:00
DaforLynx	ebbb06a400	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	8ac23ffcc2	fit models, adjusted drop rates	2021-02-11 09:29:26 -05:00
Sarra	7c23f97d89	tweaked a few things with the moth glider	2021-02-10 20:14:50 -05:00
Sarra	14b344469a	basic gliders	2021-02-10 19:02:36 -05:00
Sarra	0511563e35	moth glider	2021-02-10 19:02:36 -05:00
Imbris	3e98e18c46	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
Avi Weinstock	5d0c18efeb	Crafting UI: sort items lexicographically by craftability and then alphabetically.	2021-02-09 19:30:54 -05:00
Snowram	477bdfdfe7	Adresses some comments, various visual tweaks	2021-02-10 00:30:23 +01:00
Snowram	02f446fe4b	Adds lights to dungeons	2021-02-10 00:30:23 +01:00
Sarra Kitty	a956dad360	Sarrakitty/small fixes	2021-02-08 20:37:24 +00:00
Scott Williams	ae22a98167	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
James Melkonian	1d8496ea21	Move agent system to server	2021-02-06 06:15:25 +00:00
Pascal Fuhrmann	9f7637ab21	Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts	2021-02-05 01:39:12 +00:00
Samuel Keiffer	c16cddb290	Merge branch 'azymohliad/update-uk' into 'master' ... Update Ukrainian translation See merge request veloren/veloren!1749	2021-02-03 16:18:50 +00:00
Andrii Zymohliad	7be836318b	Update Ukrainian translation	2021-02-03 16:18:49 +00:00
Sam	78a2459e6d	Changed knockback from an enum to a struct.	2021-02-02 13:06:30 -05:00
Pascal Fuhrmann	f4deb08a40	fixing #944 - LeapMelee fall damage fix & adjustments	2021-02-02 16:51:04 +00:00
James Melkonian	23b1df3cdd	Add basic NPC interaction and fix NPC chat spamming	2021-01-31 20:29:50 +00:00
Joshua Barretto	60c16e57b1	Added snow particles	2021-01-31 15:15:17 +00:00
Sam	e38ecafc17	Restored knockback to hammer.	2021-01-29 13:46:23 -05:00
Treeco	a1e56c69a4	Fix traveller backpack having all its slots removed	2021-01-29 12:47:30 +00:00
Marcel	b88f04215e	Merge branch 'DaforLynx/small-sound-fixes' into 'master' ... Small audio fixes; addresses #939 and #940 Closes #940 and #939 See merge request veloren/veloren!1739	2021-01-29 11:37:10 +00:00
DaforLynx	c6e262c4ce	Small audio fixes; addresses #939 and #940	2021-01-29 11:37:10 +00:00
jiminycrick	a02444825d	Address some comments ... Eliminated extra stagger state Responding to more comments Move poise character state changes to character behavior system Move poise out of JoinTuple/Data Finish up comments (various fixes)	2021-01-28 17:31:05 -08:00
jiminycrick	46c8c744fa	Add migration for starter gear	2021-01-28 17:22:39 -08:00
jiminycrick	152156d065	Fix rebase and scrub poise from UI	2021-01-28 17:22:39 -08:00
jiminycrick	661764f4aa	Some preliminary balancing ... Fix rebase	2021-01-28 17:22:39 -08:00
jiminycrick	dd69b5f2bc	Poise stats	2021-01-28 17:22:35 -08:00
jiminycrick	c83296a4ec	Initial broken implementation of poise ... Character movement no longer broken.	2021-01-28 17:22:33 -08:00
Entropy9s	1f6cf7e155	StaminaPlus buff, modifying stamina via buffs ... trying to fix this, coming back to this later please remember to change potion back future self! this ALMOST works. maybe MR ready, kinda jank tho so close, and yet so far... IT WORKS IT WORKS IT WORKS IT WORKS IT WORKS IT WO did the same with health, ill fix this garbage l8r think we're basically done here whoops forgot to change the food back fixing and cleaning up part 1 fixed everything part 2 now with buff images ran clippy + fmt, fixed items that i modified bracket bulldozing, boldly hopefully this should be good? need to rebase real quick please let me be done StaminaPlus buff, modifying stamina via buffs trying to fix this, coming back to this later please remember to change potion back future self! this ALMOST works. maybe MR ready, kinda jank tho so close, and yet so far... IT WORKS IT WORKS IT WORKS IT WORKS IT WORKS IT WO did the same with health, ill fix this garbage l8r think we're basically done here whoops forgot to change the food back fixing and cleaning up part 1 fixed everything part 2 now with buff images ran clippy + fmt, fixed items that i modified hopefully this should be good? cargo clippy fmt stuff deleted an extraneous file?? how did that even...?	2021-01-26 22:47:55 +00:00
Scott Williams	0cde434e3b	All gems make a sound.	2021-01-25 22:53:23 +00:00
Sam	9b7edcf32f	Changed how beams determined the energy regen and energy cost.	2021-01-24 23:47:10 -05:00
Snowram	ad6cdcab71	Merge branch 'swilliams/gems' into 'master' ... Adds 6 different gems and removes shiny gem. See merge request veloren/veloren!1729	2021-01-25 01:25:40 +00:00
Scott Williams	efd953b4f4	Added other gems to crafting loot table.	2021-01-24 19:49:42 +00:00
Scott Williams	e50bd4dc6f	Changed some recipes to use other gems. Removed DELETE statements from migration.	2021-01-24 19:45:44 +00:00
Sam	6dd740feaa	Nerfed bow M1 and M2, slightly buffed bow skillbar ability.	2021-01-24 14:24:59 -05:00
Scott Williams	be311f8ff2	Added gem models for item_manifest	2021-01-24 18:20:10 +00:00
Scott Williams	157e56d8ca	Removed Shiny Gem, Added migration to change shiny gems to diamonds. Changed shiny gem recipes to diamonds	2021-01-24 16:40:22 +00:00
Sam	314f0428fc	Rebalanced mindflayer.	2021-01-24 10:56:12 -05:00
Scott Williams	32bbdffc38	Added 6 gems, removed shiny gem from cave, replaced with diamond.	2021-01-24 14:00:49 +00:00