1796 Commits

Author	SHA1	Message	Date
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
Monty	7cbf946a65	6 new sceptres, add DPS display to tooltips	2021-01-23 23:10:36 +01:00
Samuel Keiffer	39d1c9e885	Merge branch 'sam/skill-balancing-1' into 'master' ... Skill balancing See merge request veloren/veloren!1716	2021-01-23 21:12:35 +00:00
Rotsuoy	994677a4d0	Rotsuoy/savanna grass	2021-01-23 07:46:54 +00:00
Sam	5e4b6809ca	Sceptre nerfs.	2021-01-22 22:46:18 -05:00
Sam	b5a3b3442c	Addressed comments.	2021-01-21 17:45:03 -05:00
Snowram	8b06d844f7	Golem spinmelee anim	2021-01-21 01:23:10 +01:00
Sam	c888ec0535	Golems are now lactose tolerant.	2021-01-20 11:54:57 -05:00
Monty Marz	1eb7f78189	Revert "Added TR translations for deaths by debuffs." ... This reverts commit 0817e45e13.	2021-01-20 11:20:06 +00:00
jiminycrick	7dda25a66d	More footstep sfx based on distance	2021-01-19 19:51:19 -08:00
Sarra	f12e9f1665	small sfx fix, adding consume sfx for salads and lettuce	2021-01-19 16:24:44 -05:00
Acrimon	6f82ac352d	Merge branch 'acrimon/build-tip' into 'master' ... Add a tip about the build command See merge request veloren/veloren!1699	2021-01-19 20:45:26 +00:00
Sarra Kitty	e7d852835c	Sarrakitty/rotsys item sprites	2021-01-19 18:23:44 +00:00
Acrimon	21ecb15571	build tip	2021-01-19 19:02:41 +01:00
Monty Marz	ac60bf5794	Better visuals for skill button labels, don't show "0 EXP" in the SCT ... Made functions that were called every frame significantly cheaper. Final UI fixes.	2021-01-19 08:08:29 -05:00
Sam	eaa41c7dea	Skills are now factored into combat rating. New formula for exp scaling per SP. ... Adjust lvl up msg fade Add female humanoid names WIP Changed text formatting when skill is max level. Added message to show you have 0 skill points available. Addressed a lot of comments. various changes to UI - fix skillbar offset - remove CR indicators for group members - add CR indicators to group member frames - use unified CR indicator icon Exp reward tweaks. Fixed flamethrower range skill description.	2021-01-19 08:08:26 -05:00
jshipsey	5d1993009f	keyframed axe spin ... Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.	2021-01-19 08:08:18 -05:00
Monty	5362000de4	adjusted potions, refined level up message animation ... fixed incorrect translation used on axe double strike regen skill Changed migration so that skills and skill groups foreign key to entity_id instead of character_id	2021-01-19 08:08:14 -05:00
Monty Marz	de5c5702b3	stats display ... Addressed comments. Addressed comments.	2021-01-19 08:08:11 -05:00
Sam	c809569f6b	Added level up sound to skill point gain. Fixed tests. ... Fixed duplicate roll description.	2021-01-19 08:08:08 -05:00
Noé	acbd965e65	implemented en translation for Hammer, Bow, Scepter and Staff skills ... skill tree translation Clamped earning SP to avoid u16 overflow. translation fixes Fixed exp scaling function Fixed exp scaling function remove debug combat rating display Update overhead.rs implemented en translation for Axe	2021-01-19 08:08:02 -05:00
Sam	a606313856	Added scaling exp costs per skill point. ... Fix tooltip being red. multiple fixes, started translation change exp giving items adjust loot tables adjust combat rating indicators fix group frame offsets	2021-01-19 08:07:57 -05:00
Sam	ae8c8b47f1	Added tooltips with numbers. Balancing on some skills. ... Added experience scaling for tougher enemies.	2021-01-19 08:07:51 -05:00
Sam	89766b2b34	Added command to give yourself skill points. ... adjusted social window Changelog	2021-01-19 08:07:49 -05:00
Sam	986c05621a	Wired up skill UI to check for prerequisites being met and sufficient skill points. ... available SP check in general HUD, more skill icons Trimmed 2000 lines from a file. UI tweaks	2021-01-19 08:07:45 -05:00
Sam	4b52574750	Skill point gains are displayed in hud. ... level up message visuals and functionality Handles simultaneous skill point gains in UI.	2021-01-19 08:07:41 -05:00
Monty Marz	30df603115	flashing buttons for available points, WIP lock/unlock indicator ... Condensed UI code. Removed some hardcoding. icons squash later, WIP colouring for unavailable skills	2021-01-19 08:07:33 -05:00
Sam	51c0bd765f	Database support for refunding skills. ... Nonfunctional xp floaters, squash when working. more icons, lock visuals	2021-01-19 08:07:29 -05:00
Monty Marz	48bd921d0a	EXP bar and available points UI ... fix overhead UI Add WIP overhead difficulty indicator readd commented out exp counter for later use Wired skill information into UI.	2021-01-19 08:07:25 -05:00
Sam	c0c45a1996	Purged stats, including level and experience	2021-01-19 08:07:23 -05:00
Sam	48c98b11cf	General combat skill tree. ... UI for general skill tree	2021-01-19 08:07:20 -05:00
Monty Marz	58d9534496	cleaned up skillbar, adjusted buffs placing ... cleaned up skillbar, adjusted buffs placing cleaned up skillbar, adjusted buffs placing render diary example items in voxygen instead of using pre-rendered image files	2021-01-19 08:07:16 -05:00
Sam	bde2bc1f77	UI for sword skill tree ... Axe skill tree UI Hammer skill tree UI Bow skill tree UI moar renders Staff skill tree UI Sceptre skill tree UI	2021-01-19 08:07:12 -05:00
Monty Marz	3f436079e8	Skill-Tree UI ... switchable tabs rework icons, fix cursor toggle auto slot placing Bow leap skill changed to bow glide skill.	2021-01-19 08:07:06 -05:00
Sam	0ccbdc3b8c	Sceptre skill tree.	2021-01-19 08:07:03 -05:00
Sam	5c7705f874	Staff skill tree.	2021-01-19 08:07:03 -05:00
Sam	662a08defc	Implemented bow skill tree.	2021-01-19 08:07:02 -05:00
Sam	4dfe14c103	Hammer skill tree complete.	2021-01-19 08:07:02 -05:00
Sam	72604e8a4e	Axe skill tree functional.	2021-01-19 08:07:01 -05:00
Sam	cc60ca58be	Added sword skill tree	2021-01-19 08:06:59 -05:00
Sam	0e84ba18c2	Moved skill max level and skill prerequisites into ron files.	2021-01-19 08:06:59 -05:00
Sam	5a23f063a0	Ron file now used for skills belonging to each skill group.	2021-01-19 08:06:58 -05:00
Jesus Bracho	ec79890335	Provide buff information on killed entities	2021-01-18 05:46:53 +00:00
Acrimon	c5e3828c64	Merge branch 'master' into 'master' ... Update tr_TR to new multi file format. See merge request veloren/veloren!1671	2021-01-14 12:25:22 +00:00
Monty Marz	06e7ac25c1	fix loot tables, enemy bar color change	2021-01-09 15:26:24 +01:00
Ben Wallis	aef2637288	Refactored loadout to have public functions for each slot instead of requiring callers to use the _INDEX consts	2021-01-08 19:12:09 +00:00
Tadabito	db9a6a4cec	Update tr_TR to new multi file format.	2021-01-02 12:04:04 +03:00
Vincent Foulon	da81b2f0b2	Update i18n's README.md to correct grammar and formatting ... Address the following reviews: https://gitlab.com/veloren/veloren/-/merge_requests/1666#note_476145978 https://gitlab.com/veloren/veloren/-/merge_requests/1666#note_476145980 https://gitlab.com/veloren/veloren/-/merge_requests/1666#note_476145981	2020-12-31 12:32:22 +01:00
Vincent Foulon	7a4c3fa9a6	renamed _root.ron files to _manifest.ron	2020-12-31 12:32:21 +01:00
Vincent Foulon	b3758d12e4	rename a translation file to prevent it from being ignored by git	2020-12-31 12:32:20 +01:00
Vincent Foulon	7150e1f820	rename a translation file and clear some commented code	2020-12-31 12:32:19 +01:00
Vincent Foulon	bb7cc3d53b	(temp?) fixed list_localization function + add sub_directories to other languages	2020-12-31 12:32:17 +01:00
Vincent Foulon	00140384f7	convert the other languages into folders	2020-12-31 12:32:16 +01:00
Vincent Foulon	3295ff2c58	created LocalizationFragment + load localization sub directories	2020-12-31 12:32:16 +01:00
Vincent Foulon	924c24fa78	(PoC)(WIP) Convert single translation file to a folder	2020-12-31 12:32:15 +01:00
Joshua Barretto	a404707f87	Avoid div0 in shiny water shader	2020-12-30 22:18:19 +00:00
Nícolas Wildner	dc46618b4c	Update pt_BR.ron	2020-12-27 00:09:12 +00:00
Sarra Kitty	e8eb2b3a6c	new gliders ... added sandraptor glider added sandraptor glider stuff working on other raptor gliders adding file and placeholder model (copy of morpho) for monarch butterfly gliders adding models for snow and wood raptor gliders added a proper model for the monarch glider adding crafting recipies for raptor gliders, and raptor feather item for the recipe. Made monarch and morpho rare drops in cave loot table made raptors drop their feathers fmt	2020-12-24 02:54:18 +00:00
Justin Shipsey	be4d8a7138	Merge branch 'snowram/npcs-names-json-to-ron' into 'master' ... Converts npcs names file to ron See merge request veloren/veloren!1659	2020-12-23 07:43:57 +00:00
unknown	3c1e1c6733	Converts npcs names file to ron	2020-12-23 00:58:25 +01:00
Entropy	e62c77f452	i am stupid and forgot iron ingots, whoops.	2020-12-22 13:07:23 -08:00
Justin Shipsey	9af232c6e9	Merge branch 'entropy9s/BasicIngredients' into 'master' ... Basic Crafting Ingredients See merge request veloren/veloren!1609	2020-12-18 20:28:44 +00:00
Entropy	6f331e0435	changed sec count to be consistent w/ other foods	2020-12-17 12:43:33 -08:00
Monty	8b9db7b179	cleanup, changelog, small bugfixes ... fmt fix rebase fmt	2020-12-14 21:52:24 +01:00
Monty Marz	b5a2104ca5	group member indicator visuals ... functional group member indicators adjust visuals z-comparison	2020-12-14 21:16:13 +01:00
Joshua Barretto	985156fca4	Merge branch 'zesterer/gfx' into 'master' ... Made LoD water reflective See merge request veloren/veloren!1632	2020-12-14 18:49:59 +00:00
Snowram	834670a641	Merge branch 'snowram/objects-offsets-ron' into 'master' ... Put objects offsets into a .ron file See merge request veloren/veloren!1627	2020-12-14 18:00:07 +00:00
Joshua Barretto	49cabfae18	Made LoD water reflective	2020-12-14 16:52:33 +00:00
Snowram	96ed008348	Puts objects offsets into a .ron file	2020-12-14 02:43:49 +01:00
Samuel Keiffer	c3732a8a8c	Merge branch 'nahua/replace_sceptre_m2_sound' into 'master' ... Issue 872: Replace explosion sound with heal bomb sound for sceptre M2 See merge request veloren/veloren!1618	2020-12-13 23:18:30 +00:00
nahuakang	f3ed13ca09	Replace explosion sound with heal bomb sound for sceptre M2	2020-12-13 22:09:28 +01:00
Entropy	d533d08707	extraneous periods go away	2020-12-11 19:20:36 -08:00
Entropy	71d98d34fb	Adding some basic consumable crafting ingredients ... more stuff being squashed in. tons of non-food items added	2020-12-11 19:20:35 -08:00
Marcel	e54b4d5797	Merge branch 'DaforLynx/campfire-loading-tip' into 'master' ... Loading screen tip for campfire healing See merge request veloren/veloren!1601	2020-12-12 00:29:57 +00:00
DaforLynx	70814ee922	Loading screen tip for campfire healing	2020-12-12 00:29:57 +00:00
Marcel	9b1bc41f6e	Merge branch 'jacki/german' into 'master' ... Updated de_DE translation See merge request veloren/veloren!1572	2020-12-11 23:51:00 +00:00
Tobias Frisch	23e3964059	Updated de_DE translation ... Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>	2020-12-11 23:51:00 +00:00
Vincent Foulon	2503d79567	Update French Translation	2020-12-11 23:29:44 +00:00
Monty Marz	f9d4d744a0	Better group frame placement	2020-12-10 21:31:19 +01:00
Snowram	ecdbd1c5d6	Makes consumables heal faster	2020-12-10 18:06:32 +01:00
Pfauenauge90	6d1bae67d0	adjust mindflayer strength, fix en translation, update es_la translation, fix undead eyes	2020-12-10 18:06:31 +01:00
Monty Marz	f2ba7cc297	add baobabs, fix map difficulty, make mushrooms lootable	2020-12-10 18:06:29 +01:00
Justin Shipsey	4bdd84ab46	Merge branch 'snowram/fishes' into 'master' ... Add fishes See merge request veloren/veloren!1577	2020-12-09 02:59:55 +00:00
Entropy	98688651b5	changed kickers to use 3 leather	2020-12-08 16:27:21 -08:00
Snowram	526d3bd035	Vacations are never over	2020-12-08 23:03:40 +01:00
Snowram	f94a4ec90d	Improves fish_small, new npc	2020-12-08 23:03:39 +01:00
Snowram	72d73ecd38	Initial fish work	2020-12-08 23:03:38 +01:00
Sam	490915d384	Modified how most abilites that could scale were scaled.	2020-12-07 22:00:24 -06:00
Joshua Barretto	b37be14b86	Added cave mushrooms	2020-12-05 18:00:29 +00:00
Joshua Barretto	a5c37262dd	Better aurora	2020-12-05 11:20:25 +00:00
Joshua Barretto	e413392694	Better mist access	2020-12-05 11:20:25 +00:00
James Melkonian	71303fecfd	Aura System and Campfire Health Regen	2020-12-04 22:24:56 +00:00
iOddishGX	31e2e93786	Lowered the energy cost from 80 to 40 ... Increased the healing multiplier Lowered the damage output Increased the radius Made the projectile slightly faster	2020-12-01 20:01:24 +00:00
Marcel	a431fe3fad	Merge branch 'sam/dehardcode-energy' into 'master' ... Graying out skills with insufficient energy no longer dependent on hard-coded values Closes #824 See merge request veloren/veloren!1560	2020-11-27 16:27:09 +00:00
Samuel Keiffer	352917d9cb	Graying out skills with insufficient energy no longer dependent on hard-coded values	2020-11-27 16:27:09 +00:00
Snowram	b316e9aa7c	Updates ru_RU translation	2020-11-26 22:59:39 +01:00
Sam	6a6260daa1	Weapon combat fixes: ... - Modified energy and speed scaling of sword, axe, and hammer combo melees. - Nerfed bow basic attack knockback. Buffed bow damage and energy regen. - Corrected xp values for theropods. Removed unnecessary function for xp increase per level. - Guards no longer flee at low health. - Buffed sword spin. - Nerfed axe spin and sword dash moderately. - Dash now takes a little time to reach full speed. Sword M2 and hammer M1 damage values tweaked.	2020-11-26 09:15:45 +01:00
Marcel	103c2302b0	Merge branch 'azymohliad/add-ukrainian' into 'master' ... Added Ukrainian translation See merge request veloren/veloren!1555	2020-11-25 17:21:32 +00:00
Andrii Zymohliad	733a471090	Added Ukrainian translation	2020-11-25 17:21:32 +00:00
Monty Marz	e7d27a2c21	fmt ... cleanup	2020-11-25 16:53:48 +00:00
Yusuf Bera Ertan	3c887315ae	update Turkish translations	2020-11-25 15:46:56 +03:00
DaforLynx	6783e13125	Added two new songs along with edits to the .ron ... comma	2020-11-25 08:25:40 +00:00
Marcel	d1a9264a99	Merge branch 'angryanimals' into 'master' ... animal attacks See merge request veloren/veloren!1542	2020-11-25 01:33:20 +00:00
Sam	5461f002fe	Correct beam offsets used. Fix scaling damage on hammer M1. Add can_strafe function to body.	2020-11-24 17:56:39 -06:00
Sam	8ab2d2524a	Changed default main and secondary tool from Some(empty) to None. ... weapon fixes	2020-11-24 17:49:04 -06:00
jiminycrick	aad9734055	Agent tactic refactoring ... Lower theropods spawns clippy, changelog review response	2020-11-24 17:49:00 -06:00
jiminycrick	1cf0aff5ef	More ai work ... balance Lavadrake AI tweaks feedback tweaks	2020-11-24 17:48:54 -06:00
jshipsey	d10dd83e5f	theropods in world, small tweaks	2020-11-24 17:48:51 -06:00
jshipsey	f411ff7e04	bunch of animations and more attacks	2020-11-24 17:48:51 -06:00
jshipsey	6f72e68ad6	hoof attack, tweaks	2020-11-24 17:48:50 -06:00
jiminycrick	1337fdaa57	Generalize rotation time	2020-11-24 17:48:49 -06:00
jshipsey	a27b086401	placeholder for charge animal, animated leapmelee, small fixes	2020-11-24 17:48:49 -06:00
jiminycrick	a1aa3efd29	Moved hit timer to charged melee and adjusted for tail slap	2020-11-24 17:48:48 -06:00
jshipsey	1f59ef92d8	species specific speeds, more animation	2020-11-24 17:48:48 -06:00
jiminycrick	6b534729be	Initial AI for quad low	2020-11-24 17:48:47 -06:00
jshipsey	c07d8df58b	assigning weapons, building animations ... ability mapping	2020-11-24 17:48:43 -06:00
jiminycrick	793d6095b3	Maneater AI ... Rebase fixes and maneater AI	2020-11-24 17:48:38 -06:00
jshipsey	e3e513cc11	initial quadlow ranged work	2020-11-24 17:48:27 -06:00
jshipsey	ae06016e9a	Wolf attacks and ai. ... initial wolf dash testing tool.rs Wolf attack AI	2020-11-24 17:48:20 -06:00
Joshua Barretto	46dc49bc0a	Fixed bit-twiddling colour bug	2020-11-24 18:44:41 +00:00
Christof Petig	a3db20c9d6	Show caves in map	2020-11-23 19:05:17 +01:00
Joshua Barretto	e770e88af5	Better town colour	2020-11-23 10:58:22 +00:00
Monty Marz	d069eb9a57	street lamp particles, ground fire bowl, misc fixes	2020-11-23 10:58:21 +00:00
Joshua Barretto	e461fbd951	Make chimneys glow	2020-11-23 10:58:21 +00:00
Joshua Barretto	4bb0da24b6	Addressed review comments	2020-11-23 10:57:57 +00:00
Snowram	0737c71749	Adds new cultist armors, defines loadouts for dungeons	2020-11-23 10:57:57 +00:00
Joshua Barretto	8fd2e4537d	Addressed review comments	2020-11-23 10:57:57 +00:00
Monty Marz	8e18b26031	Update street_lamp.vox	2020-11-23 10:57:57 +00:00
Joshua Barretto	bb9e593a44	Fixed glow AO	2020-11-23 10:57:57 +00:00
Joshua Barretto	b4e3dbc719	Added glow tint	2020-11-23 10:57:57 +00:00
Joshua Barretto	d7bbceca2d	Added light/glow map sample interpolation for entities	2020-11-23 10:57:56 +00:00
Joshua Barretto	27e7fd0727	Preserved light/glow maps to prevent sprites/entities being lit when they shouldn't be	2020-11-23 10:57:56 +00:00
Joshua Barretto	51d1a2ecff	Added glow	2020-11-23 10:57:56 +00:00
Joshua Barretto	a0f0417f8f	Fixed close cloud sampling issue	2020-11-23 10:57:56 +00:00
Monty Marz	099dfc959f	translations, fixes	2020-11-23 10:57:56 +00:00
Monty Marz	5b907ede9e	fix hints	2020-11-23 10:57:55 +00:00
Joshua Barretto	058908f603	Made flamethrower and healing staff emit light on use	2020-11-23 10:57:55 +00:00
Monty Marz	97934d1070	map fixes	2020-11-23 10:57:55 +00:00
Joshua Barretto	5930ca4a59	Temporarily make particles opaque to avoid depth-related rendering problems	2020-11-23 10:57:55 +00:00
Joshua Barretto	7eb437501d	Fixed various particle issues	2020-11-23 10:57:55 +00:00
Joshua Barretto	0f2e7434fc	Sun, brightness, and gamma adjustments	2020-11-23 10:57:55 +00:00
Joshua Barretto	bcc220804a	Added exposure to settings	2020-11-23 10:57:55 +00:00
Joshua Barretto	062ce4b158	Resolved or patches various water shader issues	2020-11-23 10:57:16 +00:00
Joshua Barretto	1e7b9fa9b5	Resolved or patches various water shader issues	2020-11-23 10:57:16 +00:00
Joshua Barretto	86571c9e2e	Partially fixed mist	2020-11-23 10:57:15 +00:00
Joshua Barretto	aa59d66a76	Fixed many map problems, re-added surface mist	2020-11-23 10:57:15 +00:00
Joshua Barretto	579bdcf10e	Forest soil undulation, better acadia placement	2020-11-23 10:57:15 +00:00
Monty Marz	99b3a4465a	WIP map zooming and dragging	2020-11-23 10:57:15 +00:00
Joshua Barretto	ef03137c65	Better water, shadows, clouds	2020-11-23 10:57:15 +00:00
Joshua Barretto	be1fb5b5d2	Shader quality tweaks	2020-11-23 10:57:15 +00:00
Joshua Barretto	0e8a14250f	Minor emissions tweaks	2020-11-23 10:57:15 +00:00
Joshua Barretto	42c6142ec6	Added occasional sky emission at night	2020-11-23 10:57:15 +00:00
Joshua Barretto	e09c22f9cc	Altered splay to avoid strange LoD shape	2020-11-23 10:45:02 +00:00
Monty Marz	c825e33f1a	map icon options WIP	2020-11-23 10:45:02 +00:00
Joshua Barretto	34987c1654	Don't do gamma twice	2020-11-23 10:45:02 +00:00
Joshua Barretto	271c1e29a5	Adjusted sun/moon for HDR	2020-11-23 10:45:02 +00:00
Joshua Barretto	1d031538f9	Added HDR	2020-11-23 10:45:02 +00:00
Joshua Barretto	49df604de0	Better scattering and scatter (of both varieties)	2020-11-23 10:45:02 +00:00
Joshua Barretto	ee65b4fb17	Improved cloud quality by improving sun access heuristic	2020-11-23 10:45:02 +00:00
Monty Marz	1864f4626c	map icons	2020-11-23 10:45:01 +00:00
Joshua Barretto	de685b00b2	Improved water pathfinding	2020-11-23 10:45:01 +00:00
Joshua Barretto	b352ef5d55	Terrain pop-in, fixed agent pathfinding in water	2020-11-23 10:45:01 +00:00
Joshua Barretto	717fd88565	Experimental dissolve VD	2020-11-23 10:45:01 +00:00
Joshua Barretto	6adfa547db	Added site icons to main map	2020-11-23 10:45:01 +00:00
Joshua Barretto	d4d4f17d3c	Added world map size icons	2020-11-23 10:45:01 +00:00
Joshua Barretto	c906764889	Better LoD	2020-11-23 10:45:01 +00:00