veloren

mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00

Author	SHA1	Message	Date
hqurve	04eea482ce	Moved settings window sections into separate files	2021-04-11 17:36:02 -04:00
hqurve	f2340105c1	Moved settings_window.rs to to settings_window/mod.rs	2021-04-11 17:36:02 -04:00
Vincent Foulon	de9d5b5e14	clean workspace clean workspace (2) clean workspace (2)	2021-04-11 16:35:24 +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
Joshua Yanovski	8b034ed56f	Merge branch 'sharp/sprites-in-background' into 'master' Mesh sprites in background. See merge request veloren/veloren!2098	2021-04-10 20:34:35 +00:00
Marcel	adb18ef645	Merge branch 'mdx97/default-names' into 'master' Use username as default character name in multiplayer character creation. See merge request veloren/veloren!2085	2021-04-10 16:41:47 +00:00
mdx97	eb4fb33f45	Use username as default character name in multiplayer character creation.	2021-04-10 16:41:46 +00:00
Joshua Yanovski	1bdf3b13a8	Mesh sprites in the background. This makes the delay afetr selecting a character before logging into the game much shorter, in the common case. It still doesn't handle things perfectly (it blocks creating Terrain::new if it's not finished, and it could be faster due to working in the background), but it's still a lot better than it was before. To improve sprite meshing performance, we also apply the terrain flat_get optimizations to sprites. Though I didn't initially know how much of an impact it would have, it feels significantly faster to me, though being able to parallelize it would be ideal.	2021-04-10 17:51:42 +02:00
Marcel Märtens	655a35d128	update deps	2021-04-10 15:53:00 +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
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
James Melkonian	16871208f2	Add topographic option to map	2021-04-06 09:16:17 -07:00
James Melkonian	f2ebbb7f7f	Map icon scaling	2021-04-06 08:42:09 -07:00
James Melkonian	8ee1fc4a0f	Add layers to minimap	2021-04-06 08:42:08 -07:00
James Melkonian	bacda06dba	Added map layers	2021-04-06 08:42:07 -07:00
James Melkonian	70ede7f34d	Topographic map	2021-04-06 08:42:06 -07: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
Joshua Barretto	60e2ed3e7d	Added auto camera setting	2021-04-05 23:24:31 +01:00
Marcel	4dde9f84b0	Merge branch 'huntertparks/fix-cursor-not-locking' into 'master' Fixes #520 and #840 - locks cursor to screen when menu is not open Closes #840 and #520 See merge request veloren/veloren!2069	2021-04-05 21:40:24 +00:00
Hunter Parks	6af9662b03	Change cursor lock location to be center of screen Changing the cursor coordinates to the middle of the screen had some side effects. When a user would close a menu and re-open it back up without moving the mouse, the cursor position would not change. This commit takes care of that by changing how the HUD handles closing menus via keyboard inputs.	2021-04-05 16:48:22 +02:00
Hunter Parks	7df0413be4	Fixes #520 and #840 - locks cursor to screen when menu is not open Rather than lock the cursor to the middle of the screen, the cursor will move to it's last known coordinates when a menu or the minimap is not open.	2021-04-05 16:37:40 +02:00
Monty	b8c474057c	More cheese is less cheese Update CHANGELOG.md fmt Update crafting.rs	2021-04-05 13:40:12 +02:00
Marcel	69891f0b70	Merge branch 'login-trim-username' into 'master' login trim username, improve validation, social ordering #1040 Closes #1040 See merge request veloren/veloren!2042	2021-04-04 22:09:16 +00:00
Avi Weinstock	78f130a3b2	Add a cheese counter in the bag display.	2021-04-04 11:14:25 -04: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
Snowram	9a3f6d8261	Substitutes DPS for CR in item tooltip	2021-04-03 00:10:31 -04:00
Avi Weinstock	b7dbadc32f	Add colors for buy/sell tooltips based on site prices.	2021-04-02 17:44:02 -04:00
Marcel	42463d1fe0	Revert "Merge branch 'animtweaks' into 'master'" This reverts merge request !2039	2021-04-01 18:45:03 +00:00
aljazerzen	08146f6a3a	login trim username, improve validation, social ordering	2021-04-01 16:43:27 +02:00
jshipsey	030e14f333	small anim tweaks	2021-04-01 03:08:33 -04:00
Avi Weinstock	0122dca3c3	Allow fast stacking into and out of a trade with {ctrl,shift} click. Shift click goes 1 at a time, Ctrl click automatically balances the trade w.r.t. that quantity.	2021-03-30 18:39:10 -04:00
Marcel Märtens	ccb78eeb5c	move tracing code to own crate	2021-03-30 16:35:36 +02:00
Joshua Barretto	3c19713e63	Merge branch 'zesterer/sprite-text' into 'master' Added text prompts to sprites See merge request veloren/veloren!2034	2021-03-30 11:41:14 +00:00
Joshua Barretto	bed863c50c	Added indicator text to terrain sprites	2021-03-30 01:04:23 +01:00
Joshua Barretto	85237c7a32	Fixed training dummy hitbox	2021-03-29 21:52:05 +01: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	5b99b7ca18	Skillbar uses item tooltip	2021-03-29 18:34:45 +02:00
Snowram	508e35ca17	Add several new i18n lines	2021-03-29 18:34:45 +02:00
Snowram	d1e734b9b1	Tooltip now use ItemDesc instead of Item	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	b7dd2d6685	Use a dummy item for the new() function	2021-03-29 18:34:45 +02:00
Snowram	955008c3c1	Kinda working tooltip height but not really	2021-03-29 18:34:45 +02:00
Snowram	0405f04d53	More item tooltip UI layout	2021-03-29 18:34:45 +02:00
Snowram	aa71dcb9c7	Make the new tooltip item specific	2021-03-29 18:34:45 +02:00
Snowram	4786f84afd	New tooltip	2021-03-29 18:34:45 +02:00
Marcel Märtens	e7452aa7ab	do a clear teardown of tokio runtime	2021-03-29 10:34:33 +02:00
Marcel Märtens	614a0aac13	display error when rodio panic is fixed	2021-03-28 20:40:07 +02:00
Sam	0c19679406	Fixed offset of decayed health	2021-03-27 21:06:21 -04:00
Monty	345ef1ca22	decay display for groups and overhead bars	2021-03-27 21:05:17 -04:00
Sam	06bd7bd929	Removed experimental group health decay	2021-03-27 21:05:17 -04:00
jshipsey	558c82ee54	flayer anims	2021-03-27 21:05:16 -04:00
Sam	91ddcaa155	Particles for summoned minions	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	c0c6ff3063	Initial work to show decayed health in healthbars	2021-03-27 21:05:13 -04:00
Sam	4ec387af82	Added particles for lifesteal effect	2021-03-27 21:05:12 -04:00
Sam	71b847cabb	Particles for blink	2021-03-27 21:05:09 -04:00
Snowram	39c8efe11f	Adds husk npc	2021-03-27 21:05:09 -04:00
Sam	720482d994	Gave mindflayer AI. Fixed particles and made them sync across network.	2021-03-27 21:05:06 -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
Louis Pearson	165065725e	Add build_area_list command * Reworks CanBuild to use HashSet * Removes player argument from build permission, use sudo instead	2021-03-27 07:54:02 -06:00
Louis Pearson	120a0cd9a7	Limit build mode to bounding box	2021-03-27 07:54:02 -06:00
Louis Pearson	eade0540b2	Add `permit_build` command This commit separates permission to build from building mode, allowing build to become a NoAdmin command (since players will first need permission from an Admin to enter build mode)	2021-03-27 07:54:02 -06: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
Marcel	843850a4b8	Merge branch 'aweinstock/tradepricing' into 'master' Get SitePricing information to clients, and use it to display coin-denominated... See merge request veloren/veloren!1991	2021-03-26 00:17:39 +00:00
aljazerzen	0ea102dc9c	refactor handling of duplicate login	2021-03-25 12:33:56 +01:00
Avi Weinstock	8d90548331	Get SitePricing information to clients, and use it to display coin-denominated prices in voxygen on tooltips during a trade. Also boost merchant spawn rate slightly.	2021-03-25 02:11:58 -04:00
Snowram	0e259294d4	Allow Escape key to cancel trades	2021-03-25 01:42:14 +01:00
Avi Weinstock	6b343c2af9	Address MR 1962 review comments.	2021-03-23 18:41:13 -04:00
Avi Weinstock	4ec6b43693	Add a vertical camera clamp option and toggle to voxygen.	2021-03-23 18:22:32 -04:00
Joshua Barretto	21b20ea75e	Merge branch 'aweinstock/enable-rtsim-airships' into 'master' Enable RtSim Airships. See merge request veloren/veloren!1973	2021-03-23 14:29:43 +00:00
Avi Weinstock	49f39fb752	Make more systems work with an optional health component, to allow disabling health on rtsim airships (so that players can't hammer them out of the sky).	2021-03-23 10:44:32 +01:00
Sam	7ede94b4c9	Changelog	2021-03-22 23:53:00 -04:00
Marcel Märtens	6b23101fac	update toolchain to `nightly-2021-03-22`	2021-03-22 16:41:04 +01:00
Marcel Märtens	fdc40f52d9	give more threads a fixed name	2021-03-22 12:37:03 +01: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
Marcel	dc4570def5	Merge branch 'sharp/texture-atlases' into 'master' Enable allocation of new textures on atlas allocation failure. See merge request veloren/veloren!1949	2021-03-22 04:35:41 +00:00
jshipsey	31747d8ff1	airship movement bits	2021-03-21 21:43:49 -04:00
Joshua Barretto	7b736640f5	Smoother particle emission for moving objects	2021-03-22 00:23:25 +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
Sam	f342be71a1	Fixed pick animation	2021-03-21 15:29:17 -04: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	b1026296cb	Disabled block selection when not wielding	2021-03-21 16:29:13 +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
RedlineTriad	606420c5e1	Sort the playerlist alphabetically	2021-03-21 10:22:33 +01:00
Vincent Foulon	d0aa68a9d2	Add climbing speed and cost	2021-03-20 17:17:28 +01:00
Joshua Yanovski	866cc79d2e	Enable allocation of new textures on atlas allocation failure. This solves the problem of not being able to set the view distance too high, especially in pathological cases like giant trees. For simplicity, we just freeze any atlas where allocation failed and start allocating to a new texture and atlas, letting reference counting destroy the old one when there are no more references to it. Because of the spatial locality of chunk allocations, chunks allocated together will virtually always have similar lifetimes, so the odds of this causing significant fragmentation are very low, meaning this simple solution should not do much worse than a much fancier one.	2021-03-20 16:21:41 +01:00
Marcel Märtens	2733ba2e27	Change the version number to 0.9	2021-03-20 13:07:09 +01:00
Avi Weinstock	0ef42e3854	Address MR 1945 review comments.	2021-03-19 19:53:17 -04:00
Snowram	e5afb2fcf7	Various visual fixes	2021-03-18 22:53:06 +01:00
Vincent Foulon	80635004a4	Remove unwraps when asset loading fails	2021-03-18 12:56:17 +00:00
Vincent Foulon	eafa69ee4c	allow loading animations to be contributed from a manifest file	2021-03-17 23:41:28 +01:00
Vincent Foulon	62b945dab1	Add new random loading animations	2021-03-17 18:15:25 +01:00
Monty Marz	e9cbac387e	new loading bg, staff models item images fix paths loot tables, adjustments Update main.ron	2021-03-16 23:23:24 +00:00
Marcel Märtens	a286eb084a	create a wrapper around rayon, slowjobpool, that spawns on rayon but drop feed it	2021-03-16 13:31:04 +01:00
Joshua Barretto	6f10a56589	Optimised entity sync code, increased animation throttling distance	2021-03-16 02:49:33 +00:00
James Melkonian	6ea43cfd75	Various RtSim and Agent Interaction Fixes	2021-03-16 01:30:35 +00:00
Joshua Barretto	0312c06295	Fixed sliding when wielding	2021-03-15 14:18:56 +00:00
Marcel	5b21ee7200	Merge branch 'aweinstock/airship-mvp-rebased' into 'master' Airships See merge request veloren/veloren!1888	2021-03-15 11:37:12 +00:00
Forest Anderson	0049976da9	Merge branch 'aweinstock/tradefixes-20210314' into 'master' Client-side trade fixes: update recipe cache and always put client on the same... See merge request veloren/veloren!1904	2021-03-15 04:52:09 +00:00
Avi Weinstock	9304ecab3d	Address Imbris's MR 1888 comments, and add changelog entry. - Use Ori::{new,to_quat} and make the field private. - Update/capitalize/add various comments. - Implicitly drop scope guards where applicable. - Take !Copy colliders by reference instead of cloning. - s/cylinder_voxel_collision/box_voxel_collision/ - Unindent some physics code with a continue.	2021-03-14 23:21:46 -04:00
Avi Weinstock	a32be4ac5a	Address MR 1888 review comments. - Delete obsolete symbolic links. - Add suggested comments. - Remove dead code.	2021-03-14 23:17:28 -04:00
Avi Weinstock	aa56166c80	Fix fmt and clippy, and rename {psdr,psdw} to {read,write} in physics.	2021-03-14 23:17:26 -04:00
Joshua Barretto	afd99788b2	Made animations and friction ground-relative	2021-03-14 23:09:52 -04:00
Avi Weinstock	e9aab63a04	Account for model translation in the physics. The voxel collider still needs to be north-aligned for now.	2021-03-14 23:09:52 -04:00
Avi Weinstock	bcd3799395	Airship fixes: figure culling, player hitbox bounds w.r.t. airships, physics state unioning.	2021-03-14 23:09:51 -04:00
Avi Weinstock	5d85775dcf	Airship progress: now possessable, and physics kind of works (desyncs from the visuals by a shift + scale, and rotation isn't done at all yet, but the contours are correct).	2021-03-14 23:09:51 -04:00
Avi Weinstock	8b9e84972a	Draft of airships (spawn command, visuals, some physics refactoring, no collision yet).	2021-03-14 23:09:49 -04:00
Avi Weinstock	95992ead4d	Client-side trade fixes: update recipe cache and always put client on the same side of the screen as their inventory.	2021-03-14 21:41:47 -04:00
Marcel	5570b57282	Merge branch 'sam/yeet-inputs' into 'master' Reworked Controller Inputs to use Control Actions See merge request veloren/veloren!1900	2021-03-15 01:32:02 +00:00
Imbris	a558d42da7	Merge branch 'snowram/new-npcs' into 'master' Snowram/new npcs See merge request veloren/veloren!1896	2021-03-15 00:10:46 +00:00
Sam	ecff675cc4	Wielding now works again Rolling now resumes combo states correctly again Cleanup	2021-03-14 17:26:55 -04:00
Sam	ac6e192db4	Completely purged old method of inputs	2021-03-14 17:26:55 -04:00
Sam	b5d501199d	Secondary input now fully functional	2021-03-14 17:26:53 -04:00
Sam	c6d8daaae3	Primary input now activated from control actions. Moved a lot of key_state to a HashSet so that it is handled automatically.	2021-03-14 17:26:51 -04:00
Snowram	60dd47cdea	Theropod charge attack	2021-03-14 18:10:40 +01:00
PersianKnight	b87514266d	Bug fix debug info hotkey and axe skill tree text	2021-03-14 20:16:54 +03:30
Snowram	9d7e8957bb	Add new npcs	2021-03-14 14:24:35 +01:00
Christof Petig	15b11d9154	Implement /price_list (work in progress), stub for /buy and /sell remove outdated economic simulation code remove old values, document add natural resources to economy Remove NaturalResources from Place (now in Economy) find closest site to each chunk implement natural resources (the distance scale is wrong) cargo fmt working distance calculation this collection of natural resources seem to make sense, too much Wheat though use natural resources and controlled area to replenish goods increase the amount of chunks controlled by one guard to 50 add new professions and goods to the list implement multiple products per worker remove the old code and rename the new code to the previous name correctly determine which goods guards will give you access to correctly estimate the amount of natural resources controlled adapt to new server API instrument tooltips Now I just need to figure out how to store a (reference to) a closure closures for tooltip content generation pass site/cave id to the client Add economic information to the client structure (not yet exchanged with the server) Send SiteId to the client, prepare messages for economy request Make client::sites a HashMap Specialize the Crafter into Brewer,Bladesmith and Blacksmith working server request for economic info from within tooltip fully operational economic tooltips I need to fix the id clash between caves and towns though fix overlapping ids between caves and sites display stock amount correctly handle invalid (cave) ids in the request some initial balancing, turn off most info logging less intrusive way of implementing the dynamic tool tips in map further tooltip cleanup further cleanup, dynamic tooltip not fully working as intended correctly working tooltip visibility logic cleanup, display labor value separate economy info request in a separate translation unit display values as well nicer display format for economy add last_exports and coin to the new economy do not allocate natural resources to Dungeons (making town so much larger) balancing attempt print town size statistics cargo fmt (dead code) resource tweaks, csv debugging output a more interesting town (and then all sites) fix the labor value logic (now we have meaningful prices) load professions from ron (WIP) use assets manager in economy loading professions works use professions from ron file fix Labor debug logic count chunks per type separately (preparing for better resource control) better structured resource data traders, more professions (WIP) fix exception when starting the simulation fix replenish function TODO: - use area_ratio for resource usage (chunks should be added to stock, ratio on usage?) - fix trading documentation clean up fix merge artifact Revise trader mechanic start Coin with a reasonable default remove the outdated economy code preserve documentation from removed old structure output neighboring sites (preparation) pass list of neighbors to economy add trade structures trading stub Description of purpose by zesterer on Discord remember prices (needed for planning) avoid growing the order vector unboundedly into_iter doesn't clear the Vec, so clear it manually use drain to process Vecs, avoid clone fix the test server implement a test stub (I need to get it faster than 30 seconds to be more useful) enable info output in test debug missing and extra goods use the same logging extension as water, activate feature update dependencies determine good prices, good exchange goods a working set of revisions a cozy world which economy tests in 2s first order planning version fun with package version buy according to value/priority, not missing amount introduce min price constant, fix order priority in depth debugging with a correct sign the trading plans start to make sense move the trade planning to a separate function rename new function reorganize code into subroutines (much cleaner) each trading step now has its own function cut down the number of debugging output introduce RoadSecurity and Transportation transport capacity bookkeeping only plan to pay with valuable goods, you can no longer stockpile unused options (which interestingly shows a huge impact, to be investigated) Coin is now listed as a payment (although not used) proper transportation estimation (although 0) remove more left overs uncovered by viewing the code in a merge request use the old default values, handle non-pileable stocks directly before increasing it (as economy is based on last year's products) don't order the missing good multiple times also it uses coin to buy things! fix warnings and use the transportation from stock again cargo fmt prepare evaluation of trade don't count transportation multiple times fix merge artifact operational trade planning trade itself is still misleading make clippy happy clean up correct labor ratio of merchants (no need to multiply with amount produced) incomplete merchant labor_value computation correct last commit make economy of scale more explicit make clippy happy (and code cleaner) more merchant tweaks (more pop=better) beginning of real trading code revert the update of dependencies remove stale comments/unused code trading implementation complete (but untested) something is still strange ... fix sign in trading another sign fix some bugfixes and plenty of debugging code another bug fixed, more to go fix another invariant (rounding will lead to very small negative value) introduce Terrain and Territory fix merge mistakes	2021-03-14 03:18:32 +00:00
Imbris	fcdd7f1c8b	Merge branch 'imbris/tracy-tweaks' into 'master' Improvements for tracy server analysis and other misc tweaks See merge request veloren/veloren!1891	2021-03-13 22:26:26 +00:00
Imbris	0127832172	Fix tracy not working in certain areas, add span to chunk gen, missing fmt, remove extra span, make voxygen use INFO level instead of TRACE in tracy mode	2021-03-13 13:30:20 -05:00
PersianKnight	7c0fe70453	Improve default value of windows_size in Graphics and Help Windows in Interface Settings.	2021-03-13 19:09:38 +03:30
PersianKnight	42d57ccb92	The appearance of the reset buttons has improved.	2021-03-13 17:42:52 +03:30
PersianKnight	e3c0ceb9fa	Fixed Toggle Debug Info from Settings	2021-03-13 17:38:34 +03:30
Imbris	8d0b776f18	Move server-cli commands to separate file, tracy profiling par_join improvements, misc improvements - remove overwritten logging setting in server-cli - add server-cli command to load a random area for testing without a client - make admin add/remove commands modify ingame players instead of needing to reconnect - add spans to par_join jobs - added test command that loads up an area of the world - add tracy-world-server alias - set debug directives to info for logging	2021-03-13 02:28:59 -05:00
Samuel Keiffer	4022937da7	Merge branch 'PersianKnight/InterfaceSettings' into 'master' Separated InterfaceSettings from GameplaySettings See merge request veloren/veloren!1887	2021-03-13 01:55:18 +00:00
DaforLynx	99261bf105	Many small changes to audio code, mainly sfx - changelog in MR	2021-03-12 15:00:09 -08:00
PersianKnight	dcb32a7ff1	Separated InterfaceSettings from GameplaySettings	2021-03-12 22:45:44 +03:30
jshipsey	49f496e290	intitial values	2021-03-12 00:58:12 -05:00
Marcel	93cab075f8	Merge branch 'xMAC94x/non_blocking_register' into 'master' Auth requests are now done async, the register system is fetching it, via a PendingLogin component See merge request veloren/veloren!1875	2021-03-11 21:51:55 +00:00
Joshua Barretto	a9bcaf0a37	Merge branch 'PersianKnight/Reset_to_Defaults_Buttons' into 'master' Add Reset to Default Buttons for Interface, Gameplay and Sound Settings See merge request veloren/veloren!1877	2021-03-11 21:29:11 +00:00
PersianKnight	3b3ffe30e9	Add Reset to Default Buttons for Interface, Gameplay and Sound Settings	2021-03-11 22:09:30 +03:30
Joshua Barretto	f479231b15	Merge branch 'glowy-shiny-pretty' into 'master' Glowy shiny pretty See merge request veloren/veloren!1874	2021-03-11 17:37:33 +00:00
Samuel Keiffer	9b198b5cda	Merge branch 'sam/sceptre-overhaul' into 'master' Overhaul sceptre Closes #768 See merge request veloren/veloren!1845	2021-03-11 16:47:50 +00:00
Marcel Märtens	728bff610b	Allow HTTP auth servers again. only `localhost` are allowed in a release build. when debug assertions are on, others are also allowed. This change undoes the changes to the settings, so compared to master, there is no effect	2021-03-11 17:24:52 +01:00
Marcel Märtens	381bb5eef0	fix tracy	2021-03-11 17:05:17 +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	09e32cb952	Initial implementation of glow/shininess	2021-03-10 18:58:25 +00:00
Marcel Märtens	b151a246c3	update specs to get rid of old deps	2021-03-10 13:22:17 +01:00
Bryan Quigley	506adb4eec	Stop requiring specfici euc version (was done to hold back vek version) Then ran cargo update	2021-03-09 15:53:24 -08: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
Monty	49fcd6ee13	adjusted combo counter anim	2021-03-09 17:59:43 -05:00
Sam	940b4b5de7	Combo counter now uses outcomes.	2021-03-09 17:59:42 -05:00
Monty	c29cb037e7	better combo indicator animation	2021-03-09 17:59:41 -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
Monty	53100b6f37	combo point display	2021-03-09 17:59:40 -05:00
Sam	c5f74e528d	Animation for cast aura, combo information passed to skillbar.	2021-03-09 17:59:40 -05:00
Sam	b6f4543a14	Fixed beam offsets, told healing beam to use beam animation.	2021-03-09 17:59:40 -05:00
Sam	c6a222340e	Particles for lifesteal beam. Changed how frontend recognized beams.	2021-03-09 17:59:39 -05:00
Marcel Märtens	d7df741671	update dependencies, including removal of some tracy deps as they are get through common/tracy	2021-03-09 20:17:29 +01: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
Marcel	d229ab1eb9	Merge branch 'aweinstock/critical-stats' into 'master' Add critical chance and critical multiplier stats to weapons. See merge request veloren/veloren!1864	2021-03-09 10:55:36 +00:00
Marcel	8c868aebc7	Merge branch 'xMAC94x/common_ecs' into 'master' Move Specs code to own common_ecs create, put tracy and macros into common_base See merge request veloren/veloren!1863	2021-03-09 09:48:53 +00:00
Avi Weinstock	d8f0a1c426	Add critical chance and critical multiplier stats to weapons.	2021-03-08 23:27:25 -05:00
Marcel Märtens	4ebfbdde0f	Move Specs code to own common_ecs create, put tracy and macros into common_base	2021-03-09 00:54:01 +01:00
Adam Blanchet	16b66f9cd6	Add reset button to graphics settings	2021-03-08 18:48:38 +01:00
Marcel Märtens	f353f14703	change Name from VSystem to System	2021-03-08 13:15:00 +01:00
Marcel Märtens	6b88545481	restructure server metrics - get rid of old SysTimers for each system in favour of VSystem tracking - move metrics generation from lib.rs to own system - code cleanup - remove time tracking in common::sys	2021-03-08 11:51:13 +01:00
Marcel Märtens	c515fece28	Implement a VSystem trait that can be implemented by Systems. It will autodo some things, like track start and time and export those in system metrics Add a origin and implement it for all Systems in Veloren	2021-03-08 11:51:04 +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	911acdd9db	Fixed clippy warnings and fmt	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	862cd5fe49	fmt	2021-03-07 14:25:03 +00:00
Joshua Barretto	a229d65932	Static light improvements, fixed lighting update bug	2021-03-07 14:25:02 +00:00
Joshua Barretto	120cb86c0d	Switched back to simd repr	2021-03-07 14:25:02 +00:00
Joshua Barretto	427e0af73c	Reverted to repr_c vek	2021-03-07 14:25:02 +00:00
Joshua Barretto	1d16f14dd5	Small fixes	2021-03-07 14:25:02 +00:00
Joshua Barretto	f537f82b17	Updated vek, fixed house wall bugs	2021-03-07 14:25:02 +00:00
Joshua Barretto	7b807ed34c	Removed dead code	2021-03-07 14:25:02 +00:00
Monty	8214c9df82	PoI icon	2021-03-07 14:25:01 +00:00
Joshua Barretto	717bbbf23e	Better static light propagation between translucent objects	2021-03-07 14:25:01 +00:00
Joshua Barretto	9e09c96a2a	Fixed static light directionality	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	6fc7d2a906	Faster More interesting giant trees, better oaks, hives on branches	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
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
Marcel	a68afa1fad	Merge branch 'aweinstock/stack-trading' into 'master' Allow using stack splitting into or out of a trade. See merge request veloren/veloren!1850	2021-03-04 14:34:05 +00:00
Joshua Yanovski	2dd7089e52	Bring vek up to date so we can bump rustc (hopefully).	2021-03-04 05:46:59 +01:00
Avi Weinstock	0472956b5c	Allow using stack splitting into or out of a trade.	2021-03-03 18:19:10 -05:00
Lippy13	d9d3c1f55b	Make the BuffKind match expression exhaustive	2021-03-03 21:10:41 +00:00
Lippy13	59594a8b60	Check if duration exists instead of defaulting to zero and clean up code	2021-03-03 20:39:14 +00:00
Marcel Märtens	a55ec20c74	fix #46 🥳	2021-03-03 12:37:09 +01:00
Lippy13	48f974bf01	Address comments on passing effects	2021-03-03 00:25:15 +00:00
Lippy13	a7c30b6721	Account for no duration being possible	2021-03-03 00:25:14 +00:00
Lippy13	ffd0c01bbd	Fix Clippy errors Fix code formatting Add descriptions for other potential buffs for consumables	2021-03-03 00:25:13 +00:00
Lippy13	5e3a1b203f	Add buff information to item tooltips	2021-03-03 00:25:11 +00:00
Snowram	f4278840c6	Fixes light offset for objects	2021-03-02 19:28:33 +01:00
ccgauche	7f4411ba1f	Merge branch 'master' into 'ccgauche/plugin-player-join-event' # Conflicts: # CHANGELOG.md	2021-03-02 09:45:15 +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
Ben Wallis	0f7ff21c20	Merge branch 'item-stacking-and-splitting' into 'master' Implement stacking and splitting Closes #904 See merge request veloren/veloren!1802	2021-03-02 00:08:47 +00:00
Jesus Bracho	c0573cca44	Implement stacking and splitting	2021-03-02 00:08: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
ccgauche	9628dfaf99	Fixed comments	2021-03-01 21:29:18 +01:00
ccgauche	dbd4d70b79	Lots of improvement in pointer management (switched from i32 to u64) + New event implemented	2021-03-01 19:00:44 +01: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
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
Sam	a88ad7b971	Added invulnerability debuff. Currently tied to campfire spawned with '/campfire' command.	2021-02-28 15:02:03 -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
Samuel Keiffer	cb267ac3ee	Merge branch 'sam/combo-comp' into 'master' Combo now persists as a compnent, rather than a field on a state See merge request veloren/veloren!1828	2021-02-28 02:42:40 +00:00
Sam	b25a376995	Re-allowed for what stage you were on to persist through a roll	2021-02-27 19:24:18 -05:00
Sam	404c7f0905	Combo melee now checks combo	2021-02-27 18:24:28 -05:00
Snowram	7f2276324e	Reduces the instances of f64 in anims	2021-02-27 23:21:03 +01:00
jshipsey	b4627dfe19	look-based anims	2021-02-27 16:19:33 -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
Justin Shipsey	d2fffa1a92	Merge branch 'slipped/gremlins' into 'master' dungeon enemy overhaul part 1 See merge request veloren/veloren!1697	2021-02-27 17:00:52 +00:00
Samuel Keiffer	fa809fc292	Merge branch 'Lerg/Accumulate_Damage_Floaters' into 'master' Issue #836 - Declutter the scrolling combat text See merge request veloren/veloren!1823	2021-02-27 16:18:18 +00:00
jshipsey	16720a6826	weapon/manifest tweaks	2021-02-27 10:44:55 -05:00
Lerg	3fe5f4484e	Issue #836 - Declutter the scrolling combat text	2021-02-27 15:10:47 +03: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	ebfb59f041	Trims skeletal attributes	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
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
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
Sam	b0b4a07b9e	Bows	2021-02-24 20:37:43 -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
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
Samuel Keiffer	e1be8dbcd9	Merge branch 'aweinstock/quickfix-sword-spin-speed' into 'master' Fix description for the sword spin speed skill tree upgrade (previously it was... See merge request veloren/veloren!1814	2021-02-23 03:14:44 +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
Avi Weinstock	ada4ca39f7	Fix description for the sword spin speed skill tree upgrade (previously it was a copy of damage's description).	2021-02-22 19:37:20 -05: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
Marcel Märtens	e3ef4422b6	cleanup `ClientConnArgs`	2021-02-22 21:07:20 +01: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
Marcel Märtens	1a7c179bbb	share tokio Runtime between Client and Server, name rayon Threadpool	2021-02-22 17:35:06 +01:00
Marcel Märtens	514d5db038	Update Network Protocol - now last digit version is compatible 0.6.0 will connect to 0.6.1 - the TCP DATA Frames no longer contain START field, as it's not needed - the TCP OPENSTREAM Frames will now contain the BANDWIDTH field - MID is not Protocol internal Update network - update API with Bandwidth Update veloren - introduce better runtime and `async` things that are IO bound. - Remove `uvth` and instead use `tokio::runtime::Runtime::spawn_blocking` - remove futures_execute from client and server use tokio::runtime::Runtime instead - give threads a Name	2021-02-22 17:34:55 +01: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
Sam	11050a05ce	Beam particles now determined from beam segment rather than character state.	2021-02-21 19:17:56 +01:00
Snowram	e7bbf3981d	Object animation	2021-02-21 19:17:44 +01: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
Marcel	a330d4b05c	Merge branch 'clangdo/fix_macos_build' into 'master' Backdate coreaudio-sys for OSX cross toolchain compatibility See merge request veloren/veloren!1799	2021-02-20 09:58:59 +00: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
Caelan	82c33d9ccb	Backdate coreaudio-sys for OSX cross toolchain compatibility See https://github.com/RustAudio/coreaudio-sys/issues/48	2021-02-19 15:46:36 -08: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	411b4083b1	Added 1h hammers. Fixed audio tests.	2021-02-19 17:30:24 -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	6f6a37faf2	Wielding a 1 handed weapon now correctly uses abilities when the second weapon is not also a 1 handed weapon.	2021-02-19 17:30:22 -05:00
Sam	f50fa25467	ItemConfig now stores AbilitySet directly instead of each individual ability.	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	d4f509b3d0	Added hands field onto weapons.	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
Marcel	c6d69d1196	Merge branch 'xMAC94x/network_tokio' into 'master' xMAC94x/network_tokio switch from `async_std` to `tokio` See merge request veloren/veloren!1789	2021-02-17 22:47:11 +00:00
Samuel Keiffer	95fdd0fcc3	Merge branch 'cherry-pick-2ef5fb90' into 'master' Fix missing controller actions See merge request veloren/veloren!1786	2021-02-17 21:10:14 +00:00
Ada Lovegirls	96b8a582fe	Fixed missing controller actions (cherry picked from commit 2ef5fb90e89bf3f8f0acc84e269f6948c696c196)	2021-02-17 21:10:14 +00:00
Marcel Märtens	ea8ab1ce7a	Great improvements to the codebase: - better logging in network - we now notify the send of what happened in recv in participant. - works with veloren master servers - works in singleplayer, using a actual mid. - add `mpsc` in whole stack incl tests - speed up internal read/write with `Bytes` crate - use `prometheus-hyper` for metrics - use a metrics cache	2021-02-17 16:15:00 +01:00
Marcel Märtens	9884019963	COMPLETE REDESIGN of network crate - Implementing a async non-io protocol crate a) no tokio / no channels b) I/O is based on abstraction Sink/Drain c) different Protocols can have a different Drain Type This allow MPSC to send its content without splitting up messages at all! It allows UDP to have internal extra frames to care for security It allows better abstraction for tests Allows benchmarks on the mpsc variant Custom Handshakes to allow sth like Quic protocol easily - reduce the participant managers to 4: channel creations, send, recv and shutdown. keeping the `mut data` in one manager removes the need for all RwLocks. reducing complexity and parallel access problems - more strategic participant shutdown. first send. then wait for remote side to notice recv stop, then remote side will stop send, then local side can stop recv. - metrics are internally abstracted to fit protocol and network layer - in this commit network/protocol tests work and network tests work someway, veloren compiles but does not work - handshake compatible to async_std	2021-02-17 12:39:47 +01:00
Marcel Märtens	5aa1940ef8	get rid of `async_std::channel` switch to `tokio` and `async_channel` crate. I wanted to do tokio first, but it doesnt feature Sender::close(), thus i included async_channel Got rid of `futures` and only need `futures_core` and `futures_util`. Tokio does not support `Stream` and `StreamExt` so for now i need to use `tokio-stream`, i think this will go in `std` in the future Created `b2b_close_stream_opened_sender_r` as the shutdown procedure does not need a copy of a Sender, it just need to stop it. Various adjustments, e.g. for `select!` which now requieres a `&mut` for oneshots. Future things to do: - Use some better signalling than oneshot<()> in some cases. - Use a Watch for the Prio propergation (impl. it ofc) - Use Bounded Channels in order to improve performance - adjust tests coding bring tests to work	2021-02-17 12:38:53 +01:00
Marcel Märtens	1b77b6dc41	Initial switch to tokio for network, minimum working example.	2021-02-17 12:37:59 +01:00
Caelan	dda4931f46	Clean and update dependencies * Remove tweak feature * Remove const-tweaker * Update tiny_http * Update bitvec to 0.21.0 * Downgrade euc to avoid conflict with vek 0.12.0 * Require exactly vek 0.12.0 * Update all other dependencies automatically based on these changes * Update gilrs to latest at the request of Ada Lovegirls * Update meshing benchmarks to new criterion API	2021-02-17 01:27:06 -08:00
Imbris	1a3e015da7	Merge branch 'huettner94/minimap_settings_persistence' into 'master' Persist minimap settings See merge request veloren/veloren!1785	2021-02-17 00:57:07 +00:00
Joshua Barretto	4d19308612	Merge branch 'lboklin/quat-ori' into 'master' Redefine Ori as a quaternion See merge request veloren/veloren!1755	2021-02-16 22:39:11 +00:00
Felix Huettner	589ffd2a97	Persist minimap settings This change persists the open/close state as well as the facing-north state of the minimap to the settings file.	2021-02-16 23:16:16 +01:00
Imbris	c2af25e1f6	Merge branch 'huettner94/minimap_rotation' into 'master' Allow minimap to always face north See merge request veloren/veloren!1784	2021-02-16 22:04:48 +00:00
Imbris	1352d7ad9c	Merge branch 'quellus/max-name-length' into 'master' Limit character name length Closes #528 See merge request veloren/veloren!1774	2021-02-16 21:29:45 +00:00
Quellus	8b4230db61	Limit character name length	2021-02-16 21:29: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
Ada Lovegirls	06575f601e	Merge branch 'master' into 'ada/improve-controller-bindings' # Conflicts: # CHANGELOG.md	2021-02-16 15:30:46 +00: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
Ludvig Böklin	0f1227ca7d	Use nlerp for interpolating rotations in animation	2021-02-15 11:01:59 +01:00
AdaLovegirls	390812f54e	Improve controller keybindings	2021-02-14 21:31:31 -06:00
Avi Weinstock	c984035976	MR 1775 review fixes. - Separate `invite` machinery from `group_manip` into it's own thing (includes renaming `group_invite` to `invite` where applicable). - Move some invite/trade machinery to `ControlEvent`. - Make `TradePhase` a proper enum instead of a bunch of bools. - Make `TradeId` a proper newtype. - Remove trades from `Trades` on accept (previously was only on decline). - Typo fixes/misc cleanup. - Add bullet point for trading to the changelog.	2021-02-14 11:13:56 -05:00
Avi Weinstock	232ddb0860	Polish trading implementation and address review comments. - Fix item swapping edge case - Document more assumptions/edge cases - fmt and clippy - s/ServerGeneral::GroupInvite/ServerGeneral::Invite/ - Use `Client::current` in `Client::is_dead`	2021-02-14 11:11:35 -05:00
Ludvig Böklin	84990553e0	Use Ori for base rotation matrix	2021-02-13 11:02:50 +01:00
Avi Weinstock	f6db8bb7c4	Implement actual inventory-manipulation part of trading server side.	2021-02-12 18:43:10 -05: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	aeb2398fc6	Trade implementation progress. - Server messages now bring up the trade window. - When a trade is declined, it closes the window on both clients.	2021-02-12 18:43:09 -05:00
Avi Weinstock	ae528124fc	Trade implementation progress. - State machine for modifying trades. - ServerGeneral/ClientGeneral messages.	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
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
Justin Shipsey	44a9d8dc71	Merge branch 'nward/chat-input-color-icon-rebased' into 'master' Rebase !1447 Chat input color and icon reflect channel message is sent to. See merge request veloren/veloren!1769	2021-02-10 19:42:59 +00:00
Quellus	63952875d9	Rebase !1447 Chat input color and icon reflect channel message is sent to.	2021-02-10 19:42:59 +00: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
Ludvig Böklin	065e260e78	Code quality	2021-02-09 14:06:27 +01:00
Ludvig Böklin	fa78674840	Encourage migration towards using quaternion in animations	2021-02-09 13:52:44 +01:00
Ludvig Böklin	582ddfc3cd	Ori: add tests, rename to_vec() => look_vec(); Dir: add methods, normalize on rot	2021-02-09 13:52:03 +01:00
Imbris	357cb26e05	Update native_dialog to 0.5.2	2021-02-07 00:48:57 -05:00
Ludvig Böklin	a1ff9ab83f	Redefine Ori as a quaternion	2021-02-05 09:33:14 +01: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
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
DaforLynx	b906473f4e	Aughihopethisworks	2021-01-30 22:27:12 -08: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	152156d065	Fix rebase and scrub poise from UI	2021-01-28 17:22:39 -08:00
jshipsey	d456271921	animal stuns Fix rebase	2021-01-28 17:22:39 -08:00
jiminycrick	661764f4aa	Some preliminary balancing Fix rebase	2021-01-28 17:22:39 -08:00
jshipsey	29732bb763	starting stun anim stagger anim, mirroring, bettern walk anim wielding with stuns/stagger Knockback fix Added Poise documentation/comments	2021-01-28 17:22:37 -08:00
jiminycrick	8b97199245	Update rand dependency	2021-01-26 20:35:08 -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
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
Justin Shipsey	5117edcff9	Merge branch 'pfau/sceptres' into 'master' 6 new sceptres, add DPS display to tooltips See merge request veloren/veloren!1724	2021-01-24 03:14:32 +00:00
Marcel	82147653df	Merge branch 'torvus-quick-fix' into 'master' Fix torvus See merge request veloren/veloren!1720	2021-01-23 22:31:15 +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
Sam	77312ccdd4	Move outcome vec from being defined in frontend and server to common.	2021-01-23 15:17:36 -05:00
Imbris	47bd74469b	Merge branch 'imbris/update-winit' into 'master' Update winit and iced See merge request veloren/veloren!1717	2021-01-23 09:22:58 +00:00
Imbris	7cbbb70c42	Merge branch 'pizzaluc/unlimited_FPS' into 'master' Implemented #896 - Added option for Unlimited FPS Closes #896 See merge request veloren/veloren!1713	2021-01-23 08:34:38 +00:00
Lucas Vulpius	43b5559325	Implemented #896 - Added option for Unlimited FPS	2021-01-23 08:34:38 +00:00
Justin Shipsey	fb09d14725	Merge branch 'Rotsuoy/SavannaGrass' into 'master' Rotsuoy/savanna grass See merge request veloren/veloren!1711	2021-01-23 07:46:54 +00:00
Rotsuoy	994677a4d0	Rotsuoy/savanna grass	2021-01-23 07:46:54 +00:00
Imbris	adaea096d2	Update winit and iced	2021-01-23 01:09:33 -05:00
Sam	5e4b6809ca	Sceptre nerfs.	2021-01-22 22:46:18 -05:00
Sam	4014b28d19	Removed body from stats component as there is already a body component.	2021-01-22 16:50:22 -05:00
Justin Shipsey	6de8ca32ce	Merge branch 'sam/lactose-tolerant-golems' into 'master' Gives golems a spin attack See merge request veloren/veloren!1709	2021-01-22 07:30:53 +00:00
Snowram	6ee87221e6	Use improved pullback on golem anim	2021-01-22 06:13:43 +01: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
Acrimon	b464a1876e	update itertools for voxygen	2021-01-20 16:00:08 +01:00
Acrimon	9f16a946ee	update a few deps	2021-01-20 15:53:58 +01: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
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	0b156542e4	roll keyframes Changed roll to have non-fixed acceleration.	2021-01-19 08:08:21 -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
jiminycrick	3d44ac2c35	Humanoid skill config and AI skill check updated axe skill with correct icons	2021-01-19 08:08:05 -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	6ce422748c	Added SkillSetConfig to specify skill sets for npcs.	2021-01-19 08:07:55 -05:00
Sam	968b66260e	Levling health gives you health. Added combat scaling to UI.	2021-01-19 08:07:54 -05:00
Sam	4f552a736e	Added skill point costs to tooltips.	2021-01-19 08:07:53 -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
Sam	b6d2d48ead	Exp floaters. You load in with correct energy and health values now.	2021-01-19 08:07:36 -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	82885af9c4	UI now shows how many levels you've invested into a skill.	2021-01-19 08:07:22 -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	cc60ca58be	Added sword skill tree	2021-01-19 08:06:59 -05:00
Jesus Bracho	ec79890335	Provide buff information on killed entities	2021-01-18 05:46:53 +00:00
Ben Wallis	c785e75e60	Follow-up fixes from review of inventory MR	2021-01-10 11:27:09 +00:00
Monty Marz	06e7ac25c1	fix loot tables, enemy bar color change	2021-01-09 15:26:24 +01:00
Scott Williams	c09098ee5f	Changed default option to false for smooth_pan_enable.	2021-01-08 21:08:57 +00: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
Joshua Barretto	1604616768	Merge branch 'ccgauche/new-wasmer-backend' into 'master' ccgauche/new wasmer backend See merge request veloren/veloren!1644	2021-01-08 08:48:31 +00:00
ccgauche	06ffe61219	Added feature flag changed field name to size	2021-01-08 08:48:30 +00:00
Imbris	58ec4760a5	Move to WindowEvent from DeviceEvent for zooming	2021-01-08 01:38:33 -05:00
Joshua Barretto	a4b9230f03	fixed Cargo.lock conflict Fixed `crossbeam-queue` being referenced twice in the lockfile	2021-01-07 20:25:12 +00:00
Benoît du Garreau	67642b0467	Use `concat` to build i18n specifiers"	2021-01-04 00:06:14 +01:00
Benoît du Garreau	055df2a8df	Avoid a reallocation	2021-01-04 00:06:14 +01:00
Benoît du Garreau	09e38e085c	Fix `i18n::list_localization` scanning the filesystem on each call	2021-01-04 00:06:14 +01:00
Marcel Märtens	c37384979c	switch toolchain to nightly-2021-01-01	2021-01-03 21:31:21 +01:00
Benoît du Garreau	8ced0a3810	Fix i18n::list_localizations	2021-01-03 17:48:23 +01:00
Imbris	17be17834e	Merge branch 'cache-video-modes' into 'master' Caching video modes fixes #729 Closes #729 See merge request veloren/veloren!1670	2021-01-02 06:43:34 +00:00
Vincent Foulon	d54f5ac5f8	cargo fmt	2021-01-01 23:37:21 +01:00
nobbele	c1859b46f2	caching video modes fixes #729	2021-01-01 17:51:37 +01:00
Vincent Foulon	f8cb45f2f0	verify every localization file instead of just the manifest	2020-12-31 12:32:23 +01:00
Vincent Foulon	b1f2a4eff5	fix wrongly named variables + rename i18n_files function + capitalize comments	2020-12-31 12:32:22 +01:00
Vincent Foulon	017bd86185	cargo fmt	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	5b62398e80	update tests to match the new folder layout	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	4d7b985be1	clean even more code	2020-12-31 12:32:19 +01:00
Vincent Foulon	a0a51110a5	clear i18n code + revert back some other part of the code to its original state	2020-12-31 12:32:18 +01:00
Vincent Foulon	59651eb032	Convert Localization from Asset to Compound	2020-12-31 12:32:18 +01:00
Vincent Foulon	2b6b2fd12e	use RonLoader as LocalizationFragment's loader directly	2020-12-31 12:32:17 +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	70c336c6cb	fix init_localization return value being in comment	2020-12-31 12:32:15 +01:00
Vincent Foulon	924c24fa78	(PoC)(WIP) Convert single translation file to a folder	2020-12-31 12:32:15 +01:00
Ben Wallis	5636083e27	* Fixed character load errors not being handled in Voxygen. * Improved server error message for character load errors. * Added server logging for item asset load errors during character load. * Fixed character select error message dialog not supporting long messages.	2020-12-30 19:29:22 +00:00
Acrimon	ce27cfb30f	update some error handling code	2020-12-29 01:21:09 +01: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
Frinksy	53d5a9373e	fixing #881 - Multiple buffs make the UI icons flicker	2020-12-22 15:40:57 +00:00
Adam Blanchet	5f9984df12	working towards #861 - Use scancodes for (at minimum) key remapping added ScanCode fallback for when winit doesn't provide a VirtualKeyCode renamed SKey to ScanKey	2020-12-18 10:01:30 +01:00
Benoît du Garreau	8aac030ecd	Fix bad specifier breaking on Windows	2020-12-17 17:22:02 +00:00
Marcel	d2da8d671f	Merge branch 'a1phyr/use_assets_manager' into 'master' Use `assets_manager` to load assets See merge request veloren/veloren!1624	2020-12-17 12:25:29 +00:00
Marcel	78e9f3de28	Merge branch 'test_util' into 'master' Add simple tests to utils description functions See merge request veloren/veloren!1526	2020-12-17 11:20:19 +00:00
Benoît du Garreau	989683d2d3	Improve world::Index	2020-12-17 12:08:04 +01:00
Benoît du Garreau	ce9d706ed4	Fix clippy lints	2020-12-17 12:06:28 +01:00
Benoît du Garreau	7b4aa6d4cc	cargo fmt	2020-12-17 12:06:22 +01:00
Benoît du Garreau	d090eefb00	Move the asset module to a single file	2020-12-17 12:06:13 +01:00
Benoît du Garreau	0cf164f33a	Use assets_manager to load assets	2020-12-17 12:06:07 +01:00
jiminycrick	60d5d62eef	Switched to hashbrown everywhere	2020-12-17 10:31:35 +01:00
Marcel Märtens	ea84cb138f	fix wrong alignment	2020-12-16 15:17:17 +01:00
Marcel Märtens	e8003a44dd	update specs	2020-12-16 14:31:16 +01:00
Marcel Märtens	a1b50a86c4	update guillotiere	2020-12-16 10:56:00 +01:00
Marcel Märtens	e3307344ab	get rid of some insecure dependencies	2020-12-16 10:42:36 +01:00
Marcel	24a840bc6b	Merge branch 'xMAC94x/dependencies' into 'master' update chrossbeam, tracy, prometheus (and reduce server deps to crossbeam-channel) See merge request veloren/veloren!1641	2020-12-16 09:33:34 +00:00
Justin Shipsey	e7249210f6	accel based run	2020-12-16 08:07:38 +00:00
Marcel Märtens	107fd432f5	update further crates	2020-12-16 08:56:21 +01:00
Marcel Märtens	26918d10c9	update chrossbeam, tracy, prometheus (and reduce server deps to crossbeam-channel)	2020-12-16 00:51:07 +01:00
Marcel	5600d93844	Merge branch 'james/healbomb-sfx-fix' into 'master' Healing bomb sfx fix See merge request veloren/veloren!1637	2020-12-15 13:15:32 +00:00
Joshua Barretto	494436be01	Hid plugins behind a feature flag to resolve Windows CI issue	2020-12-15 11:14:26 +00:00
jiminycrick	ce03fcfda3	Healing bomb sfx fix	2020-12-14 21:36:51 -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
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
Snowram	96ed008348	Puts objects offsets into a .ron file	2020-12-14 02:43:49 +01:00
Joshua Barretto	9f2e01617e	Merge branch 'plugins' into 'master' Plugins and codebase refactor See merge request veloren/veloren!1625	2020-12-14 00:53:09 +00: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
Joshua Barretto	023888f560	Updated changelog, fmt and clippy fixes	2020-12-13 17:40:15 +00:00
Joshua Barretto	f8c8e342e6	Moved common networking code to common/net, clippy fixes	2020-12-13 17:23:45 +00:00
Marcel Märtens	534f083b08	get rid of insecure dependency completly	2020-12-11 16:13:57 +01:00
Monty Marz	f9d4d744a0	Better group frame placement	2020-12-10 21:31:19 +01:00
Monty Marz	f2ba7cc297	add baobabs, fix map difficulty, make mushrooms lootable	2020-12-10 18:06:29 +01:00
Marcel Märtens	ccb01e1898	adjust fmt and clippy after toolchain upgrade	2020-12-10 14:53:01 +01:00
Snowram	6713ac935f	Addressed comments	2020-12-08 23:04:21 +01:00
Snowram	2e8ac0688c	Adds accumulated velocity for animation	2020-12-08 23:03:41 +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
Marcel	ed9413e96a	Merge branch 'HiggsTardigradeTau/deltatime-lowest-delta-usage' into 'master' Resolve #867 - Make deltatime use the lowest delta of several frames to avoid 'teleport' effect after single-frame lag spike Closes #867 See merge request veloren/veloren!1592	2020-12-08 21:07:15 +00:00
HiggsTardigradeTau	57d3a595ce	Resolve #867 - Make deltatime use the lowest delta of several frames to avoid 'teleport' effect after single-frame lag spike	2020-12-08 21:07:14 +00:00
Sam	490915d384	Modified how most abilites that could scale were scaled.	2020-12-07 22:00:24 -06:00
Ben Wallis	81a8ee0c19	Changed logging to use termcolor crate to fix ansi control codes showing when run under Windows Command Prompt	2020-12-06 14:49:13 +00:00
Joshua Barretto	77a39d74d4	Removed public fields from Client, turned a character error into a frontend event	2020-12-05 11:20:25 +00:00
Joshua Barretto	e5ebbd31fa	Began using Grid<T> for LoD data	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
Imbris	d1431d734a	Merge branch 'imbris/update-winit' into 'master' Don't drop the wayland clipboard Closes #855 See merge request veloren/veloren!1576	2020-12-02 01:33:29 +00:00
Imbris	d7f506cf71	Don't drop wayland clipboard	2020-12-01 19:35:32 -05:00
Imbris	b6b03c4a5f	Merge branch 'weldar/remove-ssaa' into 'master' Removed SSAA option Closes #871 See merge request veloren/veloren!1587	2020-12-02 00:21:30 +00:00
Marcel	bf136a62c5	Merge branch 'xMAC94x/veloren_anim_move' into 'master' move anim code from voxygen/src/anim to voxygen/anim See merge request veloren/veloren!1585	2020-12-01 20:01:26 +00:00
Marcel Märtens	e5e255cbd3	move anim code from voxygen/src/anim to voxygen/anim	2020-12-01 20:20:01 +01:00
Forest Anderson	57c2f21e4d	Cleaning	2020-12-01 10:28:39 -05:00
weldar	a2d98d31a7	Removed SSAA option to resolve issue #871 .	2020-12-01 09:43:06 -05:00
Marcel Märtens	e398cca53c	move common_state into common_sys	2020-12-01 13:46:28 +01:00
Marcel Märtens	add7922653	Move Systems out of common into `common_sys` This requires to move `State` into a own crate called `common_state` which depends on `common` and `common_sys`	2020-12-01 13:44:07 +01:00
Marcel	9e5c31a27e	Merge branch 'xvar/tooltip-fade-fix' into 'master' Changed tooltip fade time from 100 to 0ms to fix tooltip glitching See merge request veloren/veloren!1567	2020-11-30 21:13:05 +00:00
Marcel	a189163910	Merge branch 'azymohliad/sun-movement-direction' into 'master' Fix Sun and Moon movement direction See merge request veloren/veloren!1568	2020-11-30 21:13:03 +00:00
Nicholas Kinney	885e1aac61	Offspec/larger scalemode range	2020-11-30 20:36:58 +00:00
Marcel Märtens	ca1601a980	Change the version number to 0.8	2020-11-28 11:25:58 +01:00
Andrii Zymohliad	8a6f08df91	Fix sun & moon movement direction They were rising on the west and setting on the east	2020-11-27 23:17:59 +02:00
Ben Wallis	7ce0c7fc05	Changed tooltip fade time from 100 to 0ms to fix tooltip glitching	2020-11-27 19:51:45 +00:00
Forest Anderson	9065d0ca02	Merge branch 'imbris/audio-fixes' into 'master' Stop unbounded wind volume when zooming out, make campfires quieter Closes #844 See merge request veloren/veloren!1566	2020-11-27 18:59:23 +00:00
Forest Anderson	c8735ba946	Merge branch 'timsueberkrueb/log-path-override' into 'master' Make VOXYGEN_LOGS override logs_path setting See merge request veloren/veloren!1565	2020-11-27 18:25:39 +00:00
Imbris	a96e9982c7	Stop unbounded wind volume when zooming out, make campfires quieter	2020-11-27 12:43:47 -05: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
Treeco	ca2e4080c0	Various tiny fixes: Text over lootbags no longer scales with distance due to performance Fixed meshing panic Fixed ambiant lighting default	2020-11-26 21:46:41 +00:00
Tim Süberkrüb	49e892b948	Make VOXYGEN_LOGS override settings This is needed to support package managers that enforce strict application confinement (e.g. snap).	2020-11-25 20:36:41 +01:00
Monty Marz	e7d27a2c21	fmt cleanup	2020-11-25 16:53:48 +00:00
Imbris	a545d099a2	Restore fix for dragging on windows platforms	2020-11-25 00:29:28 -05: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	33e4448542	Replaced every unnecssary powf in the entire codebase with either powi or sqrt.	2020-11-24 18:28:24 -06: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
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
jshipsey	a27b086401	placeholder for charge animal, animated leapmelee, small fixes	2020-11-24 17:48:49 -06:00
jshipsey	1f59ef92d8	species specific speeds, more animation	2020-11-24 17:48:48 -06:00
jshipsey	c07d8df58b	assigning weapons, building animations ability mapping	2020-11-24 17:48:43 -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	26fd40c0e3	Fmt, make clippy happy	2020-11-23 15:39:03 +00:00
Treeco	8922fd949f	Make zooming in then back out return to the previous zoom level	2020-11-23 10:58:22 +00:00
Joshua Barretto	0513a41981	Iteration order fix x2	2020-11-23 10:58:22 +00:00
Imbris	7c6fe69922	Show indicator over site icons	2020-11-23 10:58:22 +00:00
Joshua Barretto	765a1ca17b	Switched light map iteration order, fire bowls in dungeons	2020-11-23 10:58:21 +00:00
Treeco	a1236d4da0	Fixed map screens for rectangular worlds	2020-11-23 10:58:21 +00:00
Monty Marz	d069eb9a57	street lamp particles, ground fire bowl, misc fixes	2020-11-23 10:58:21 +00:00
Imbris	898bba8884	Demystify map site icon placement calculations	2020-11-23 10:58:21 +00:00
Joshua Barretto	b539ecf438	More lights, minimised light and glow map data	2020-11-23 10:58:21 +00:00
Joshua Barretto	4bb0da24b6	Addressed review comments	2020-11-23 10:57:57 +00:00
Joshua Barretto	df1b19ed64	Light/glow temporal interpolation hack	2020-11-23 10:57:57 +00:00
Joshua Barretto	bb9e593a44	Fixed glow AO	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
Monty Marz	099dfc959f	translations, fixes	2020-11-23 10:57:56 +00:00
Joshua Barretto	93a86a951e	Tweaked default graphics settings	2020-11-23 10:57:56 +00:00
Monty Marz	82da969707	fix overly long names clipping on the minimap	2020-11-23 10:57:56 +00:00
Joshua Barretto	7850b0bcaf	Added site names, dungeon difficulty, better explosions	2020-11-23 10:57:55 +00:00
Monty Marz	5b907ede9e	fix hints	2020-11-23 10:57:55 +00:00
Monty Marz	884a5d9c51	fix scrolling on non-windows OS	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	bcc220804a	Added exposure to settings	2020-11-23 10:57:55 +00:00
Monty Marz	8b6c73744e	more map stuff	2020-11-23 10:57:16 +00:00
Joshua Barretto	aa59d66a76	Fixed many map problems, re-added surface mist	2020-11-23 10:57:15 +00:00
Monty Marz	99b3a4465a	WIP map zooming and dragging	2020-11-23 10:57:15 +00:00
Monty Marz	c825e33f1a	map icon options WIP	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	b352ef5d55	Terrain pop-in, fixed agent pathfinding in water	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	fc26305ac8	Increases maximum sprite dimensions (if you suspect an issue, check this commit)	2020-11-23 10:37:59 +00:00
Imbris	7ba2efcde2	Attempt to fix ui bug with changing screens causing inventory slots and such to disappear, presumably due to dpi differences	2020-11-22 14:22:39 -05:00
Imbris	1355c1e8f5	Move tracy frame markers to proper locations, add a few spans	2020-11-22 14:22:39 -05:00
Imbris	82b95974f1	Log errors occuring when client keeps retrying connection to the server	2020-11-22 03:54:19 -05:00
Imbris	e72c69ca41	Merge branch 'imbris/fix-apple-bug' into 'master' Fix issues with not being able to grab highlighted apples by unifying distance checking Closes #820 See merge request veloren/veloren!1532	2020-11-21 02:55:09 +00:00
Imbris	ea275e320f	Rename pos fields of Cube and Cylinder for enhanced clarity and added a few tests to the find_dist module	2020-11-20 20:51:44 -05:00
Samuel Keiffer	435d354dad	Merge branch 'sam/interrupting-rolls' into 'master' Rolling can now interrupt any attack. See merge request veloren/veloren!1537	2020-11-20 18:37:44 +00:00
Sam	987df30dc4	Fixed audio test, added changelog line.	2020-11-20 11:50:01 -06:00
Monty Marz	dd338eb142	Update simple.rs	2020-11-20 17:56:26 +01:00
Joshua Barretto	8981dce4c9	Merge branch 'Awkor/rotate-camera-character-selection' into 'master' Implement #334 - Enable camera rotation in character selection screen Closes #334 See merge request veloren/veloren!1377	2020-11-20 16:32:39 +00:00
jiminycrick	3ef00c4e76	Fix audio disabling	2020-11-19 10:46:31 -08:00
Snowram	d98bfa72ad	Improves bipedlarge and theropod anims, balance tweaks	2020-11-19 00:56:50 +01:00
Snowram	b48de84f8c	Adds 3 new npcs	2020-11-19 00:53:17 +01:00
Snowram	44fe398ba3	Adds 2 new npcs, some models tweaks	2020-11-19 00:53:13 +01:00
Snowram	42d2108c39	Adds mindflayer npc	2020-11-19 00:53:09 +01:00
Snowram	9bfccd42d3	Adds new animals	2020-11-19 00:53:02 +01:00
jiminycrick	1ce3827e22	Address comment	2020-11-18 13:31:13 -08:00
jiminycrick	2d2f267907	Addressed comments and fixed pipeline	2020-11-18 13:31:13 -08:00
jiminycrick	3b47add55a	Fully move sfx away from ECS event bus	2020-11-18 13:31:13 -08:00
jiminycrick	b3aa454f8e	Initial work to move combat sfx to outcomes	2020-11-18 13:31:12 -08:00
jiminycrick	77d624f640	Made level up sounds use outcomes instead of emitting an event	2020-11-18 13:31:12 -08:00
jiminycrick	9c87345135	Moved functions to client out of audio and generalized non-positional ambient sfx	2020-11-18 13:31:12 -08:00
jiminycrick	a9711eea01	Beginning to address comments	2020-11-18 13:31:12 -08:00
jiminycrick	c44a9092d3	Biome definition tweaks and more sfx	2020-11-18 13:31:12 -08:00
jiminycrick	f0d14ebe20	fix rebase	2020-11-18 13:31:12 -08:00
jiminycrick	a684bc90fd	Quadraped footsteps and songs in biomes	2020-11-18 13:31:12 -08:00
jiminycrick	27dc43fe18	Audio test fixes	2020-11-18 13:31:12 -08:00
jiminycrick	ddd970b986	Even more clippy fixes	2020-11-18 13:31:12 -08:00
jiminycrick	e1fcb3744e	Comment out audio device picker	2020-11-18 13:31:12 -08:00
jiminycrick	ea1bc2941b	Clippy fixes	2020-11-18 13:31:12 -08:00
jiminycrick	d47e0bbb73	Getting merge ready minus device picker	2020-11-18 13:31:12 -08:00
jiminycrick	2d088faea4	Wind transition smoothing	2020-11-18 13:31:12 -08:00
jiminycrick	f182002e38	Underwater and cave reverb	2020-11-18 13:31:12 -08:00
jiminycrick	695cc7f5cb	Broken wind implementation	2020-11-18 13:31:12 -08:00
jiminycrick	9b759efe41	Snow footsteps	2020-11-18 13:31:12 -08:00
jiminycrick	09a1974974	River water sfx	2020-11-18 13:31:12 -08:00
jiminycrick	8f5a22671d	Re-added device selector to settings with new rodio	2020-11-18 13:31:12 -08:00
jiminycrick	decb0e3e24	Hackily upgraded rodio and cpal to 0.13	2020-11-18 13:31:12 -08:00
jiminycrick	d0bd5118bf	Made biome probabilities neater	2020-11-18 13:31:12 -08:00
jiminycrick	e880654f2e	Probability for biome play	2020-11-18 13:31:12 -08:00
jiminycrick	c8d79b0b0e	Dungeon and cave specific music	2020-11-18 13:31:12 -08:00
jiminycrick	0a9f1ee11c	Remove ambient channel system in favor of sfx system	2020-11-18 13:31:12 -08:00
jiminycrick	39d4ee8a96	Owls, campfires, and better bird sfx handling	2020-11-18 13:31:12 -08:00
jiminycrick	3169562a80	Night time sfx and swimming	2020-11-18 13:31:12 -08:00
jiminycrick	aa6b7cbb65	Bird calls from trees	2020-11-18 13:31:12 -08:00
jiminycrick	9e790f6cac	Really broken block sfx pushed so others can see	2020-11-18 13:31:12 -08:00
jiminycrick	3473347742	Sfx from blocks	2020-11-18 13:31:12 -08:00
jiminycrick	0689630d98	Fading music/ambient sounds decently upon biome transition	2020-11-18 13:31:11 -08:00
jiminycrick	b5aea464f3	Switch music at biome transitions	2020-11-18 13:31:11 -08:00
jiminycrick	46d3f6f6d2	Initial biome specific music and ambient sound channel	2020-11-18 13:31:11 -08:00
Imbris	7427367d96	Fix issues with not being able to grab highlighted apples by unifying distance checking	2020-11-17 23:06:02 -05:00
Snowram	950eb1976d	Addressed more comments	2020-11-17 23:54:01 +01:00
Snowram	83b2640e02	Makes basic beam Y offset depend on body scale	2020-11-17 23:27:13 +01:00
Snowram	7af561263d	Addressed comments	2020-11-17 23:27:13 +01:00
Snowram	93642428f2	Move eye sight and scale in body.rs, mounts tweaks	2020-11-17 23:27:13 +01:00
David Fisher	b93d4bf85c	Add simple tests to utils description functions I initially ended up in this file looking to take on issue #707 which I realized had been already done. Having touched the file though I thought it good to add some basic tests to get used to the workflow on the project and how things are setup here. This commit adds some basic requests and cleans up some comments which appear to have been left as placeholders for work which appears to have been completed already. I attempted to test the tool_desc and armor_desc functions, but realized I wasn't sure how to best create an instance of Armor or Tool without modifying other files to make more things public. This is my first commit on the project, and was intentionally kept simple accordingly.	2020-11-15 18:53:20 -05:00
Odd-Harald Lillestø Myhren	774ef72344	Merge branch 'master' into 'knarkzel/persist-combo-roll' # Conflicts: # CHANGELOG.md	2020-11-15 22:37:30 +00:00
Knarkzel	64da99a4d7	add new was_combo field to test	2020-11-15 23:49:01 +01:00
Joshua Barretto	171ef1d7b9	Upscaling support	2020-11-15 22:18:35 +00:00
Imbris	4872d285c3	Merge branch 'imbris/fix-font-selection' into 'master' Properly use localization specified fonts, fix swedish translation by adding... Closes #834 See merge request veloren/veloren!1521	2020-11-15 03:18:29 +00:00
Imbris	03c96a7c7b	Properly use localization specified fonts, fix swedish translation by adding other fonts to the font mapping list	2020-11-14 21:31:31 -05:00
Imbris	4f2512f126	Save the selected character, deselect character when deleting, auto select newly created character	2020-11-14 19:17:42 -05:00
Imbris	5dbb1aeae7	Merge branch 'imbris/fix-7' into 'master' Fix panic on minimizing window before the game starts up See merge request veloren/veloren!1514	2020-11-14 03:30:13 +00:00
Imbris	ff5b152525	Merge branch 'imbris/fix-6' into 'master' Fix issue where ui scale in the login menu was not updated when changed in-game Closes #578 See merge request veloren/veloren!1513	2020-11-14 02:49:41 +00:00
Imbris	a044981fd7	Fix panic on minimizing window before the game starts up	2020-11-13 21:09:19 -05:00
Imbris	1373b752ff	Merge branch 'imbris/fix-5' into 'master' Remove randomization of species and body_type with the randomize button in char creation See merge request veloren/veloren!1512	2020-11-14 01:56:28 +00:00
Imbris	51dd5110d0	Merge branch 'imbris/fix-3' into 'master' Tweak clock related things and fix voxygen tracy feature See merge request veloren/veloren!1506	2020-11-14 01:39:33 +00:00
Imbris	cff5439796	Fix issue where ui scale in the login menu was not updated when changed in-game	2020-11-13 20:17:59 -05:00
Imbris	1952785af2	Remove randomization of species and body_type with the randomize button in char creation	2020-11-13 19:43:32 -05:00
Samuel Keiffer	1ed90bd0bf	Merge branch 'sam/ron-abilities' into 'master' Move abilities to .ron files Closes #821 See merge request veloren/veloren!1508	2020-11-13 17:55:57 +00:00
Sam	b5f59f9cf3	Fixed tests. Addressed comments.	2020-11-13 10:41:34 -06:00
Monty Marz	7da8c71d89	radio buttons for buff position in settings	2020-11-13 14:32:15 +01:00
Monty Marz	691d1f5243	bigger buff icons above skillbar	2020-11-13 14:20:33 +01:00
Imbris	5fa2ac6e38	Handle window resizing properly to fix some bugs on startup	2020-11-12 23:56:36 -05:00
Imbris	f1ca3ccc69	Fix language and ui resolution in menus not updating when they are changed ingame	2020-11-12 23:03:44 -05:00
Imbris	37e4ea4669	Remove ability map from top level functions	2020-11-12 21:24:35 -06:00
Sam	9b4fa4e961	Started moving loading of ability manifest to an ecs variable.	2020-11-12 21:24:34 -06:00
Imbris	27d4310498	Add more catagories to common deps, store average busy dt as a duration, store frame delta times as seconds instead of milliseconds	2020-11-12 19:18:54 -05:00
Imbris	fffd5d0ef0	Fix offset issue in ui on startup	2020-11-11 23:47:07 -05:00
Imbris	c0e8298ac3	Display averaged busy dt	2020-11-11 23:26:13 -05:00
Imbris	d5dd126724	Add tracy feature that randomly disappeared back into voxygen	2020-11-11 22:33:02 -05:00
Imbris	a97b188bea	Make fps display and specification more precise	2020-11-11 21:47:22 -05:00
Snowram	af346806de	Addressed comments	2020-11-11 22:03:54 +01:00
Snowram	fe977f0a6c	Adds a speed stat to weapons	2020-11-11 22:03:53 +01:00
Joshua Barretto	7bce8b9615	More resiliant settings, better key defaults	2020-11-11 17:37:26 +00:00
Imbris	865482d768	ui: Improve login info banner gradient, smallify things, put login menu quit button at the bottom	2020-11-11 03:02:51 -05:00
Imbris	61c0780872	Remove uneeded commented code, add notes to remaining commented code, use source rect calculations from conrod backend code	2020-11-11 03:02:51 -05:00
Imbris	64d885a192	Clippy fixes	2020-11-11 03:02:51 -05:00
Imbris	584824d405	Tweak scrollbar in char select screen to look nicer, fix warnings, remove old ui code, add character loading/deleting/creating/error info popups	2020-11-11 03:02:23 -05:00
Imbris	9df8368c88	Add some tracing spans	2020-11-11 03:02:23 -05:00
Imbris	d2166fed3d	Make iced ui use scale from the settings	2020-11-11 03:02:22 -05:00
Imbris	eda7b380dd	Change glyph cache position tolerance to match changes in master	2020-11-11 03:02:22 -05:00
Imbris	469b048de9	Update iced	2020-11-11 03:02:22 -05:00
Imbris	90bfafc469	Fix tooltip positioning for tooltipped elements inside Scrollable widgets	2020-11-11 03:02:22 -05:00
Imbris	cd1a134c26	Fix bug in body.validate(), add sliders to iced char creation screen, make char selection screen more closely resemble the master version in style	2020-11-11 03:02:22 -05:00
Imbris	7aa8412556	Add tooltips in iced char creation to species, tools, randomize button, and create button	2020-11-11 03:02:22 -05:00
Imbris	fe7d65843b	Highlight button of selected character, enter the world if character is selected when enter key is pressed	2020-11-11 03:02:22 -05:00
Imbris	3b664d2efb	Fix tooltip border images, fade tooltips properly, improve tooltip positioning	2020-11-11 03:02:22 -05:00
Imbris	d8854e9300	Add a tooltip to the char select screen to test	2020-11-11 03:02:22 -05:00
Imbris	5c85a29111	Create Tooltip widget in iced	2020-11-11 03:02:22 -05:00
Imbris	0361272746	Update to reflect changes in master ui: switched daggers with sceptre, added background at the bottom of the loading screen, added randomize button in the char creation screen	2020-11-11 03:02:22 -05:00
Imbris	0ab1a1ebb0	Loading screen: show animated gears instead of status message, show tips	2020-11-11 03:02:22 -05:00
Imbris	489a8a8f9e	Remove background banner from login screen input boxes and move logo to right corner	2020-11-11 03:02:22 -05:00
Yusuf Bera Ertan	bae7f56393	add padding to language select and server select menu buttons so that the scrollbar doesn't overlap them	2020-11-11 03:02:22 -05:00
Yusuf Bera Ertan	52479fec2f	add title to server select menu, don't use unneeded Container in language select menu	2020-11-11 03:02:22 -05:00
Yusuf Bera Ertan	12abd64a01	change the text arrows in language select and server select with proper ui elements	2020-11-11 03:02:22 -05:00
Yusuf Bera Ertan	5af6757de0	add language selection menu to main menu screen	2020-11-11 03:02:22 -05:00
Imbris	c247263258	Update to the latest git iced	2020-11-11 03:02:22 -05:00
Imbris	42c6550a0b	Add more parts of the character selection screen, add mouse detector widget, misc tweaks	2020-11-11 03:02:22 -05:00
Imbris	de770694d8	Basic structure of character selection	2020-11-11 03:02:22 -05:00
Imbris	bc42f3f229	Add tabbing between fields in login screen	2020-11-11 03:02:22 -05:00
Imbris	586bdddc9e	Add gradient primitive to ui, adjust textbox aspect ratio, misc tweaks	2020-11-11 03:02:22 -05:00
Imbris	3baac6aeba	Update to latest iced git, rebase fixes	2020-11-11 03:02:22 -05:00
Imbris	545f3bd44b	Start rewrite of character selection with iced	2020-11-11 03:02:21 -05:00
CapsizeGlimmer	34f92c7076	Implement renderer for slider	2020-11-11 03:02:21 -05:00
Imbris	10c046be2f	Delete conrod main menu code!!!!!!, small tweaks	2020-11-11 03:02:21 -05:00
Imbris	ba573d2065	Add error message box (is the main menu finished?)	2020-11-11 03:02:21 -05:00
Imbris	e29364eedf	Add border styling to container	2020-11-11 03:02:21 -05:00
Imbris	a94bc4b725	Make cancel button in connecting screen visble again, don't save username & server for singleplayer login, make iced version go back to login screen properly.	2020-11-11 03:02:21 -05:00
Yusuf Bera Ertan	a9541f1506	Implemented server selection screen	2020-11-11 03:02:21 -05:00
Imbris	e2bf974ecb	Add Scrollable widget support, implement disclaimer screen, rearrangements of main menu ui code	2020-11-11 03:02:21 -05:00
Imbris	01eb061a83	Fill in username & server fields in ui reimplementation, stop saving password in the settings file	2020-11-11 03:02:21 -05:00
Imbris	73982637b2	Add styling for Container, implement auth trust prompt, misc additions	2020-11-11 03:02:21 -05:00
Imbris	20a46eb526	Make all the fonts available in iced ui rework	2020-11-11 03:02:21 -05:00
Imbris	5c13983631	Add parts of main menu such as version text and info text banner, make connection screen	2020-11-11 03:02:21 -05:00
Imbris	d6b38c8cd2	More main menu work, split main menu ui into multiple modules, misc fixes in the renderer	2020-11-11 03:02:21 -05:00
Imbris	d2f5a44d02	Input fields layout tweaks	2020-11-11 03:02:21 -05:00
Imbris	80426f352b	Fix whitespace glitches, center text cursor	2020-11-11 03:02:21 -05:00
Imbris	561068106e	Add input fields to main menu attempt, fix a few bugs, add bullet point to the font (might have done this wrong). (just a few glitches left when text contains spaces)	2020-11-11 03:02:21 -05:00
Imbris	e4bc035a62	Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0	2020-11-11 03:02:21 -05:00
Imbris	75adcb20e8	More buttons, FillText custom widget that adjusts text size based on available space, created button component thing (a reusable composition of widgets), fixed log to tracing rebase error	2020-11-11 03:02:21 -05:00
Imbris	04fe308b9c	Rearrange iced renderer modules, wire up events for the main menu iced ui	2020-11-11 03:02:21 -05:00
Imbris	095345d8c6	Add support for Button widget, new custom widget AspectRatioContainer	2020-11-11 03:02:21 -05:00
Imbris	bc0792a57a	Rename localization/font types (e.g. VoxygenLocalization -> Localization)	2020-11-11 03:02:21 -05:00
Imbris	0053299b14	Text rendering for iced with glyph_brush works now	2020-11-11 03:02:20 -05:00
Imbris	fa1cd17a71	Add for<'b> lifetime annotation (almost worked)	2020-11-11 03:02:20 -05:00
Imbris	a7458c099c	Implement text renderering with glyph_brush (lifetime error)	2020-11-11 03:02:20 -05:00
Imbris	29526977d8	Add support for Space widget, refine main menu ui, misc fixes and improvements.	2020-11-11 03:02:20 -05:00
Imbris	b25162635a	Revamp BackgroundContainer with scale specific padding, and use in main menu attempt	2020-11-11 03:02:20 -05:00
Imbris	5428feb0df	Add Stack and CompoundGraphic widgets	2020-11-11 03:02:20 -05:00
Imbris	b5d31f6cba	Begin implementing container widget with an image background	2020-11-11 03:02:20 -05:00
Imbris	6a4b7b70c2	Start experimenting with replicating main menu	2020-11-11 03:02:20 -05:00
Imbris	0305c1979a	Get resizing working	2020-11-11 03:02:20 -05:00
Imbris	bbbede68fc	Initial setup to use iced	2020-11-11 03:02:20 -05:00
Marcel	696f607a70	Merge branch 'xMAC94x/clock' into 'master' massivly switch clock algorithm. See merge request veloren/veloren!1499	2020-11-10 22:12:12 +00:00
Monty Marz	0e072f72cc	frost cleaver velorite mage set offsets armor stats	2020-11-10 21:43:45 +00:00
Marcel Märtens	e4e5c6e55b	massivly switch clock algorithm. - before we had a Clock that tried to average multiple ticks and predict the next sleep. This system is massivly bugged. a) We know exactly how long the busy time took, so we dont need to predict anything in the first place b) Preduction was totally unrealistic after a single lag spike c) When a very slow tick happens, we dont benefit from 10 fast ticks. - Instead we just try to keep the tick time exact what we expect. If we can't manage a constant tick time because we are to slow, the systems have to "catch" this via the `dt` anyway.	2020-11-10 18:31:42 +01:00
jshipsey	db753c4f3b	adjust to comments	2020-11-09 18:47:52 -05:00
Sam	9b0e1c8dfc	Slight balance tweaks.	2020-11-08 19:33:24 -06:00
jshipsey	7aa3de35c9	hammer keyframes	2020-11-08 19:54:46 -05:00
Sam	8fa7e246e9	Minor tweaks.	2020-11-08 18:11:53 -06:00
jshipsey	0618de138e	rebase	2020-11-08 19:02:48 -05:00
jshipsey	20efc692fd	ranged	2020-11-08 18:52:22 -05:00
jshipsey	92aa6a1b12	axe basic	2020-11-08 18:51:35 -05:00
jiminycrick	33e87de17e	Initial combo melee for axe M1	2020-11-08 18:48:48 -05:00
AlKabir	9424ecfb4d	centering assets	2020-11-08 00:35:11 -06:00
AlKabir	6535deae9c	added two meat assets for mobs to drop	2020-11-07 23:34:20 -06:00
Imbris	133ba82a9b	Use item_definition_id for weapon asset mapping	2020-11-07 16:44:11 -06:00
Sam	4ae946d699	Fix audio tests.	2020-11-07 15:53:19 -06:00
Sam	a4046872b2	Yeeted from code files.	2020-11-07 15:53:10 -06:00
AlKabir	77f3c7e3c5	Minor combat fixes (see issue 785)	2020-11-07 18:00:07 +00:00
TheBoredProgrammer64	b2ec207979	Revert "Removed toolCategory" This reverts commit 5b0ff408176ff00408cc90f2516a90d5cd303e56.	2020-11-06 15:33:20 +00:00
Marcel Märtens	40f5afc2b0	ci cleanup, dependency update	2020-11-06 14:34:42 +01:00
Samuel Keiffer	44f676d90c	Merge branch 'sam/make-roll-great-again' into 'master' Roll overhaul See merge request veloren/veloren!1484	2020-11-06 03:25:18 +00:00
Sam	37ecb165ef	Addressed comments. Roll now only provides i-frames to melee attacks. It also reduces height of hitbox.	2020-11-05 20:40:20 -06:00
Snowram	262ceac060	fmt	2020-11-06 01:08:35 +01:00
Monty Marz	642ad805a1	potion buff	2020-11-06 01:08:34 +01:00
Snowram	a52f83e92c	Addresses some comments	2020-11-06 01:08:31 +01:00
Snowram	ce96af4363	Allow for an arbitrary array of effects and buffs for consumables	2020-11-06 01:08:30 +01:00
Sam	66850a5878	Fixed audio tests. Added changelog line.	2020-11-05 18:01:46 -06:00
jshipsey	fae3ef6e59	roll anim speedup	2020-11-05 16:40:30 -05:00
Sam	a0af315930	Addressed comments.	2020-11-04 19:22:08 -06:00
Sam	87bff41a66	Addressed comments.	2020-11-04 19:22:05 -06:00
Sam	c48c022f7e	Separated out health from stats component.	2020-11-04 19:22:04 -06:00
Snowram	a6d5d87bbc	Fix animations regressions for biped_large	2020-11-04 02:12:43 +01:00
jshipsey	3bb839da85	convert humanoid anims, warnings	2020-11-04 01:48:06 +01:00
Snowram	b47f42bad5	More biped_large work	2020-11-04 01:48:05 +01:00
jshipsey	f009492319	cleanup 4	2020-11-04 01:48:05 +01:00
unknown	14ec1b9f5f	starting to wire in new wield setup for bipedlarge	2020-11-04 01:48:05 +01:00
jshipsey	e6eeef4524	setup for axe/bow wield	2020-11-04 01:48:05 +01:00
jshipsey	28cde31bbb	setup for staff, more anim conversions	2020-11-04 01:48:05 +01:00
Snowram	ef1428f9fe	Bones scaling cleanup	2020-11-04 01:48:05 +01:00
jshipsey	3d23475abd	starting to wire in new wield setup	2020-11-04 01:48:05 +01:00
Snowram	72b15a1e24	More new style keyframe translation	2020-11-04 01:48:05 +01:00
jshipsey	c878673a84	cleanup 3	2020-11-04 01:48:05 +01:00
jshipsey	f79181c01f	cleanup 2	2020-11-04 01:48:05 +01:00
jshipsey	e5734c1829	adjust skeleton_attr to s_a	2020-11-04 01:48:05 +01:00
Snowram	f9f3d33189	More new style keyframe translation	2020-11-04 01:48:04 +01:00
jshipsey	e928dbe4db	start cleanup	2020-11-04 01:48:04 +01:00
Snowram	a8dd44325f	Convert some animations to new style keyframes	2020-11-04 01:48:04 +01:00
Joshua Barretto	6331ad9455	Implemented Flight	2020-11-03 22:46:07 +00:00
Marcel Märtens	00456c8373	extract a Presence Component, which is `server` only and has state of `Player` and `Client`. Presence is only valid for Clients that are in game	2020-11-03 08:56:02 +01:00
Marcel Märtens	6bb74c9c6f	Fix clients are disconnecting GRACEFULLY by removing the Disconnect Request from a client, a client now sends a TERMINATE message directly	2020-11-03 08:55:54 +01:00
ubruntu	8c1e1fdc5c	Fixed sneak toggle, sneaking no longer has sound, rolling can return to sneaking state, sneaking reduces aggro distance	2020-11-03 04:09:38 +00:00
Imbris	a556d2b5e7	Merge branch 'bbenton91/fix-password-length' into 'master' Changed password scale to allow 34 characters. Fixes issue #743 Closes #743 See merge request veloren/veloren!1464	2020-10-30 02:37:54 +00:00
Brad	8b39dafe2e	Changed password scale to allow 34 characters	2020-10-29 21:17:31 -04:00
Imbris	cb68aec291	Update changelog, address comments, fmt	2020-10-29 19:12:54 -04:00
Imbris	64def3cde4	Allow interacting with nearby blocks without pointing at them, unify selection of block/entity interactors so that only one is select at once, rearrange pickup and mount range consts	2020-10-29 18:40:11 -04:00
Imbris	325695e937	Only try to connect to the singleplayer server after it has been initialized	2020-10-29 18:30:49 -04:00
Imbris	47b06658b0	Log where the userdata folder is in binary crates, fix bug where the old path was logged instead of the new path when renaming invalid settings	2020-10-29 18:30:49 -04:00
Imbris	0ca3d51f29	Only allow hotbar keys instead of all UI related keys when the UI is hidden	2020-10-29 18:30:48 -04:00
Sam	7971034fde	Fixed audio tests.	2020-10-28 18:15:28 -05:00
Sam	844e6f2b60	Slightly nerfed sword dash. Reduced particle count on fire aoe by factor of 3.	2020-10-28 18:15:25 -05:00
Sam	63011241ea	Added keyframes to all states that were lacking them.	2020-10-28 18:15:23 -05:00
Sam	f60985d733	Transitioned buff storage from a vec to a hashmap. Addressed other comments. Only continuous buff effects are handled right now.	2020-10-26 19:30:17 -05:00
Sam	337cf6e137	Cleaned up UI code. Removed stuff added for testing. Added 10% for melee attacks to inflict a bleeding debuff. Renamed BuffId to BuffKind. Fixed memory leak. Set event emission to false when timer is decremented.	2020-10-26 19:30:10 -05:00
Sam	fdf8decb18	Handled health change over time buff effect better.	2020-10-26 19:28:27 -05:00
Sam	5a5d35fade	Cleaned up logic used to handle buff addition. Old active buffs now get deleted if they had a smaller duration and weaker strength.	2020-10-26 19:28:26 -05:00
Monty Marz	3f7b5a095b	player buffs at minimap visuals Update settings.rs buff timers	2020-10-26 19:28:25 -05:00
Imbris	be1767a5af	Fix group tooltips, make ui buff code more efficient, avoid crashing on characters button press	2020-10-26 19:28:25 -05:00
Monty Marz	8fa398954d	Initial implementation of buffs UI player buffs animation more testing debuffs sorting and display limit fix overhead buffs fix WIP buff removal function fmt Update buffs.rs Now with compiling: WIP group UI buffs positioning Update group.rs Update group.rs Small optimizations. Fixed positioning of buffs in group panel. Broke buff tooltips in group panel. buff frame visuals added setting for displaying buffs at minimap	2020-10-26 19:28:24 -05:00
Sam	007d3c09ac	Buffs now get removed on death by default. Buffs are now required to have either the 'Buff' or 'Debuff' tag. RemoveByCategory function now has support for blacklisting certain categories. Support for UI stuffs.	2020-10-26 19:28:23 -05:00
Monty Marz	b31c6877b4	skillbar fixes, buff UI module adjustments, fixes, assets, test buffs widgets	2020-10-26 19:28:23 -05:00
Monty Marz	f096bece5c	skillbar update part 1 skillbar rework part 2	2020-10-26 19:28:21 -05:00
Sam	1a1ceb54bc	Server event used to deal damage/heal with buffs. Buff kills now award xp.	2020-10-26 19:28:20 -05:00
Marcel Märtens	1b47913835	fix clippy after toolchain update	2020-10-26 22:30:51 +01:00
Marcel Märtens	153c6c3b13	Fixing Tarpaulin isn't easy. So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.	2020-10-26 17:04:20 +01:00
NathanW	7e92e21f8b	Address issue #808 : Add Frame Time in DebugInfo	2020-10-22 16:42:10 -06:00
Joshua Barretto	2237500743	Clouds	2020-10-21 21:05:25 +00:00
jshipsey	c74133740e	remove commented code	2020-10-19 16:20:59 +02:00
Snowram	d5e60d93b4	Add missing biped_large anims	2020-10-19 16:20:59 +02:00
jshipsey	9c003cf572	bipedlarge hammer fixes	2020-10-19 16:20:59 +02:00
jshipsey	64d73abdec	roshwalr fix	2020-10-19 16:20:59 +02:00
jshipsey	caa048b1d5	small fixes	2020-10-19 16:20:59 +02:00
Snowram	7a62ddfd3f	Add BeastClaw npc weapontype	2020-10-19 16:20:59 +02:00
Snowram	f9383e4dd8	Add roshwalr npc	2020-10-19 16:20:59 +02:00
jshipsey	66b1fe67dc	rebase	2020-10-19 16:20:58 +02:00
Snowram	c9985e14cb	Rename Saurok, various anim fixes	2020-10-19 16:20:58 +02:00
jshipsey	65df398672	werewolf work	2020-10-19 16:20:58 +02:00
Snowram	6c54e6d8fe	Add sand, snow and wood raptor npcs	2020-10-19 16:20:58 +02:00
Snowram	588f66a1ee	Add treant npc	2020-10-19 16:20:58 +02:00
Snowram	290adcfad8	Standardizes character bone names	2020-10-19 16:20:58 +02:00
Snowram	58e2d3a4ad	More bipedlarge anim work	2020-10-19 16:20:58 +02:00
Snowram	c1c2c9dc07	Add bipedlarge spin and beta anims	2020-10-19 16:20:58 +02:00
unknown	94cbe3faf4	Better bipedlarge weild, charge and shoot anims	2020-10-19 16:20:58 +02:00
unknown	d2f91bc3a0	Assigns a ToolKind to bipedlarge weapons	2020-10-19 16:20:58 +02:00
Snowram	0a9ec848a7	add lizardman npcs	2020-10-19 16:20:58 +02:00
Snowram	4dcd450382	Add beast attributes	2020-10-19 16:20:57 +02:00
Snowram	a4f4fa38e2	Improve bipedlarge beast walk animation	2020-10-19 16:20:57 +02:00
Snowram	f4a068c422	Initial bipedlarge beast walk animation	2020-10-19 16:20:57 +02:00
Snowram	204fa50de9	Add werewolf npc	2020-10-19 16:20:57 +02:00
Marcel	f6692aee74	Merge branch 'UMR1352/fix#788' into 'master' Fix issue #788 Closes #788 See merge request veloren/veloren!1432	2020-10-16 12:17:49 +00:00
Samuel Keiffer	b5a969862a	Merge branch 'sam/staff-overhaul' into 'master' Staff Rework Closes #767 and #762 See merge request veloren/veloren!1429	2020-10-16 02:22:00 +00:00
Joshua Barretto	8617b17569	Merge branch 'UMR1352/fix#790' into 'master' Fix issue #790 Closes #790 See merge request veloren/veloren!1439	2020-10-15 14:14:52 +00:00
Enrico Marconi	af0542db90	Suggested edit	2020-10-15 14:47:29 +02:00
Enrico Marconi	d85473bccf	Reviewer's suggested edit	2020-10-15 14:36:59 +02:00
Enrico Marconi	9c184b60e4	Fix issue #790 : hotbar working while ui is toggled off	2020-10-15 13:28:29 +02:00
Sam	14e4af7ab6	Addressed playtesting feedback.	2020-10-14 21:06:52 -05:00
jshipsey	6f3f6996a6	clippy	2020-10-14 21:06:35 -05:00
jshipsey	6a744eed82	anims	2020-10-14 21:06:32 -05:00
Monty Marz	4b2eba71e7	new staff skill icons	2020-10-14 20:56:58 -05:00
Sam	1c21362bc3	Fixed shockwaves hitting entities multiple times. Explosions can now regen energy. Staff M1 now has particles instead of using bomb particles.	2020-10-14 20:56:23 -05:00
Sam	7ef73f5981	Added particles for fire shockwave. Added ability key enum so held abilities could differentiate what button they should check. Modified energy fields on basic beam so it could drain energy every second.	2020-10-14 20:56:22 -05:00
Sam	cbb72363af	Reworked explosions. Tweaked staff fireball.	2020-10-14 20:56:21 -05:00
Sam	04dcd012da	Flamethrower particles.	2020-10-14 20:56:21 -05:00
Sam	c80f16ae74	Started to add particles.	2020-10-14 20:56:20 -05:00
Sam	256846a669	Initial implementation of new staff abilities.	2020-10-14 20:56:16 -05:00
jshipsey	3bb59b36cd	energy values, remove hotload	2020-10-14 12:50:33 -07:00
jshipsey	64f72a73f9	axeleap tweaks	2020-10-14 12:50:33 -07:00
jshipsey	22d8792c4b	adjustments to chargedmelee, repeater	2020-10-14 12:50:33 -07:00
Snowram	697ea80665	Axe MeleeLeap character animation	2020-10-14 12:50:33 -07:00
jshipsey	521ffd64ba	cleanup	2020-10-14 12:50:33 -07:00
jshipsey	28eb58ddfa	anims	2020-10-14 12:50:33 -07:00
jshipsey	281155186f	hammer leap melee anim	2020-10-14 12:50:33 -07:00
jiminycrick	9ebda3c353	Made bow leap more graceful and set energy costs and removed jitter for no leap	2020-10-14 12:50:32 -07:00
jiminycrick	ae4b259250	Fix what broke during rebase	2020-10-14 12:50:32 -07:00
jiminycrick	431f99a791	Reducing the amount of data in character state	2020-10-14 12:50:32 -07:00
jiminycrick	05623eb8bd	Addressed comments	2020-10-14 12:50:32 -07:00
jiminycrick	04175bab09	Add skillbar stuff for 3rd skills	2020-10-14 12:50:32 -07:00
jiminycrick	951acfca21	Add 3rd skill for hammer, bow, and axe minus skillbar UI stuff	2020-10-14 12:50:32 -07:00
Marcel Märtens	f1c9b959f4	rename a file, fix error msg, dont spam persistence by default	2020-10-13 00:06:24 +02:00
Enrico Marconi	7a5b7cb478	Fix issue #788 Missing items in the 'require' section are now shown in red.	2020-10-12 17:41:17 +02:00
Marcel Märtens	55b59fbe07	various small fixes according to the MR	2020-10-12 11:25:20 +02:00
Marcel Märtens	d7a74c0cf1	fix voxygen state system. before we had a timing error that we did the next voxygen step before client set in_game which lead us to a disconnect. now assume in_game is correct in client unless told by server in its answer	2020-10-11 22:49:19 +02:00
Marcel Märtens	b1db5ef488	Redo Network Frontend. Rather than having a single Stream to handle ALL data, seperate into multiple streams: - Ping Stream, for seperate PINGS - Register Stream, only used till the client is registered, then no longer used! - General Stream, used for msg that can occur always - NotInGame Stream, used for everything NOT ingame, e.g. Character Screen - InGame Stream, used for all GAME data, players, terrain, entities, etc... This version does compile, and gets the client registered (with auth too) but doesnt get to the char screen yet. This fixes also the ignoring messages problem we had, as we are not sending data to the register stream! This fixes also the problem that the server had to sleep for the Stream Creation, as the Server is now creating the streams and client has to sleep.	2020-10-11 22:49:14 +02:00
Imbris	b9b84d2890	Migrate singleplayer save folders to the new location if they have not already been generated	2020-10-10 20:25:32 -04:00
Imbris	83fb26c4f9	Group editable server settings into one struct that is stored in the ecs, don't expose DataDir, use Uuid in the whitelist instead of usernames, replace Banlist record tuple with new type with named fields, remove commented code	2020-10-10 02:10:32 -04:00
Imbris	a3ee5a4006	Rename model_col -> highligh_col to better reflect its usage	2020-10-10 02:10:32 -04:00
Imbris	308cca0dc9	Put server-cli specific settings in their own structure, serde_derive -> serde	2020-10-10 02:10:32 -04:00
Imbris	7c14a3f4a4	New userdata folder that holds voxygen settings and logs and server saves and settings, split up server settings file into parts that are persisted back to their files and parts that are read-only, misc fixes	2020-10-10 02:10:32 -04:00
Imbris	ef74d395a6	Improve figure and sprite highlighting	2020-10-10 02:10:31 -04:00
Monty Marz	2b800a2b63	make clippy happy Delete glider.ron	2020-10-07 02:23:20 +00:00
Marcel	33be0a0e9f	Merge branch 'mdroogle/interaction_hint' into 'master' Add interaction hint #615 See merge request veloren/veloren!1394	2020-10-01 09:31:54 +00:00
Sam	47abf49751	Addressed comments	2020-09-29 20:48:23 -05:00
Sam	207586cfab	Beam particles fixed/tweaked.	2020-09-29 19:48:17 -05:00
Sam	51141b2c1a	Changelog line, final balance tweaks.	2020-09-29 19:48:16 -05:00
Sam	56d2afc0dc	Added keyframe support to basic beam state. Addressed some comments.	2020-09-29 19:48:15 -05:00
Sam	ffe456c703	Fixed what broke after rebasing.	2020-09-29 19:48:13 -05:00
Sam	3d6c26a3c7	Fully separated sceptres from staves.	2020-09-29 19:48:12 -05:00
Monty Marz	2a884df8de	fix SCT decimals not being absolutes	2020-09-29 19:48:10 -05:00
Sam	de45784596	Addressed round of testing feedback.	2020-09-29 19:48:09 -05:00
Monty Marz	13d9b814ab	separate sceptres from staffs, show values below 1.0 as decimals in the SCT, add starting sceptre remove firebolt from starting sceptre	2020-09-29 19:48:07 -05:00
Sam	095433abcc	Addressed comments.	2020-09-29 19:48:06 -05:00
Sam	46563e7008	Added beam system. Added collision code for spherical wedge/cylinder detection.	2020-09-29 19:48:04 -05:00
Sam	ddbe871b50	Placeholder animation for beam attack.	2020-09-29 19:48:03 -05:00
Sam	36762be2a7	Fixed explosion color of sceptre M2.	2020-09-29 19:47:59 -05:00
Sam	6b23af6e0b	Tweaked particles. Added skill icons.	2020-09-29 19:47:58 -05:00
Sam	8b9202710f	New sceptre M2 is functional.	2020-09-29 19:47:57 -05:00
Sam	921d224ef6	Lifesteal now works. Added particles to healing beam.	2020-09-29 19:47:57 -05:00
Forest Anderson	25ab132d73	Merge branch 'xvar/add-clone-on-ref-ptr-clippy-lint' into 'master' Added #![deny(clippy::clone_on_ref_ptr)] to all crates and fixed resulting lint errors See merge request veloren/veloren!1411	2020-09-28 19:32:03 +00:00
Joshua Yanovski	443f3287e4	Merge branch 'sharp/remove-spurious-vox' into 'master' Remove spurious uses of Vox. See merge request veloren/veloren!1406	2020-09-27 16:41:29 +00:00
Ben Wallis	b3dd8e8a02	Added #![deny(clippy::clone_on_ref_ptr)] to all crates and fixed resulting lint errors	2020-09-27 17:25:33 +01:00
Ben Wallis	11fc74642e	Refactored crafting to use ItemDef instead of Item	2020-09-27 14:55:31 +01:00
Joshua Yanovski	938039a56e	Remove spurious uses of Vox. In the process, also try to address a few edge cases related to block detection, such as adding back previously solid sprites and removing filters that may be vestiges of earlier logic.	2020-09-26 16:30:40 +02:00
Marcel Märtens	b7dc17c11f	switch version to `pre-alpha-2020-09-22` vs `pre-alpha-v0.7.0`	2020-09-22 12:04:07 +02:00
Marcel Märtens	8eec46424f	switching veloren naming scheme, to either one of the following: `stable-0.7.0 (<hash>-<datetime>)` for release versions. And `nightly-<date> (<hash>)` for nightly and master versions Reason is, many players only give information that they are running `0.x.0` but are not giving us the information which day, or commit they are running. So we should make master builds less confusing.	2020-09-22 11:47:18 +02:00
jshipsey	4f0faf4c56	small corrections	2020-09-21 23:57:10 -04:00
Snowram	fa2dd28587	Fixed various issues from better-things branch	2020-09-21 23:57:10 -04:00
Sam	2ff59c9f60	Addressed comments	2020-09-21 17:55:29 -05:00
Sam	8ab0d5e5e0	Added icon for skillbar ability of sword.	2020-09-21 17:40:20 -05:00
jshipsey	0796337a8c	resolve minor anim hiccup	2020-09-21 17:40:19 -05:00
Sam	1fbcf2be80	Fixed pipeline errors.	2020-09-21 17:40:19 -05:00
Sam	b4018e7d42	Made 3rd ability interruptible. Final balance tweaks.	2020-09-21 17:40:16 -05:00
jshipsey	8070a38a89	spin anim	2020-09-21 17:38:57 -05:00
jshipsey	e79cef4824	dash animation	2020-09-21 17:38:55 -05:00
Sam	a8e834e754	Initial implementation of spin attack for sword.	2020-09-21 17:38:54 -05:00
jshipsey	b0d359e29f	slightly quicker alpha, improved anims	2020-09-21 17:38:54 -05:00
Sam	fe70b7fbce	Addressed second round of feedback.	2020-09-21 17:38:53 -05:00
Sam	b06ab250cc	Addressed first round of feedback on sword overhaul.	2020-09-21 17:38:52 -05:00
Sam	c99e4c3c18	Added swing duration to dash melee. Added framework for animation to be added.	2020-09-21 17:38:51 -05:00
Sam	04af75bf8d	Initial implementation of new dash melee.	2020-09-21 17:38:48 -05:00
jshipsey	a18c23025e	stage 2 and 3 anim	2020-09-21 17:38:46 -05:00
Sam	847bddbd89	Removed swing_frac, added a swing duration instead to allow for more utility in character state. Moved location of stage_section enum to wielding so it could more easily be used by other character states.	2020-09-21 17:38:46 -05:00
Sam	2ba9d1e54f	Added support for different swings in the combo melee having differnt fractions of time buildup duration is split.	2020-09-21 17:38:45 -05:00
jshipsey	2451a64b97	stage 2 animation	2020-09-21 17:38:44 -05:00
Sam	0ba5740265	Added enum for stage section instead of using 4 bools.	2020-09-21 17:38:43 -05:00
Sam	440e45f2bc	Did stuff to support addition of keyframes for combo melee animation.	2020-09-21 17:38:43 -05:00
Sam	aab56ea636	Animation time for combo melee now resets between stages.	2020-09-21 17:38:42 -05:00
Sam	cf573a42bd	Initial implementation of combo melee attack.	2020-09-21 17:38:41 -05:00
Joshua Barretto	388a899a7f	Added make_sprite command	2020-09-21 16:39:20 +01:00
Joshua Barretto	ece4a01867	Improved representation of Block for better performance, more features, and better backwards-compatibility	2020-09-20 11:46:12 +01:00
Samuel Keiffer	b2f42a117c	Merge branch 'sam/boss' into 'master' Boss Closes #769 See merge request veloren/veloren!1364	2020-09-19 20:47:07 +00:00
Joshua Yanovski	7b43752785	Merge branch 'droogmic/scene_terrain_refator' into 'master' Voxygen scene terrain - minor refactor See merge request veloren/veloren!1392	2020-09-19 20:29:02 +00:00
Sam	6deeb7fcfe	Addressed another comment.	2020-09-19 14:40:22 -05:00
Sam	45fef87f32	Addressed comments	2020-09-19 14:40:21 -05:00
Sam	e39770d1d9	Golem now spawns in dungeon.	2020-09-19 14:40:20 -05:00
Sam	6327dd18b6	Moved knockback to a server event so that it would actually be applied to the player.	2020-09-19 14:40:17 -05:00
scott-c	1f2ed53c42	Tweak particle effects	2020-09-19 14:40:15 -05:00
Sam	0c48efd445	Added particles dedicated for shockwave.	2020-09-19 14:40:15 -05:00
Sam	23fa3c2f8d	Added particles to shockwave attack.	2020-09-19 14:40:14 -05:00
Sam	717142d5ea	Started to implement shockwave system.	2020-09-19 14:29:06 -05:00
Sam	66b0fee3c7	Separated knockback out from basicmelee. Added weapon for cyclops boss to use, and added 1 ability to it.	2020-09-19 14:29:04 -05:00
Michael Droogleever Fortuyn	7fd50f36ef	Add interaction hint #615 Add text above dropped items hinting at the use of the interaction control e.g. pressing E	2020-09-19 20:38:48 +02:00
Imbris	9464fd49a9	Unify healthbar showing calculation, move bubble acquisition into closure	2020-09-19 13:54:05 -04:00
Imbris	ca2aad0080	Make chat bubbles show up even if nametags are not displayed	2020-09-19 13:54:05 -04:00
Imbris	b31df2f34e	Use proper fps in voxygen graphics settings tab	2020-09-19 13:54:05 -04:00
Michael Droogleever Fortuyn	a3c4040063	Scene terrain worker refactor Simplify ChunkMeshState's active worker tracking to a bool, as the tick value was never being used.	2020-09-19 16:13:29 +02:00
scott-c	2686598f1f	Improve first-person projectile aiming	2020-09-19 19:14:23 +08:00
Monty Marz	5fe79e1c6a	new loading screen bgs (part 1) Add a basic random feature to char creation loading screen bg (part 2) loading screen changes, random button graphics Random appearance also pick a random npc name	2020-09-18 23:17:47 +00:00
Snowram	f9fada87cf	Addresses comments	2020-09-18 18:45:03 +02:00
jshipsey	8330d087e6	clippy	2020-09-17 22:58:02 -04:00
jshipsey	fff6a6fb0a	finish odonto	2020-09-17 22:32:11 -04:00
jshipsey	b0767cb7a5	minor anim fix	2020-09-17 22:32:11 -04:00
jshipsey	5bb45a4861	spawn tweaks, improved odonto	2020-09-17 22:32:11 -04:00
Snowram	fecc40ad8e	Better quadmed legs/feet ratio	2020-09-17 22:32:11 -04:00
Snowram	62f6a5799a	Initial quadmed feed animation	2020-09-17 22:32:10 -04:00
jshipsey	789d93b52f	new models, shockwave anim	2020-09-17 22:32:10 -04:00
jshipsey	03b7320b4b	general housekeeping	2020-09-17 22:32:10 -04:00
jshipsey	06b39b9072	species specific improvement	2020-09-17 22:32:10 -04:00
Snowram	6a16268ff0	Quadmed run anim tweaks and deers offsets tweaks	2020-09-17 22:32:10 -04:00
jshipsey	b781a1765b	theropod run	2020-09-17 22:32:10 -04:00
Snowram	9308cabeb8	add deer, beaver and porcupine npcs	2020-09-17 22:32:10 -04:00
jshipsey	3eeaf7e8c9	idle for theropod, corrections to swimming	2020-09-17 22:32:10 -04:00
Snowram	ee95550355	Tweak offsets for theropods	2020-09-17 22:32:10 -04:00
jshipsey	cd6e1ad45f	haul out the critter skele, add theropod	2020-09-17 22:32:10 -04:00
jshipsey	aa440c02bb	proper cycles on quadmed movement	2020-09-17 22:32:09 -04:00
Snowram	1097dbcc25	Improve adaptative quadmed run	2020-09-17 22:32:09 -04:00
jshipsey	883aa1754b	refining pace setup. refined species anim variables	2020-09-17 22:32:09 -04:00
jshipsey	47d5c635de	first attempt at adaptive stride system	2020-09-17 22:32:09 -04:00
jshipsey	b514fb4159	fix for animal attack motion bug	2020-09-17 22:32:09 -04:00
jshipsey	ecae71c016	gliders as items. anim improvements	2020-09-17 22:32:09 -04:00
jshipsey	7525479a4c	fit dt issue	2020-09-17 22:18:49 -04:00
jshipsey	bd1984bf28	golem addition, fix for axe attack	2020-09-17 22:18:49 -04:00
Ben Wallis	712f2e9c97	* Moved migrations to beginning of server initialisation * Added migrations for entity ID changes to existing tables	2020-09-17 23:02:14 +00:00
tylerlowrey	2b0c1e89f3	Refactored kicking the player into its own function + ran fmt on project	2020-09-14 07:54:05 +02:00
tylerlowrey	b64f3fa8a9	Removed unnecessary kicked error enum	2020-09-14 07:54:05 +02:00
tylerlowrey	30c3146682	Added main menu kick message with kick reason after player is kicked	2020-09-14 07:52:31 +02:00
tylerlowrey	fee79720ee	Added ban message with reason when banned user attempts to login to server	2020-09-14 07:52:31 +02:00
Imbris	75761b60d9	Merge branch 'imbris/fix-mesh-panic' into 'master' Fix #746 and misc cleanup Closes #746 See merge request veloren/veloren!1380	2020-09-13 01:48:27 +00:00
Imbris	3fbf8d7ca0	Remove chunk from mesh todo if neighbour is deleted, be more careful with z_start and z_end in terrain meshing	2020-09-12 21:02:00 -04:00
Marcel Märtens	ad63c65d2f	fix windows result check	2020-09-11 16:24:15 +02:00
Awkor	0811cbe9cb	Implement #334 - Enable camera rotation in character selection screen	2020-09-11 13:23:38 +02:00
Imbris	c3ae641fbb	Merge branch 'imbris/tracy' into 'master' Add more tracing instrumentation and tracy support See merge request veloren/veloren!1359	2020-09-10 05:07:51 +00:00
TheThirdSpartan	7fd673ecb2	Added localization config options for new death messages	2020-09-09 20:26:20 +00:00
Marcel Märtens	018d03d860	fix panic for macos	2020-09-09 12:11:56 +02:00
Marcel Märtens	68168b0ae4	replace heavy msgbox with light native-dialog	2020-09-08 23:49:49 +02:00
Raiyan Sayeed	906da2f0c7	added option for borderless fullscreen in setting -> graphics menu	2020-09-07 05:12:15 +00:00
Imbris	f39d1e9bb5	Use less verbose span names when the tracy feature is off	2020-09-07 00:59:16 -04:00
Imbris	7efbc74551	remove duplicate tracing filter code, fix compiling voxygen with the tracy feature	2020-09-06 22:28:14 -04:00
Imbris	0683a40741	Use finish_continuous_frame directly	2020-09-06 22:28:14 -04:00
Imbris	4f68a6df27	Update tracy crates, reduce overhead of timing, add more misc instrumentation	2020-09-06 22:28:14 -04:00
Imbris	e37a01be9d	Sprinkle instrumentation in common crate,in particular in the ecs systems	2020-09-06 22:28:14 -04:00
Imbris	50ceb1c93e	Add workaround for spans with winit loop, configure filtering when the tracy feature is on, spinkle some spans in the codebase	2020-09-06 22:28:14 -04:00
Imbris	d95e539495	Intial setup of tracy	2020-09-06 22:28:14 -04:00
TheThirdSpartan	6dbd1bc132	adding feature requested in issue #153 - displaying your alias in game as 'you'	2020-09-06 19:42:32 +00:00
Joshua Barretto	49c713a071	Merge branch 'zesterer/rtsim' into 'master' Beehives, Fireflies, and minor worldsim/lighting adjustments See merge request veloren/veloren!1357	2020-09-05 17:16:08 +00:00
Marcel	3c4c178264	Merge branch 'snowram/issue-622' into 'master' Add 1st and 2nd item of inventory in hotbar See merge request veloren/veloren!1314	2020-09-05 08:45:21 +00:00
Imbris	0b9f2a5d3b	Merge branch 'sharp/default-shadows-real' into 'master' Make shadow maps the default. See merge request veloren/veloren!1361	2020-09-05 05:47:21 +00:00
Joshua Yanovski	66f49d5386	Merge branch 'sharp/default-shadows' into 'master' Create (segment, offset) just once per figure. See merge request veloren/veloren!1360	2020-09-04 15:54:55 +00:00
Joshua Yanovski	a2de759296	Make shadow maps the default.	2020-09-04 16:41:08 +02:00
Joshua Barretto	0adc57e487	Made particle code more rugged	2020-09-04 11:49:49 +01:00
Joshua Barretto	0c0f150140	fmt	2020-09-04 11:48:57 +01:00
Joshua Barretto	70f52d876a	Improved lighting	2020-09-04 11:48:57 +01:00
Monty Marz	b24f5b5b24	adjustments to firefly density	2020-09-04 11:48:57 +01:00
Monty Marz	c3ae56114a	added fireflies to reed and flowers, readded sunflowers	2020-09-04 11:48:57 +01:00
Joshua Barretto	032ec9ef41	Added bee hives	2020-09-04 11:48:56 +01:00
Joshua Barretto	88add8456f	Added fireflies, reeds near rivers	2020-09-04 11:48:56 +01:00
Joshua Barretto	4405227ffb	Made light attenuation nicer, fixed campfire light offset	2020-09-04 11:48:54 +01:00
scott-c	69e0bf2023	fix missing firework particle rng & adjust firework colors	2020-09-01 20:33:17 +08:00
Joshua Yanovski	4eeb131f4b	Create (segment, offset) just once per figure.	2020-09-01 11:23:19 +02:00
Joshua Yanovski	7e6975d881	Merge branch 'sharp/typed-body' into 'master' Further generalize the typed module. See merge request veloren/veloren!1346	2020-09-01 06:29:35 +00:00
Monty Marz	a6abda391f	orcs adjustment and inline_tweak crate Adjust female orc headsize add inline_tweak crate to voxygen and anim format cargo.toml alphabetically	2020-08-31 15:26:46 +00:00
Joshua Yanovski	6f3d5da6f3	Further generalize the typed module. This enables us to automatically create configuration formats from enums or structs. For enums, we create a structure with a field for each case, representing a pattern match; the configuration format can then enter a different expression for each case. For structs, we create an enum with a variant for each field, representing projecting by that field; the configuration format selects the field to project from, and then can write a further expression on that field (for instance, it can perform another pattern match). So far we don't actually have anything that uses this functionality; I decided to finish it for the purpose of specifying a default lantern offset, only to discover that we already return a lantern offset from the animation crate. So I fixed it there instead.	2020-08-31 05:59:44 +02:00
Marcel	b6c07718dc	make logging easier and not as verbose on windows	2020-08-30 18:02:37 +00:00
termac	76df71ed3d	small fix for handling hotbar hotkeys (fixes #687 ) Send an 'ChangeHotbarState' event when a hotbar slot is assigned via hotkey in the inventory.	2020-08-29 18:38:55 +02:00
Monty Marz	7041e490ce	fix overlapping text	2020-08-28 16:10:50 +02:00
Joshua Yanovski	8be3648a4d	Move sprite data to a config file.	2020-08-28 09:23:43 +02:00
Joshua Yanovski	3a96b73b2c	Move figure meshing to a background thread.	2020-08-28 05:25:31 +02:00
Imbris	4790373ab3	Add State::read_component_copied	2020-08-26 20:47:41 -04:00
scott-c	d316463eb3	Add combat sfx #647	2020-08-26 19:28:00 +08:00
Monty Marz	6946de2682	fixed nametag height fmt fmt	2020-08-25 21:54:47 +02:00
Joshua Barretto	bf7afcf5c9	Merge branch 'zesterer/small-fixes' into 'master' Better world colours, better projectiles, better aiming, many other small improvements See merge request veloren/veloren!1332	2020-08-25 15:59:05 +00:00
notoria	2be4202d01	Corrected some spelling errors	2020-08-25 12:21:25 +00:00
Joshua Barretto	6cf223583a	Fixed failing audio tests	2020-08-24 20:37:47 +01:00
Joshua Barretto	6a4c5a05d0	Fixed projectile collisions, hitboxes, better aiming	2020-08-24 18:24:44 +01:00
Joshua Barretto	79ec8c9e22	Merge branch 'james/fix-shiny-shader-nvidia' into 'master' Fixed NVidia shiny water shader bug and re-enabled in settings See merge request veloren/veloren!1319	2020-08-24 07:09:48 +00:00
jiminycrick	86b4dd6ba3	set shiny water to default	2020-08-23 22:58:01 -07:00
Monty Marz	05462349e2	Merge branch 'pfau/mini-fixes' into 'master' Various fixes See merge request veloren/veloren!1329	2020-08-24 00:26:33 +00:00
Niko Thees	5d11adfd4c	fix unequal zoom in distance and zoom out distance	2020-08-23 23:24:24 +00:00
Monty Marz	1d49186e31	various fixes Balanced crafted weapon power Adjusted tooltip color Added tooltip showing account name to the social window	2020-08-24 01:16:53 +02:00
Monty Marz	8646c1add5	fix particles rendering before water revert changes to campfires -> Address in another MR!	2020-08-22 00:17:44 +02:00
Monty Marz	ce929d2924	Address comments, clippy and minor adjustments first bunch of comments addressed change order or scatter, paths and caves being applied in worldgen to avoid floating scatter objects campfire adjustments, reduced grass density due to FPS issues readded item descriptions to the crafting window, item desc for craftable armour address comments happy clippy, happy life clippy clippy more clippy fmt revert cargo.toml formatting remove "allow unreachable pattern" fmt	2020-08-21 22:37:08 +02:00
jiminycrick	6b8e458027	Fixed NVidia shiny water shader bug and re-enabled in settings missed a commented line	2020-08-21 14:59:18 -04:00
Monty Marz	e3eb34085f	craftable starting set velorite staff update ore_nature_longbow model fix humanoid colours Update agent.rs improve rng (according to zesterer) slower fleeing More adjustments fix cult leader name more loot tables all kinds of adjustments smöl adjustments	2020-08-21 19:36:21 +02:00
Sam	9d2fe79a78	Changes to how critical hits function for melee attacks. Removed ability for explosions to crit. Velorite sceptre now functions as healing staff.	2020-08-21 19:36:20 +02:00
Monty Marz	55d126861f	fix tooltips in char selection, more balancing fix talking animals fix critter exp, stronger villagers biped large balancing more villager balancing, mushroom spawning rate more balancing fix rebase multiple loottables Add tarasque and bonerattler armour Added loot tables for different groups of weapons and armor based off relative strength. Added loot table for cultist boss. Added loot tables for consumables and food. Trimmed down default loot table. remove male and female sign from char creation chest loot tables fix loot tables lootable crates lantern keybinding display more loot tables loot table changes fixed loot tables fix typo more grass rebase fix, better lantern re-add sprite rotation for grass crafting window alignment fix, new streetlamps, new shopsigns, new healing staff height change	2020-08-21 19:36:19 +02:00
Monty Marz	7ab80ef367	sprite spawning rules	2020-08-21 19:36:16 +02:00
Monty Marz	b930c34d89	agent changes, sprite spawning changes, alignment changes	2020-08-21 19:36:16 +02:00
Monty Marz	0bd0de613b	rounded numbers on healthbars	2020-08-21 19:36:15 +02:00
Monty Marz	962d7694bd	fix social window display	2020-08-21 19:36:14 +02:00
Ryan Baker	712152740f	Prefers picking up the highlighted item to the closest item	2020-08-21 14:09:48 +00:00
Joshua Barretto	e382e992bd	Merge branch 'zesterer/atmospheric-particles' into 'master' Atmospheric Particles See merge request veloren/veloren!1310	2020-08-21 10:24:42 +00:00
Joshua Barretto	db183e607f	Added particle explanation, more efficient particle pushing	2020-08-21 09:53:09 +01:00
Joshua Barretto	1b80f05e82	Centred particle meshes correctly	2020-08-20 22:34:58 +01:00
Joshua Barretto	7eff8ff0ad	Added lifetime particle parameter	2020-08-20 21:38:21 +01:00
Joshua Barretto	c759c8120f	Centralised particle offset, variable chunk range, better smoke offsets	2020-08-20 21:28:11 +01:00
Joshua Barretto	237d33e9aa	Updated changelog	2020-08-20 21:15:38 +01:00
Joshua Barretto	d1bbfc9960	Added BlocksOfInterest and block particle emission	2020-08-20 21:15:13 +01:00
Joshua Yanovski	a3e8cd34bc	Properly remove Shiny option.	2020-08-20 22:08:25 +02:00
Joshua Yanovski	2dfd3b13d1	(See sharp/lod-history) LOD, shadows, greedy meshing, new lighting, perf --- Pretty much a Veloren fork at this point. Here's a high level overview of the changes (will be added to CHANGELOG just before merge). At a high level this MR incorporates roughly two groups of changes. The first group consists of new game features: more flexible map sizes, level of detail terrain, shadow maps, and a new lighting engine. This is "feature work" that (mostly) only adds new things to Veloren, and mostly shouldn't affect old stuff. The second big group of changes are those addressing the fallout from all the new features. These include performance fixes of various sorts: the addition of multiple graphics options and optimization of the cheap ones to avoid work, switching all voxel models to use some variant of greedy meshing, switching over much of our CPU-side vector math to exploit SIMD instructions (coinciding with a fork of `vek`), and a rewrite of how the UI handles text rendering (coinciding with updates to our fork of `conrod`). Making Veloren's hardcoded colors appear correct under the new lighting engine also required considerably changes (TODO: Fill in this section when it's complete). The second category of changes often heavily touches code owned by other people, including frequently modified code "owned" by a handful of people, so I recommend that this code be reviewed particularly carefully. --- At a high level (each will be described in more detail below): - The world map has been refactored. - The world size is no longer hardcoded (@zesterer). - The map generation code was made generic to allow using it outside of the `world` crate (@zesterer). - On world creation, we now compute horizon maps (@zesterer). - The way we pass the world from the server to the client has been updated (@xMAC94x). - Artifacts related to image rotation were fixed (@imbris). - Multiflow rivers were enabled (@zesterer). - In the process of making changes related to the world map, various incidental fixes and optimizations were required. - The new level of detail feature was added (@zesterer wrote part of this and has checked out the rest). - A new LOD terrain rendering step was added to the pipeline. - The LOD terrain quality was made configurable via a graphics setting. - Horizon maps were used to cast shadows from LOD chunks on both LOD and non-LOD terrain. - A "voxelization" effect was incorporated into rendered LOD terrain to make it blend better into the world. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Veloren's lighting has been completely overhauled (@zesterer has already checked most of this out). - A semi-accurate index of refraction was assigned to our materials. - A new, more realistic, physically based approach to lighting was used using the Ashikhmin Shirley BRDF. - We emulate atmospheric scattering using equations designed for measuring solar panel light exposure. - We attempt to compute realistic light attenuation in water using its real material properties. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Point and directional lights now cast realistic shadows, using shadow mapping. (@imbris, @zesterer, @Treeco, @YuriMomo) - Point light shadow maps were added to the rendering pipeline, using geometry shaders and seamless cube maps. - Directional light shadows were added to the rendering pipeline, using LISPSM together with disabling depth clamping. - "Shadow-only" chunks and NPCs were added to prevent shadows from models behind you from disappearing. - In the process of making changes related to shadow maps, various incidental fixes and optimizations were required. The addition of shadow maps, LOD terrain, and the new lighting all led to significant performance degradation, on top of other changes happening in master. Therefore, a large number of performance improvements were also needed: - The graphics options were made much more flexible and configurable, and shaders were optimize. - New options were provided for how to render lights and shadows (@Pfauenauge, @zesterer). - Graphic setting storage and configuration were overhauled to make adding new features easier (@Pfauenauge, @imbris). - Shaders were rewritten to utilize GLSL's preprocessor to avoid overhead (@zesterer, @YuriMomo). - In the process of making changes related to providing additional rendering options, various incidental fixes and optimizations were required. - Voxel model creation was switched to use greedy meshing. - A new voxel meshing method, greedy meshing, was added (@imbris). - Uses of the older meshing methods were migrated to use greedy meshing (@imbris, @jshipsey, @Pfauenauge). - New restrictions were added to terrain, figure, and sprites to future proof them for further optimizations (@jshipsey, @Pfauenauge, @zesterer). - Most positions are now relative to either chunk or player position for better precision (@imbris, @zesterer, @scottc). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - Animation and terrain math were switched to use SIMD where possible. - Fixes were made to vek to make its SIMD feature usable for us (@zesterer, @imbris). - The interface and types used in bone animation were changed in various ways (@jshipsey, @Snowram, @Pfauenauge). - Redundant code generation for body animation is now partly taken care of by a macro (@jshipsey, @Snowram, @Pfauenauge). - Animation code was modified to to use vek's SIMD representation where possible (@jshipsey, @Snowram, @Pfauenauge). - Terrain meshing code and shadow map math were also modified to use vek's SIMD representation (@imbris). - SIMD instruction generation was enabled (@YuriMomo, @jshipsey, @Snowram, @imbris, @Angelonfira, @xMAC94x). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - The way we cache glyphs was completely refactored, fixed, and optimized. - Our fork of `conrod` was optimized in various ways (@imbris). - Our fork of `conrod` now exposes whether a widget was updated during the current frame (@imbris). - Our use of the glyph cache was rewritten for correctness (@imbris). - A text cache was introduced that lets us skip remeshing glyphs that have not changed (@imbris). - Various changes were made to reduce pressure on the glyph cache, with more planned (@imbris, @Pfauenauge). - In the process of making changes related to the glyph cache, various incidental fixes and optimizations were required. - Colors were changed to keep Veloren's look consistent with master. - Some older tree models were brought back (@Pfauenauge). - TODO(@Sharp): All hardcoded colors were extracted and made hotloadable. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Hardcoded colors were fixed to conform to Veloren's style. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Color models were fixed to conform to Veloren's style. A detailed description of the involved changes follows. --- - The world size is no longer hardcoded. All functions dependent on world size now take a `WorldSizeLg`, which holds the base 2 logarithm of each actual world dimension and is guaranteed to maintain certain properties (outlined in `common/src/terrain/map.rs`). Additionally, many utility functions that utilize the world size were moved into `common` as well (mostly `common/src/terrain/mod.rs`). Finally, the world map format was updated in order to store its size explicitly, with a migration path from the old format that should work whenever the old formatted map was a square (practically always). See `world/src/sim/mod.rs` for these changes. - The map generation code was made generic to allow using it outside of the `world` crate. The parts of the map generating code that do not need to query the world were moved over to `common/src/terrain/map.rs`, allowing them to be used from the client without creating a dependency on `world`. The rest of it was turned into helper functions in `world/src/sim/map.rs`, which can be passed as closures to the generic map generation code to complete its construction. This also means that colors are now passed in separately to the map generation function. See <https://veloren.net/devblog-78/> for more details. - On world creation, we now compute horizon maps. See the function in `world/src/sim/util.rs`. Given a height map and a plane intersecting that height map, our horizon maps allow us to encode enough information to reconstruct shadows for each point on the height map using only the horizon angle (the angle at which the sun starts to become visible). As Veloren's sun only covers one plane, this is sufficient for encoding sun shadows for LOD terrain, by encoding two angles per chunk (one for each 90 degrees the sun covers). We can also use this for the moon, if we want, since the moon follows the same path. Additionally, we store the height of the furthest occluder, to try to make the shadows volumetric; so this means 4 bytes in total for each chunk. Support for horizon maps has been merged into the map functionality in common as well. - The way we pass the world from the server to the client has been updated. Rather than passing the prerendered map, we instead pass three maps with values for each chunk; one with the color information, a second with altitude information, and a third with horizon map information. We then reconstruct the map on the client, together with some additional information we send from the server (like the sea level and maximum height). See `common/src/msg/server.rs` for a detailed description of the format of `WorldMapMsg`, and `server/src/libr.rs` and `client/src/lib.rs` for details of the map construction and parsing. - Artifacts related to image rotation were fixed. See the commit message for commit SHA `cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e` for a detailed explanation. This involved changes to shaders, the addition of a new type of graphic (also reflected in the graphic cache) that allows specifying a border color (which automatically makes the associated texture immutable), and some related fixes. I reproduce the first two paragraphs of the MR description as well: ``` Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). ``` - Multiflow rivers were enabled. This does not really need to be part of this MR, and would be easy to revert, but since it seemed to provide a nice improvement it's currently packaged with it. We already computed multiple outflows from each chunk for erosion purposes long before this MR. However, we never modified river rendering to be able to handle this case (just a single downhill river flow is complex enough!) so this was not exposed when deciding which chunks were rivers. Now that - In the process of making changes related to the world map, various incidental fixes and optimizations were required. Some examples of fixes include making sure terrain is never lowered to below sea level (to make the shadow maps report correct values), fixing map altitudes and colors to understand things like cliffs and "block level" coloring (that doesn'te xist on the column level), and fixing a crashbug when rendering images for the UI where source pixels are strongly rectangular. Some examples of related performance fixes include avoiding allocating a fresh vector for all the maps (i.e. copying it over to change the format from `[u32; n]` to `DynamicImage` and then copying again to convert to `RgbaImage`), and instead using the `gfx::memory::slice` function to accomplish the same thing. These sorts of changes are spread all arond the code. This includes the additon of a new scene, `voxygen/src/scene/lod.rs`, a new pipeline `voxygen/src/render/pipeline/lod_terrain.rs`, and new shaders `assets/vxygen/shaders/lod-terrain-vert.glsl` and `assets/vxygen/shaders/lod-terrain-frag.glsl`, as well as associated changes to the renderer in `voxygen/src/render/renderer.rs`. The main idea behind our initial approach to LOD was to take the world data we now get from the server (altitude, color, and horizon mapping). - Some previously computed values were turned into shader uniforms for better prediction on weak processors. (@zesterer) - Calls to power or trig functions were removed or replaced with multiplications, where possible. - After some deliberation - To properly handle sprite "waving" for nearby sprites, We explicitly designed the greedy meshing system with figures and sprites in mind. In both cases, we want to be able to efficiently pack many different models into the same texture, especially in cases where we know we will either not be removing any of the grouped-together from the models from the texture, or will remove all of them at once (so they can be packed into some specific subtexture). For sprites, since we know every model in advance and never intend to deallocate them, we currently pack them all as efficiently as possible into one giant tetxure atlas. However, in the future we might opt to pack them slightly less efficiently in exchange for shrinking the sprite vertex size. For figures, we pack all the textures for each model into the same atlas. is a global texture atlas used for every sprite, and for figures which is why we have the ability to mesh multiple models to the same texture area (using the simple texture atlas allocator) without requiring intermediate vector allocations. This is accomplished by delaying the time when we actually write the color and light data to the texture until after all the model vertices have been meshed; then, we can just allocate the whole color/light array at once, making the atlas we use an exact fit. In computer science-y terms, we accomplish this delay by, after we perform the initial greedy meshing (without texture information), not continuing to create the texture data, but instead constructing a continuation--that is, a function that, when called, will execute the rest of the computation. We push this continuation (which in Rust terms is a `FnOnce` closure that takes the `ColLightsInfo` that it is supposed to write to as context) onto a onto a vector resizing. To allow for suspended writes to texture data, Rust pointed out to me that the continuation that would eventually write the color and light data to the texture atlas (the one that is shared by all models sharing the same greedy mesher) would have to own whatever data it mshed. Because we often generate the model data to mesh as a temporary in `voxygen/src/load.rs`, the - Matrix multiplications in the shader were reduced for figure data (@zesterer). - Vertex "waves" for fluid data were removed. - Terrain "bending" near edges was removed. - Scaling was fixed to make sure empty space was not introduced in a space previously occupied by a block. It was also changed to take ownership of its voxel data, rather than sharing it, to let it be used with meshing. - Rust's nightly version was bumped in order to use the `array_map` function, which lets us reuse more code between the simple map and `FigureModelCache`. - PositionedGlyph::standalone. --- I tried to cite sources in many cases[^realtime],[^lloyd],[^lispsm],[^pbrt],[^greedy],[^tjunctions] where I needed features from elsewhere but I am particularly grateful for the following resources, esepcially where they have accompanying source code. I linked all of them that are accessible to the public (those that are not were obtained through legal means). [^realtime]: Eisemann, Elmar, Michael Schwarz, Ulf Assarsson, Michael Wimmer. Real-Time Shadows. A K Peters/CRC Press (T&F), 20160419. [^lloyd]: Lloyd,B. 2007. [Logarithmic perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). PhD thesis, University of North Carolina. [^lispsm]: Wimmer, M., Scherzer, D., and Purgathofer, W. 2004. [Light space perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). In Proceedings of Eurographics Symposium on Rendering 2004, pp. 143– 152. [^pbrt]: Pharr, Matt, et al. [http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf](Physically Based Rendering: From Theory to Implementation). Third edition, Morgan Kaufmann Publishers/Elsevier, 2017. [^greedy]: mikolalysenko. “Meshing in a Minecraft Game.” 0 FPS, 30 June 2012, <https://0fps.net/2012/06/30/meshing-in-a-minecraft-game/>. [^tjunctions]: blackflux. “Meshing in Voxel Engines – Part 1.” Blackflux.Com, 23 Feb. 2014, <https://blackflux.wordpress.com/2014/02/23/meshing-in-voxel-engines-part-1/>. I am also especially grateful to Khronos, Wikiepdia, and stackoverflow for answering many of my specific questions while writing the MR. --- Squashed commit of the following: commit `300505e730` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 18:46:25 2020 +0200 Fixing cargo doc and typo in CHANGELOG. commit `ec0aeb18e8` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 15:38:50 2020 +0200 Hopefully final commit for the LOD branch. commit `5e8ea0b1ea` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 10:14:26 2020 +0200 Falling back to power as stopgap. commit `e44a1cbf46` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 09:25:41 2020 +0200 Address imbris feedback. Temporarily disables shiny water, lowers max VD. These restrictions will be lifted soon after merging. commit `561e25778a` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 08:31:13 2020 +0200 Tweaking shaders a bit. commit `7d19259078` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:59:43 2020 +0200 Fix view example as well. commit `051cd4934e` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:29:06 2020 +0200 Fix meshing benchmark. commit `c95e07db3b` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 05:46:22 2020 +0200 Address MR feedback, fix scene clouds. commit `1bfb816cab` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:39:36 2020 +0200 Incorporating Pfau's figure color changes. New eyes and new humanoid colors. commit `3f9b89a3ac` Merge: `e2f5162e4` `62c53963a` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:29:41 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit `e2f5162e4f` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:28:38 2020 +0200 World colors are all hotloadable. They live in assets/world/style/colors.ron. Only a small handful of hardcoed colors remain in World; they are either part of the map, or difficult to disentangle from the rest of the computation. Comments are made where appropriate. commit `62c53963ab` Author: Marcel Märtens <marcel.cochem@googlemail.com> Date: Wed Aug 19 15:59:00 2020 +0200 replace pretty_env_logger with tracing commit `5b1625f99d` Merge: `d71003acd` `4942b5b39` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:15:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit `d71003acda` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:14:34 2020 +0200 Hotloading colors, part 1: colors in common. Currently, this just entails humanoid colors. There are only three colors not handled; the light emitter colors in common/src/comp/inventory/item/tool.rs. These don't seem important enough to me to warrant making hotloadable, at least not right now, but if it's needed later we can always add them to the file. commit `63b5e0e553` Merge: `c32b337a4` `6d2c4b9c1` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 13:05:37 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit `c32b337a46` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:52:04 2020 +0200 Fixing LOD grid, for real. commit `a166ae0360` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:28:05 2020 +0200 Addressing imbris's initial feedback. Fixes two minor bugs: explosion particles were no longer spawning randomly, and LOD grids were not perfectly even. commit `4cbad004f4` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:27:58 2020 +0200 Bumping nightly per request. commit `548680276a` Merge: `acc098604` `8f8b20c91` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:26:06 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit `acc0986040` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:28:32 2020 +0200 Lower resolution due to lying drivers. commit `d3b878de2a` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:15:38 2020 +0200 Fix issues msh encountered with Intel 4600. commit `10245e0c1b` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 21:15:02 2020 +0200 Merge more models into one mesh than we did previously. commit `3155c31e66` Merge: `7204cc8a7` `3c199280e` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:35:22 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit `7204cc8a7a` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:34:43 2020 +0200 Fix not yet done NPC animations. This forces them all to be the idle animation if not specified. This fixes issues where you'd have giant NPCs in water. commit `bc83360f2a` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 19:36:37 2020 +0200 Try to fix some bugs: - Z fighting with LOD terrain and water. - Audio SFX not playing. commit `1fd104aa60` Merge: `862df3c99` `7c2c392a3` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 12:02:31 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit `862df3c997` Merge: `0a4218ed9` `75c1d4401` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 05:52:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit `0a4218ed9d` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 22:27:14 2020 +0200 Fix particle depth. commit `f51dfdeb44` Merge: `c6251a956` `5e6dc0471` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:19:04 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit `c6251a956a` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:15:46 2020 +0200 Cache figures more intelligently. Cache figures for longer, and don't cache character states for the player except where they actually affect the rendered model. commit `0ed801d540` Merge: `c11b9bdf0` `eea64f78f` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 16:32:24 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit `c11b9bdf0a` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 11:47:15 2020 +0200 Remove unneeded Clippy annotation. commit `16aa9ef40a` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 8 00:53:02 2020 +0200 Fix hotloading and Clippy. commit `3dc973e0be` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 23:50:27 2020 +0200 Major speedups with SIMD. commit `fba64a7d93` Merge: `76429d00e` `d1e10b178` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:19 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit `76429d00ee` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:10 2020 +0200 Add clippy.toml. commit `c79f512f84` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 11:55:20 2020 +0200 Fix all clippy issues, clean up Rust code. commit `6f90e010b3` Merge: `77a8c7c26` `5929cfa5c` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:30 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit `77a8c7c267` Merge: `b44e44232` `44febaabd` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:10 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit `5929cfa5c7` Author: jshipsey <jshipsey18@gmail.com> Date: Thu Aug 6 20:47:27 2020 -0400 fixed in-hand arrow bug commit `b44e442325` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 6 13:40:35 2020 +0200 Miscellaneous performance improvements. commit `be37acf287` Merge: `125d7fc6c` `c11876547` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 05:49:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit `125d7fc6c4` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 04:55:31 2020 +0200 Abstract over simd vs. repr_c vectors. Also some minor improvements to Event size. commit `d4d4956e92` Merge: `5f3b7294a` `aced5f979` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:56:54 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit `5f3b7294af` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:43:52 2020 +0200 Fix formatting issues I missed before. commit `a428a3ebba` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:41:51 2020 +0200 Fix clippy warnings, part 1. There aer still a bunch of type too complex and function takes too many arguments warnings that I'll fix later (or ignore, since in the one case I did fix a function takes too many arguments warning I think it made the code less readable). commit `ba54307540` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 30 13:22:42 2020 +0200 Fix light animations so they are removed when the light turns off. commit `7e0f4bcbf0` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 21:10:20 2020 +0200 Fix crash in edge case for pixel art. commit `56da06f7a3` Merge: `cf74d55f2` `9f53a4a19` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:56:52 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit `cf74d55f2e` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:29:52 2020 +0200 Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). The first concern was addressed by fixing the dimensions of the map images drawn from the UI (so that we always use a square source rectangle, rather than a rectangular one according to the dimensions of the map). We also fixed the way rotation was done in the fragment shader for north-facing sources to make it properly handle aspect ratio (this was already done for north-facing targets). Together, these fix rendering issues peculiar to rectangular maps. The second and third concerns were jointly addressed by adding an optional border color to every 2D image drawn by the UI. This turns out not to waste extra space even though we hold a full f32 color (to avoid an extra dependency on gfx's PackedColor), since voxel images already take up more space than Optiion<[f32; 4]> requires. This is then implemented automatically using the "border color" wrapping method in the attached sampler. Since this is implemented in graphics hardware, it only works (at least naively) if the actual image bounds match the texture bounds. Therefore, we altered the way the graphics cache stores images with a border color to guarantee that they are always in their own texture, whose size exactly matches their extent. Since the easiest currently exposed way to set a border color is to do so for an immutable texture, we went a bit further and added a new "immutable" texture storage type used for these cases; currently, it is always and automatically used only when there is a specified border color, but in theory there's no reason we couldn't provide immutable-only images that use the default wrapping mdoe (though clamp to border is admittedly not a great default). To fix the maps case specifically, we set the border color to a translucent version of the ocean border color. This may need tweaking going forward, which shouldn't be hard. As part of this process, we had to modify graphics replacement to make sure immutable images are removed when invalidated, rather than just having a validity flag unset (this is normally done by the UI to try to reuse allocations in place if images are updated in benign ways, since the texture atlases used for Ui do not support deallocation; currently this is only used for item images, so there should be no overlap with immutable image replacement, so this was purely precautionary). Since we were already touching the relevant code, we also updated the image dependency to a newer version that provides more ways to avoid allocations, and made a few other changes that should hopefully eliminate redundant most of the intermediate buffer allocations we were performing for what should be zero-cost conversions. This may slightly improve performance in some cases. commit `ad18ce9399` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 13:21:09 2020 +0200 Fix continent scale hack. commit `36b1cb074f` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 12:11:40 2020 +0200 Enable loading different sized maps without a recompile. We may want to tweak the effects of the continent_scale_hack. commit `13b6d4d534` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 10:55:48 2020 +0200 Removing WORLD_SIZE, part 1. Erased almost every instance of WORLD_SIZE and replaced it with a local power of two, map_size_lg (which respects certain invariants; see common/src/terrain/map.rs for more details about MapSizeLg). This also means we can avoid a dependency on the world crate from client, as desired. Now that the rest of the code is not expecting a fixed WORLD_SIZE, the next step is to arrange for maps to store their world size, and to use that world size as a basis prior to loading the map (as well, probably, as prior to configuring some of the noise functions). commit `30b1d2c642` Merge: `7d56ba31b` `1377b369f` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:58 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit `7d56ba31b4` Merge: `2101113b4` `598f14b25` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit `1377b369f6` Author: Monty Marz <m.marzouq@gmx.de> Date: Sun Jul 19 23:25:38 2020 +0200 more saturated pumpkins commit `ae8d50527f` Author: Monty Marz <m.marzouq@gmx.de> Date: Sat Jul 18 20:29:56 2020 +0200 acacia models commit `2101113b46` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 18 18:55:25 2020 +0200 Higher detail LOD. commit `add2cfae04` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 16 01:57:39 2020 +0200 Revert some irrelevant stuff. commit `2e2ab3dc1e` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 15 13:30:49 2020 +0200 Fixing various things about shadows. * Correcting optimal LISPSM parameter. * Figure shadows are cast when they're not visible. * Chunk shadows stay cast until you look away. * Seamless cubemaps for point lights. * Etc. commit `6c31e6b562` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 19:50:26 2020 +0200 Fix shadow creation. commit `6332cbe006` Merge: `be438657c` `930e0028b` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:47:00 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit `be438657c3` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:28:08 2020 +0200 Tweaks to shadows. Added shadow map resolution configuration, added seamless cubemaps, documented all existing rendering options, and fixed a few Clippy errors. commit `23b4058906` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 10:11:19 2020 +0200 Fix moon, use nonlinear noise for terrain. Note that the latter has a bit of performance cost. commit `7fbe5cbfbb` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:23:02 2020 +0200 Address lies about max texture size. commit `bcfc62b5e1` Merge: `75e3626a7` `18a08e8fe` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:22:08 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit `75e3626a78` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:21:52 2020 +0200 OpenGL 3.3 minimum. commit `18a08e8fe2` Author: Monty Marz <m.marzouq@gmx.de> Date: Tue Jul 7 23:57:52 2020 +0200 settings localization commit `90c5d1ca36` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 21:11:48 2020 +0200 Lower near distance. commit `0e66f02b25` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 20:09:01 2020 +0200 All sprites sway in the wind now. commit `db1401a691` Merge: `69e508d8c` `e8b4b29d7` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 19:34:17 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit `69e508d8c9` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 18:41:37 2020 +0200 Make it easy to switch to SIMD for math. commit `ffe0f5928c` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 21:21:12 2020 +0200 Fix some issues with underwater rendering. commit `bfda6da42f` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 19:17:59 2020 +0200 Fix some minor display issues. commit `0ed752e087` Merge: `ccc6a06a8` `518edcb85` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:14:21 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit `ccc6a06a8d` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:04:34 2020 +0200 Some minor changes. commit `4e02024670` Merge: `50a64d927` `e05c9267a` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 16:17:40 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit `50a64d927e` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 13:07:03 2020 +0200 Fix far plane. commit `7dd06da34c` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:25:35 2020 +0200 Add shadows.glsl. commit `618a18c998` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:10:22 2020 +0200 Adding shadows, greedy meshing, and more. commit `eaea83fe6a` Merge: `267018495` `2f89b863e` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 22:47:07 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit `2670184954` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 21:20:01 2020 +0200 Make civsim and sites deterministic. For anything in worldgen where you use a HashMap, please think carefully about which hasher you are going to use! This is especially true if (for some reason) you are depending on hashmap iteration order remaining stable for some aspect of worldgen. commit `f8376fd5dc` Merge: `654f7e049` `cdee191dd` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 17:53:57 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit `654f7e0492` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed May 20 21:22:30 2020 +0200 Correct backface culling. commit `560501df05` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue May 19 17:22:06 2020 +0200 Greedy messhing for shadows. commit `a4d87e1875` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun May 17 05:59:00 2020 +0200 Shadow maps work for lantern. commit `243d0837b8` Merge: `04382dc28` `71dd520cd` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:53:13 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit `04382dc286` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:22:17 2020 +0200 WIP: better graphics config, better LOD, shadow maps. commit `22ddbad3eb` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 18:54:09 2020 +0200 Minor shader fixes. commit `746a10e8d0` Merge: `0f4a0e763` `40ab94673` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 04:02:09 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit `0f4a0e763d` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 23:03:24 2020 +0200 Switch back to pop-in terrain. commit `dd74fa7e4a` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 22:58:55 2020 +0200 LOD shading closer to voxel shading. commit `ef67bd58ba` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 28 20:49:03 2020 +0200 Experimental underwater lighting. commit `2c5ad9d076` Merge: `748279835` `303967a6f` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 22:35:24 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit `7482798354` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 21:59:55 2020 +0200 Replace discard in figure-frag. commit `d83b4ae69b` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:45:57 2020 +0200 Fix sprite lighting, HDR from focus_pos. commit `0594238004` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:14:10 2020 +0200 Proper HDR from point lights. commit `48c93d2b41` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 14:01:43 2020 +0200 Brighter ambiance, darker LOD shadows. commit `e0452e895c` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 13:13:23 2020 +0200 More proper HDR. commit `4c6da3ed16` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 00:13:10 2020 +0200 Trying LOD noise. commit `682a3d74c8` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 23:11:08 2020 +0200 Fix LOD heights in towns. commit `cc39e5734e` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 21:01:23 2020 +0200 More LOD fixes. commit `8116b21c2e` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:54:43 2020 +0200 I like this coloring. commit `bc2560ea90` Merge: `14effdd5d` `e690efe71` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:48:33 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit `14effdd5db` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:24:35 2020 +0200 Re-saturate. commit `48a643955d` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:23:57 2020 +0200 Various fixes. commit `f7b497a0c2` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 03:22:49 2020 +0200 Render figures again. commit `44e4aad48d` Merge: `e6f0a5a98` `9ec319a18` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 02:01:04 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit `e6f0a5a981` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 24 16:12:20 2020 +0200 Add atmospheric scattering. commit `f2953087f6` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 23 00:01:20 2020 +0200 Fix shadowing for specular reflections. commit `ddd4a67a97` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Apr 22 22:56:12 2020 +0200 HDR fixes. commit `1015e60dee` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 21 18:25:19 2020 +0200 More lighting changes. commit `80c264abd1` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 13 00:29:59 2020 +0200 Lighting experiments. commit `8414987e58` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 9 02:38:40 2020 +0200 WIP -- lighting changes and soft shadows. commit `9cd2b3fb0d` Merge: `c7ea687eb` `8b149ad11` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:29 2020 +0200 Merge branch 'sharp/new-lighting' into sharp/small-fixes commit `c7ea687ebb` Merge: `476441531` `22f3319b4` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:02 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit `8b149ad11a` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:32:39 2020 +0200 Trying out a new lighting model. commit `b0ac9f36f7` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 07:56:11 2020 +0200 Use bicubic interpolation for terrain. commit `f6fc9307a1` Merge: `33140a295` `22f3319b4` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 05:01:41 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit `4764415312` Merge: `ed2d0111d` `13388ee6a` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 04:54:48 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit `13388ee6a4` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 20:30:08 2020 +0200 Various fixes (to coloring and to soft shadows). commit `fbd084a94a` Merge: `5a089863b` `4fdf6896a` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 18:50:38 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/map-colors commit `ed2d0111d9` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 06:49:27 2020 +0200 Combining colors and LOD. commit `88342640c6` Merge: `33140a295` `5a089863b` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:49:20 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit `33140a2951` Merge: `4c65a5aed` `f34d4b379` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:36:21 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit `5a089863be` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 03:17:49 2020 +0200 Making maps brighter. This is probably not the right way to do it, but oh well! commit `32b2c99109` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 02:46:36 2020 +0200 Horizon mapping and "layered" map generation. Horizon mapping is a method of shadow mapping specific to height maps. It can handle any angle between 0 and 90 degrees from the ground, as long as know the horizontal direction in advance, by remembering only a single angle (the "horizon angle" of the shadow map). More is explained in common/src/msg/server.rs. We also remember the approximate height of the largest occluder, to try to be able to generate soft shadows and create a vertical position where the shadows can't go higher. Additionally, map generation has been reworked. Instead of computing everything from explicit samples, we pass in sampling functions that return exactly what the map generator needs. This allows us to cleanly separate the way we sample things like altitudes and colors from the map generation process. We exploit this to generate maps partially on the server (with colors and rivers, but not shading). We can then send the partially completed map to the client, which can combine it with shadow information to generate the final map. This is useful for two reasons: first, it makes sure the client can apply shadow information by itself, and second, it lets us pass the unshaded map for use with level of detail functionality. For similar reasons, river generation is split out into its own layer, but for now we opt to still generate rivers on the server (since the river wire format is more complicated to compress and may require some extra work to make sure we have enough precision to draw rivers well enough for LoD). Finally, the mostly ad-hoc lighting we were performing has been (mostly) replaced with explicit Phong reflection shading (including specular highlights). Regularizing this seems useful and helps clarify the "meaning" of the various light intensities, and helps us keep a more physically plausible basis. However, its interaction with soft shadows is still imperfect, and it's not yet clear to me what we need to do to turn this into something useful for LoD. commit `f8926a5737` Merge: `a1aee931e` `875ae6ced` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Mar 13 13:32:42 2020 +0100 Merge remote-tracking branch 'origin/master' into sharp/map-colors commit `4c65a5aed3` Author: Treeco <5021038-Treeco@users.noreply.gitlab.com> Date: Mon Feb 24 16:48:05 2020 +0000 Made LOD setting slider exponential commit `2fa7b2d20d` Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 17:49:53 2020 +0000 Added mist to LoD commit `aab059a450` Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 15:14:06 2020 +0000 Added LoD slider commit `779c36b538` Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:54:55 2020 +0000 Reduced cost of vertex pushing commit `9fea150473` Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:38:53 2020 +0000 Fixed maths, improved LoD resolution commit `5481df38fe` Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 11:22:50 2020 +0000 Dynamically relocate LoD vertices to enhance details commit `a3e36a50ab` Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 18:13:51 2020 +0000 Simpler terrain spiral rendering commit `255f450ae9` Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:53:17 2020 +0000 Better LoD precision commit `3d027aebe8` Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:04:03 2020 +0000 Better falloff commit `be775c9484` Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 15:30:45 2020 +0000 Applied good ideas from experimental branch commit `58587b6854` Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 16:15:13 2020 +0000 Minor fixes to LoD merging commit `7b42aebd70` Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 15:04:44 2020 +0000 Capped LoD dragging commit `8aafc559f8` Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:54:37 2020 +0000 Better blending between LoD and terrain border commit `edd3455d51` Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:40:19 2020 +0000 Fixed LoD z depth, added sea level offset commit `b9b0674462` Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:27:43 2020 +0000 Better LoD smoothing commit `a1aee931e7` Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Feb 21 14:52:17 2020 +0100 Adding shadows. commit `2400786c13` Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 13:48:40 2020 +0000 Use world map as LoD source commit `dbf650f504` Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Jan 20 00:48:14 2020 +0000 Better clouds at distance commit `5e6f81b86c` Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Jan 19 23:59:02 2020 +0000 sync commit `745e7540dd` Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 12:40:48 2019 +0000 Improved cloud falloff mist, faster noise sampling commit `f6a200d0cb` Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 10:09:00 2019 +0000 Improved long-range depth precision, removed unnecessary LoD polygons commit `63d1b2bb22` Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 20:57:46 2019 +0000 Working LoD shader commit `f13d98ee3e` Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 11:03:40 2019 +0000 LoD first attempt (stack overflow issue)	2020-08-20 20:34:59 +02:00
Snowram	df7793549c	Add 1st and 2nd item of inventory in hotbar	2020-08-20 18:16:07 +02:00
Ryan Baker	3cdf7006e5	fixes #712 - where pressing N to leave Settings doesn't unpause a single player game world	2020-08-18 13:42:40 -04:00
Marcel Märtens	8687740265	fix clippy warnings in new version	2020-08-17 11:10:18 +02:00
Marcel	8f8b20c913	Merge branch 'xMAC94x/release_numbers' into 'master' Change the version number to 0.7 See merge request veloren/veloren!1296	2020-08-15 10:27:31 +00:00
Marcel Märtens	ed68bff135	Change the version number to 0.7	2020-08-15 11:53:59 +02:00
Justin Shipsey	165c328517	fixed jump anim bug and non-attack bug for bipedlarge	2020-08-14 10:50:08 +00:00
Marcel Märtens	b8234217af	fix #690	2020-08-13 10:41:34 +02:00
Joshua Barretto	75c1d44010	Merge branch 'zesterer/worldsim' into 'master' World simulation, generation, and pathfinding improvements (including castles and caves) See merge request veloren/veloren!1282	2020-08-12 21:40:56 +00:00
Joshua Barretto	e3cab272c3	Fixed floating sprites in towns, clippy fixes	2020-08-12 21:16:14 +01:00
Joshua Barretto	50a85853e3	Fmt and clippy lints fixes	2020-08-12 21:16:14 +01:00
Joshua Barretto	85ed5ad356	Updated changelog, cleaned up warnings, minor fixes	2020-08-12 21:16:11 +01:00
Joshua Barretto	15b1717295	Added decals to towns	2020-08-12 21:15:53 +01:00
Joshua Barretto	6992194ad4	Better surface swimming, no underwater sprites	2020-08-12 21:15:53 +01:00
Monty Marz	c1b07465cf	added grass sprites	2020-08-12 21:15:53 +01:00
Joshua Barretto	6633298722	Added terrain scatter densities	2020-08-12 21:15:53 +01:00
Pfauenauge	ee83479748	drop gate parts	2020-08-12 21:15:53 +01:00
Joshua Barretto	41916d4594	Better castles, initial light prop for lit objects	2020-08-12 21:15:52 +01:00
WelshPixie	568a3e375e	fixed sprite rotations	2020-08-12 21:15:52 +01:00
Monty Marz	fcdd875bff	UI fixes, assets update	2020-08-12 18:10:18 +00:00
Monty Marz	6789b7ae27	Add firework hues	2020-08-12 22:29:06 +08:00
scott-c	9aab296264	Add firework item	2020-08-12 22:25:28 +08:00
scott-c	d38aab8000	fix particle de-synchronisation with paused game	2020-08-10 19:04:30 +08:00
IBotDEU	6b707a1ab7	implemented ability to select bit depth and refresh rate and implemented seperate setting for fullscreen resolution	2020-08-09 20:30:22 +00:00
Imbris	01ad81322d	Merge branch 'yusdacra/treeculler-update' into 'master' change treeculler crate from git to published version See merge request veloren/veloren!1269	2020-08-09 17:21:15 +00:00
Imbris	893da3622a	Merge branch 'scott-c/particles' into 'master' Particles See merge request veloren/veloren!1156	2020-08-09 17:09:43 +00:00
Justin Shipsey	f050aeb273	Merge branch 'master' into 'slipped/swim' # Conflicts: # voxygen/src/anim/src/character/swim.rs	2020-08-09 15:13:56 +00:00
nepo	bc1fabc41b	nepo/new bones	2020-08-08 22:37:50 +00:00
jshipsey	37c733a067	clippy, consdensed climb, corrected some swim bugs	2020-08-08 17:04:50 -04:00
jshipsey	d7b3e84153	swim alterations to condense the body on strong turns	2020-08-08 13:47:32 -04:00
jshipsey	be3ed4b238	minor anim tweak	2020-08-08 13:47:32 -04:00
jshipsey	854361cdaa	changelog	2020-08-08 13:47:32 -04:00
jshipsey	316546af22	bandaid fix for swim wield	2020-08-08 13:47:32 -04:00
jshipsey	9ff5c23cf0	readd sneak	2020-08-08 13:47:32 -04:00
jshipsey	691607f398	swimming changes	2020-08-08 13:47:32 -04:00
scott-c	cae84dd4c9	fix rebase	2020-08-08 20:53:07 +08:00
scott-c	70ff8c3faa	Add Copy trait to dependents	2020-08-08 19:26:52 +08:00
scott-c	0ace0acdcd	update comment	2020-08-08 19:26:52 +08:00
scott-c	dd1e89a691	Implement particle heartbeat scheduler	2020-08-08 19:26:52 +08:00
scott-c	a0107d5cda	fix rebase	2020-08-08 19:26:52 +08:00
scott-c	bf025df204	refactor sfx mgr outcome useage	2020-08-08 19:26:52 +08:00
scott-c	bb8ba75287	cleanup redundant function	2020-08-08 19:26:52 +08:00
scott-c	023d465370	clear particle gpu instance buffer when disabled	2020-08-08 19:26:52 +08:00
Joshua Barretto	a924f9694d	Explosion sound and event lights	2020-08-08 19:26:52 +08:00
Joshua Barretto	8547cdd681	Added outcome sound effects, fixed directional sound, particle outcomes	2020-08-08 19:26:52 +08:00
Joshua Barretto	7c31baef6f	Added outcome system, sound effects	2020-08-08 19:26:48 +08:00
scott-c	5ba4d26821	Update changelog	2020-08-08 19:25:29 +08:00
scott-c	5acfe44cbb	Add toggle particles graphics setting	2020-08-08 19:25:01 +08:00
scott-c	f9f9e9e190	Add particle count to debug info	2020-08-08 19:25:00 +08:00
scott-c	bb2a5c885b	Add fireball and bomb particle effects	2020-08-08 19:25:00 +08:00
scott-c	4bc373a832	remove particle emitter component	2020-08-08 19:25:00 +08:00
scott-c	3139e85dff	allow for col particles	2020-08-08 19:25:00 +08:00
scott-c	803677f0fb	Add particle velocity and ability particle emitter	2020-08-08 19:25:00 +08:00
scott-c	da5f4828a5	Add particle lifespan	2020-08-08 19:25:00 +08:00
scott-c	39b676cd8f	Add ParticleMgr	2020-08-08 19:24:55 +08:00
scott-c	7e35617f59	Add particle pipeline	2020-08-08 19:24:25 +08:00
Monty Marz	142b386628	address comments	2020-08-08 00:13:00 -04:00
Monty Marz	74ace74d5a	Change to social window selection visuals	2020-08-08 01:16:35 +02:00
Imbris	2608217e83	Make clippy happy, fmt even though it is set to fmt on save in my editor...."	2020-08-08 01:16:35 +02:00
Imbris	390d289d35	Add timeout's to group invites, and configurable limit to group size Fix a few group bugs, enable invite timeout and group limits in ui	2020-08-08 01:16:35 +02:00
Monty Marz	14b0d9a7fe	group leader colouring, offset fix when debug menu is open, fixed social tab visuals text width limit group interaction wording, group window adjustments	2020-08-08 01:15:58 +02:00
Monty Marz	28a8f847cc	timeout visuals, various small fixes and two new items	2020-08-08 01:15:58 +02:00
Monty Marz	3da7e27a7c	overhead info improvements overhead improvements	2020-08-08 01:15:58 +02:00
Monty Marz	1eb671e1a6	Update CHANGELOG.md, german locale	2020-08-08 01:15:58 +02:00
Imbris	1d69e85a50	Don't show own char in group menu, handle accept/decline key events	2020-08-08 01:15:58 +02:00
Monty Marz	58df00d80c	Social window assets	2020-08-08 01:14:19 +02:00
Imbris	03d9992b9f	Distribute exp evenly and make it easier to target entities	2020-08-08 01:14:19 +02:00
Monty Marz	f2ed7efced	group button and menu logic changes group member panels health bar text text shadows and scaling cleanup, don't show the player panel social window assets	2020-08-08 01:14:19 +02:00
Imbris	3a22b3694d	New group UI functions	2020-08-08 01:14:19 +02:00
Monty Marz	9cffb61429	colors	2020-08-08 01:12:35 +02:00
Imbris	d856c20225	Integrate groups with chat groups	2020-08-08 01:12:35 +02:00
Imbris	ef4b221706	Make entity targeting easier, add EXP sharing	2020-08-08 01:12:35 +02:00
Imbris	0a8f148559	Fixes and tweaks for groups	2020-08-08 01:12:35 +02:00
Monty Marz	d9e3937a82	Basic UI Basic ui for groups and group window	2020-08-08 01:12:35 +02:00
Imbris	6aba810517	Add key to select entities	2020-08-08 01:09:02 +02:00
Imbris	1741384d00	Add entity targeting	2020-08-08 01:09:01 +02:00
Marcel Märtens	599a9a76fc	add a translation test that verifys that all language RON files are parseable (without any git involved)	2020-08-07 21:31:34 +02:00
Imbris	bdd255beb6	Tooltips now disappear when hovered and no longer appear on top of the mouse position (e.g. in the bottom of the inventory)	2020-08-07 03:30:17 -04:00
Imbris	d74a1d371e	Avoid cloning armor/tool in tooltip generation, add temporary case for legacy item descriptions	2020-08-07 01:25:51 -04:00
nepo	cb65070aba	nepo/dullahan	2020-08-07 03:56:59 +00:00
Yusuf Bera Ertan	af72c46c02	change treeculler crate from git to published version	2020-08-07 01:53:49 +03:00
Imbris	c2f3e1b47f	Revert "Merge branch 'BottledByte/ability_design' into 'master'" This reverts merge request !1264	2020-08-06 08:04:03 +00:00
Imbris	a0b1259b7e	Merge branch 'BottledByte/ability_design' into 'master' Add ability IDs and use them in GUI See merge request veloren/veloren!1264	2020-08-06 04:44:51 +00:00
BottledByte	34c87d7a86	Add ability IDs and use them in GUI	2020-08-05 23:00:43 +02:00
BottledByte	ab1c43be84	Dehardcoded LanternKind, Consumable and Ingredient, fixed Sceptre hotbar Also fixed two wrong asset references and did some .ron formatting	2020-08-05 01:21:42 +02:00
Imbris	c118765477	Merge branch 'sharp/os-x-resize' into 'master' Fix window resizing on OS X. See merge request veloren/veloren!1256	2020-08-03 03:47:48 +00:00
BottledByte	a167ee98ee	De-enumerized armor variants	2020-08-03 03:41:32 +00:00
Joshua Yanovski	4e99a3d142	Fix window resizing on OS X. Not really clear why this was working on any platform...	2020-08-03 04:40:36 +02:00
Imbris	7d524f6062	Merge branch 'w3yden/overitem_hud' into 'master' Voxygen/HUD: Display item name over dropped items See merge request veloren/veloren!1240	2020-08-02 19:54:33 +00:00
w3yden	3e9cfa45bb	Voxygen/HUD: Display item name over dropped items Fix clippy warning: Removed unneeded () in fn style Fix formatting for fn style	2020-08-02 09:49:39 +02:00
Imbris	aced5f9797	Merge branch 'shandley/collect-block-keyup-fix' into 'master' Prevent inventory collect events from firing on keyup See merge request veloren/veloren!1252	2020-08-02 06:49:14 +00:00
Shane Handley	1ae02244bc	Prevent keyholds for collect (e)	2020-08-02 15:25:57 +10:00
BottledByte	dc91209a7b	Removed fine-grained Item enums and replaced them with Strings This change allows to introduce new weapons and pair them with graphical assets without need to recompile.	2020-08-02 01:21:32 +00:00
Samuel Keiffer	f930f52df5	Allows for weapons to have different stats. Seperates healing staff out from staffs into its own weapon type: sceptre. Splits bow weapon type into shortbow and longbow.	2020-08-01 20:08:30 +00:00
Shane Handley	f34894087a	Prevent inventory collect events from firing on keyup, which is causing item pickup actions to be called twice.	2020-08-01 20:26:44 +10:00
jshipsey	f167026889	changelog	2020-08-01 02:28:57 -04:00
jshipsey	bcc257f893	cleanup, last tweaks	2020-08-01 02:19:45 -04:00
jshipsey	aa3bdc42d7	arming the cyclops	2020-08-01 02:19:45 -04:00
Snowram	1421517f84	Add frog npc, tweak pig model	2020-08-01 02:19:45 -04:00
jshipsey	487131efb8	cyclops run anim	2020-08-01 02:19:45 -04:00
Snowram	990762ba76	Bonerattler tweaks	2020-08-01 02:19:45 -04:00
jshipsey	5d2be2240e	maneater and feed anim	2020-08-01 02:19:45 -04:00
Snowram	90d7485c38	Add troll, truffler and wendigo npcs	2020-08-01 02:19:45 -04:00
jshipsey	8991b60929	catoblepas, bonerattler, rabbit, improved anims	2020-08-01 02:19:44 -04:00
jshipsey	baf67f303e	new models, anim tweaks	2020-08-01 02:19:44 -04:00
Snowram	3524d644f5	Various changes to npcs animations - Improved dragon run with tilting - New run animation for quadsmall, added tilting	2020-08-01 02:19:43 -04:00
Snowram	a0da059676	Skeleton rework with rough offsets	2020-08-01 02:19:43 -04:00
Imbris	f589564760	Fix glyph to large panic	2020-07-31 01:13:31 -04:00
Marcel Märtens	0d5e61c4b6	update auth to newest version	2020-07-29 19:28:22 +02:00
Marcel Märtens	96cde882ef	update auth to the newest version and remove useless dep	2020-07-29 00:05:23 +02:00
Imbris	ba14440a49	Fix filtering out resize events in the ui	2020-07-26 18:21:20 -04:00
Samuel Keiffer	827b91d691	Bow charged shot attack	2020-07-26 03:06:53 +00:00
Imbris	6435464d00	Make video mode selection slightly better	2020-07-25 17:07:50 -04:00
Monty Marz	31cfc05123	lots of things animation fixes by slipped new cultist item settings option for loading screen tips loot table adjustments	2020-07-23 12:10:13 +00:00
Justin Shipsey	24f968d813	Merge branch 'quickfixes' into 'master' small fixes See merge request veloren/veloren!1221	2020-07-21 13:36:10 +00:00
T-Dark0	fd9ec8fbd0	Voxygen and server-cli no longer panic if server creation returns error The process just exists instead	2020-07-21 09:59:00 +00:00
jshipsey	5b76ed23f4	small fixes	2020-07-20 21:37:13 -04:00
Monty Marz	e353bd3cfc	Fix cut off chat	2020-07-18 21:56:45 +00:00
Imbris	d46bf03e27	Merge branch 'imbris/screenshot-tweak' into 'master' Only screenshot and toggle fullscreen once per frame See merge request veloren/veloren!1217	2020-07-18 19:08:42 +00:00
Imbris	14d500abbc	Only screenshot and toggle fullscreen once per frame	2020-07-18 12:21:22 -04:00
Imbris	d53ad7eb43	Fix color depth selection	2020-07-18 08:17:42 -04:00
Imbris	2a9785a40c	Remove supplement_events from Window, fix suppresed clippy lint, actually use exlusive fullscreen instead of a borderless window	2020-07-17 22:18:43 -04:00
Imbris	c8133ded43	Fix issue where client_init was not set to None after it finished, use tweaked version of winit to avoid macos link failure in the CI, small comment fixes	2020-07-17 21:26:21 -04:00
Imbris	953773e1d3	Temporarily remove voxygen character_renderer example until we move to a more actively maintained rendering backend	2020-07-17 21:26:21 -04:00
Imbris	0275cc9523	Tweak pausing code to reduce duplication	2020-07-17 21:26:21 -04:00
Imbris	2f5c8fa3f3	Fixes for Alt key related issues	2020-07-17 21:26:21 -04:00
Imbris	27bfc74928	small fix and refactor stop auto walk to a method	2020-07-17 21:26:21 -04:00
Imbris	9bfb1b5f00	Fix rebase mistake	2020-07-17 21:26:21 -04:00
Imbris	97364d49ed	Increment glutin version in Cargo.toml file	2020-07-17 21:26:20 -04:00
Imbris	a0d88e0774	Fix mistake with event processing	2020-07-17 21:26:20 -04:00
Imbris	f0d4ec32f5	clippy fixes	2020-07-17 21:26:20 -04:00
Imbris	8cd2207495	Proper fix for winit / cpal conflict	2020-07-17 21:26:20 -04:00
Imbris	29c877cff3	Winit 0.22 released	2020-07-17 21:26:16 -04:00
Imbris	61983b1b06	poll twice	2020-07-17 21:24:29 -04:00
Imbris	28e00a0f6e	Fix singleplayer feature and rebase related stuff	2020-07-17 21:24:28 -04:00
Imbris	7dfb24d4a5	Clean comments, fix mistake, change dep source now that compatible version is available on crates.io	2020-07-17 21:24:28 -04:00
Imbris	5e8d74e00e	fix Window::logical_size	2020-07-17 21:24:28 -04:00
Imbris	70eba0c30a	Update changelog	2020-07-17 21:24:28 -04:00
Imbris	db91ebe9b5	fix a few minor bugs	2020-07-17 21:24:28 -04:00
Imbris	21a1382850	Update to winit 0.21.0	2020-07-17 21:24:28 -04:00
Imbris	d1b635efa4	Rearrange PlayState system to work without loop control	2020-07-17 21:24:28 -04:00
Imbris	515dbc30a7	Switch to updated gfx_window_glutin	2020-07-17 21:24:28 -04:00
Joshua Barretto	807a27328c	Updated to winit 20	2020-07-17 21:24:27 -04:00
Samuel Keiffer	6cce09be85	Added protection stat to admin armor hidden in debug folder. Removed blue cultist armor set from drop table as it is an admin set.	2020-07-18 00:05:28 +00:00
lausek	05cc6f222b	avoid comparing to own entity when mounting; fix coding style	2020-07-15 15:31:42 +02:00
lausek	a3326b5744	fix #611 ; add distance check when mounting pet	2020-07-15 14:54:53 +02:00
Joshua Barretto	8d6b442193	Crafting	2020-07-14 20:11:39 +00:00
Marcel	d5bfae886e	Merge branch 'xMAC94x/net-improve' into 'master' xMac94x/net improve See merge request veloren/veloren!1162	2020-07-14 14:09:43 +00:00
Joshua Barretto	446923f7d8	Merge branch 'zesterer/small-fixes' into 'master' Zesterer/small fixes See merge request veloren/veloren!1190	2020-07-14 09:54:17 +00:00
Joshua Barretto	3e5c3de2ac	Neater compass	2020-07-13 23:23:44 +01:00
Marcel Märtens	c74e5e4b47	Changes requested in rewiew	2020-07-13 23:41:32 +02:00
Ben Wallis	a9be045cb8	Fixed suppressed clippy warnings for #587 - useless_conversion	2020-07-13 20:57:13 +01:00
Marcel Märtens	9d32e3f884	proper voxygen connect and code cleanups: - voxygen abort when the server has a invalid veloren_network handshake, e.g. by outdated version instead of try again - rename Network `Address` to `ProtocolAddr` as sugested by zest as it's a combination of Protocol and std::io::Addr - remove the manual byte arrays in `protocols.rs` with something more nice	2020-07-13 13:03:20 +02:00
Marcel	2b13b7d952	Merge branch 'yusdacra/fix-i18n-test' into 'master' Fix localization test and add translation status percentage See merge request veloren/veloren!1196	2020-07-13 10:02:00 +00:00
Marcel	2414d5ae5e	Merge branch 'gSpera/no_autowalk_after_die' into 'master' Stopping auto-walk after death: Fixes #607 Closes #607 See merge request veloren/veloren!1197	2020-07-13 08:39:39 +00:00
Marcel Märtens	5d60fb2e1d	move i18n test to i18n file to reduce compile time && merge gitlab jobs to only have 1 cargo test job	2020-07-13 09:50:55 +02:00
Yusuf Bera Ertan	730a54dad5	localization test: add per file data to overall status, better alignments	2020-07-13 00:40:43 +03:00
Kai	8e523364ac	Prevent GameInputs from being bound to multiple keys unless explicitly allowed. Add a Reset to Defaults button for controls.	2020-07-12 11:59:55 -07:00
Yusuf Bera Ertan	95fd89b4f9	add more error messages, add percentage calculation for each i18n file and an overall percentage result	2020-07-12 14:54:03 +03:00
Yusuf Bera Ertan	72ec565678	fix localization test	2020-07-12 05:38:11 +03:00
Kai	6b771b8dca	Add a clientside check to only allow freefly camera for admins	2020-07-11 13:59:47 -07:00
Kai	738fa34534	Add freefly camera mode and cycle camera mode keybind	2020-07-11 11:39:04 -07:00
Ben Wallis	6ca6e2d646	Removed rounding from ping delta and added weighted rolling average ping calculation	2020-07-11 15:39:31 +01:00
Joshua Barretto	3c72022c81	Nicer north colour	2020-07-10 18:21:34 +01:00
Joshua Barretto	cf69d0c5d8	Added minimap compass	2020-07-10 15:00:20 +01:00
Songtronix	728d349c77	fix: show loading screen for singleplayer	2020-07-10 11:05:09 +02:00
Songtronix	5b57072064	fix: use correct specs(-idvs) versions related to torvus	2020-07-09 19:46:30 +02:00
Samuel Keiffer	fe47a14ba5	Spin attack for axe	2020-07-08 19:58:41 +00:00
Giovanni Spera	4232148b83	Stopping auto-walk after death: Fixes #607	2020-07-07 20:56:44 +02:00
Justin Shipsey	e8b4b29d70	Merge branch 'scott-c/1h-fixes' into 'master' 1h fixes See merge request veloren/veloren!1158	2020-07-07 15:29:33 +00:00
Marcel Märtens	6ddd09b7b6	specs back to master	2020-07-07 12:55:06 +02:00
Marcel	b85a4493ea	revert dispatch	2020-07-07 11:19:38 +02:00
Marcel Märtens	c212de00c2	updated dependencies and fixed stuff - replace serde_derive by feature of serde incl. source code modifications to compile - reduce futures-timer to "2.0" to be same as async_std - update notify - removed mio, bincode and lz4 compress in common as networking is now in own crate btw there is a better lz4 compress crate, which is newer than 2017 - update prometheus to 0.9 - can't update uvth yet due to usues - hashbrown to 7.2 to only need a single version - libsqlite3 update - image didn't change as there is a problem with `image 0.23` - switch old directories with newer directories-next - no num upgrade as we still depend on num 0.2 anyways - rodio and cpal upgrade - const-tewaker update - dispatch (untested) update - git2 update - iterations update	2020-07-07 09:43:49 +02:00
Joshua Barretto	d1cdb6ea55	Updated changelog	2020-07-07 01:11:37 +01:00
Joshua Barretto	e626f6255f	Prevented pet damage	2020-07-07 01:01:39 +01:00
Joshua Barretto	f77d2f06c6	Fixed staff RMB, bug in ranged weapon code	2020-07-06 23:37:44 +01:00
Joshua Barretto	30619771af	Improved block picking	2020-07-06 23:04:13 +01:00
Joshua Barretto	62b59de95a	Fixed sprite select flickering	2020-07-06 22:41:21 +01:00
Joshua Barretto	ddaa0a9246	Made char select handle client events	2020-07-06 17:11:19 +01:00
scott-c	b72d817cf7	Fix 1h models in character select idle animation #662	2020-07-06 17:54:26 +08:00
scott-c	6014bd8364	fix 1h second item cache issue #661	2020-07-06 17:54:26 +08:00
Marcel	e19d170b61	Merge branch 'imbris/smaller-fixes' into 'master' Stop spamming loadout, Update specs See merge request veloren/veloren!1165	2020-07-06 09:50:46 +00:00
Imbris	8d39f27458	Upgrade hashbrown	2020-07-06 03:15:06 -04:00
Snowram	d6da1f0e75	post-quad rewrite fixup	2020-07-06 06:07:29 +00:00
Imbris	c2d6d00b00	point to github specs to access PairedStorage type, fix Loadout sync spam	2020-07-06 01:56:02 -04:00
Joshua Barretto	43f75f2f54	Removed bomb timeout	2020-07-05 16:15:51 +01:00
Joshua Barretto	fd39ee97bc	Added training dummies	2020-07-05 16:15:51 +01:00
Joshua Barretto	2f6a618d5a	Added bombs, throwable items, more block kinds, weaker explosions	2020-07-05 16:15:48 +01:00
jshipsey	50fcd6c6a3	remove slowmo test mode	2020-07-05 10:00:44 -04:00
jshipsey	2c14b2f891	clippy fixes	2020-07-05 09:39:56 -04:00
jshipsey	62eb66173f	tweaks and fixes	2020-07-05 09:39:55 -04:00
Snowram	1b778ca191	Various small improvements to anims and models	2020-07-05 09:38:15 -04:00
Joshua Barretto	8508b5177b	Velocity-corrected bezier pathfinding control, swimming control	2020-07-05 09:38:15 -04:00
jshipsey	ca9ae13527	more latitude tilt, better attack anims, addressed aesthetic concerns, deleted dead assets	2020-07-05 09:38:15 -04:00
jshipsey	014cab0257	remove warnings, rebase fix	2020-07-05 09:38:14 -04:00
jshipsey	e97be07e97	minor changes to account for movement speeds	2020-07-05 09:38:14 -04:00
Joshua Barretto	177bd7a128	More tolerant pathfinding	2020-07-05 09:38:14 -04:00
Joshua Barretto	db26c10299	Run tilting, per-species running speed	2020-07-05 09:38:14 -04:00
jshipsey	e689de3c8a	better everything	2020-07-05 09:38:14 -04:00
Snowram	86b2272176	Salamander model fixes	2020-07-05 09:38:14 -04:00
jshipsey	9ef383ff03	simplify quadmed run, integrate dampener variable	2020-07-05 09:38:14 -04:00
Snowram	ce9cd29720	Add offset to quadmed legs + various fixes and improvements	2020-07-05 09:38:14 -04:00
jshipsey	f164bd2280	placeholder attack anim	2020-07-05 09:38:14 -04:00
jshipsey	894a823aad	orientation tilt, make run frequency proportional to species size	2020-07-05 09:38:14 -04:00
jshipsey	a7c23ea5be	custom scaling by species	2020-07-05 09:38:14 -04:00
jshipsey	94ab3665d5	pangolin and special pangolin variable	2020-07-05 09:38:14 -04:00
jshipsey	d8fff8833e	quadlow spawn in world, continued adjustments	2020-07-05 09:38:14 -04:00
jshipsey	c5f7a60f3b	more run animation work, adjusting pivots	2020-07-05 09:38:14 -04:00
jshipsey	03c1a97ba9	animation tweaks, fix some idle	2020-07-05 09:38:14 -04:00
jshipsey	db64972e42	starting on trot, removing some warnings	2020-07-05 09:38:14 -04:00
Snowram	648e140be3	Add wolf, frostfang and mouflon npcs	2020-07-05 09:38:14 -04:00
Snowram	4acdc24df9	Add tarasque and grolgar improvements	2020-07-05 09:38:14 -04:00
unknown	0de4b6b7f9	Makes anim hotload work for quadlow	2020-07-05 09:38:14 -04:00
Snowram	b1f4e4b9c1	Add new tusk ram model	2020-07-05 09:38:13 -04:00
Snowram	c22d543dd2	Add rock snapper mob	2020-07-05 09:38:13 -04:00
Snowram	1be42a8f85	Add tortoise mob	2020-07-05 09:38:13 -04:00
Snowram	016b05cf38	Add new grolgar model	2020-07-05 09:38:13 -04:00
Snowram	c7df12d2ea	Set new lion model offsets, fix some jaws	2020-07-05 09:38:13 -04:00
unknown	4b493b196c	Add asp mob	2020-07-05 09:38:13 -04:00
jshipsey	59777ee688	more quadmed run work	2020-07-05 09:38:13 -04:00
jshipsey	e362749fc7	more progress on on quad_med run	2020-07-05 09:38:13 -04:00
jshipsey	9f45d5525d	tarasque work	2020-07-05 09:38:12 -04:00
Snowram	1ffefde739	Run anim progress	2020-07-05 09:38:12 -04:00
Snowram	1f5e0216c4	Tiger offsets, lion new model	2020-07-05 09:38:12 -04:00
jshipsey	967343ced6	finished quadlow run, positioning work on quadmed	2020-07-05 09:38:12 -04:00
Snowram	390f516e13	Homogenizes quadmed bones names	2020-07-05 09:38:12 -04:00
Snowram	9fec5f3d14	Add tiger mob	2020-07-05 09:38:12 -04:00
jshipsey	76354aa3cf	small placement tweaks	2020-07-05 09:38:12 -04:00
jshipsey	6d9356d269	starting run anim	2020-07-05 09:38:12 -04:00
jshipsey	ccf939b4fd	manifests, skeleton, basic placement	2020-07-05 09:38:12 -04:00
Snowram	c527484597	Add alligator, salamander and monitor npcs	2020-07-05 09:38:12 -04:00
Snowram	00b3301d6a	Remove quad_low mobs from quad_medium	2020-07-05 09:38:12 -04:00
Snowram	fe1656931c	Add legs to quadruped_medium	2020-07-05 09:38:12 -04:00
Snowram	72eb03ceb5	Add quadruped_low skeleton	2020-07-05 09:38:11 -04:00
Marcel	2a7a8b05e6	Merge branch 'network-lockless' into 'master' Network lockless See merge request veloren/veloren!1153	2020-07-05 09:17:29 +00:00
Marcel Märtens	fe47b11345	instead of trying to connect for 80 minutes, just try 4 mins, added Changelog	2020-07-04 12:37:50 +02:00
Marcel Märtens	e7195b57ad	extend network with better Error codes for Network	2020-07-04 12:32:52 +02:00
Forest Anderson	954a4857c4	Added proper training dummy model	2020-07-03 16:53:04 -04:00
Marcel	1f05446ce6	Merge branch 'xMAC94x/network-switch' into 'master' xmac94x/network switch See merge request veloren/veloren!1139	2020-07-03 17:13:58 +00:00
Samuel Keiffer	85d1d4b3ff	Leap now actually works. In addition, leaping while next to an entity no longer interrupts the leap.	2020-07-03 15:40:12 +00:00
Marcel Märtens	15ff58cd6a	simple fmt in order to make the replacement commit as simple as possible	2020-07-03 13:11:44 +02:00
Marcel Märtens	4e92c0160e	network layer switch, doing the stuff that might confict. - mostly its the message handling put now in a async wrapper - add some fixes to pass without warnings and make clippy happy - some network error handling is ignored, this can be improved but is no blocker	2020-07-03 13:11:38 +02:00
Marcel Märtens	77c90b2c7c	doing a simple 1:1 swap out network coding this is the part which prob has less Merge conflics and is easy to rebase the next commit will have prob alot of merge conflics followed by a fmt commit	2020-07-03 13:11:31 +02:00
Monty Marz	95a799cf85	fix artifacts, cleanup	2020-07-03 12:17:55 +02:00
Monty Marz	89400264dc	Loot ChatType, Update german translation, map zooming	2020-07-01 19:05:44 +00:00
Marcel	f9a7dbaa77	Merge branch 'scott-c/daggers' into 'master' Scott-c/1h-wielding #185 See merge request veloren/veloren!1095	2020-07-01 12:07:35 +00:00
scott-c	d53b51954b	Added ability to use 2 x 1h weapons or shields	2020-07-01 17:51:06 +08:00
Marcel Märtens	e1b27c51f5	fix clippy issues in tests and add it to CI	2020-07-01 00:37:15 +02:00
Kevin Glasson	bb5d91edca	Use find folder to locate debug dir	2020-06-30 18:54:42 +08:00
Kevin Glasson	2a42949df1	Refactor hot reloading - Remove conditional compilation in regards to the copying of an `_active` file so that the behaviour is the same accross all platforms. - Simplify code slightly. - Add documentation.	2020-06-30 18:54:42 +08:00
unknown	7f02fa8132	Fixed glider animation so glider does not block view in first person.	2020-06-28 16:47:31 -04:00
Ben Wallis	dc1844b489	Moved sfx from common to voxygen	2020-06-28 18:16:22 +01:00
Forest Anderson	201f513737	Fixed meta chattype error on master	2020-06-28 17:10:01 +00:00
Forest Anderson	9246e34c1b	Merge branch 'CapsizeGlimmer/chat_modes' into 'master' Capsize glimmer/chat modes Closes #217 See merge request veloren/veloren!1043	2020-06-28 14:35:39 +00:00
Joshua Barretto	1d06df9d79	Merge branch 'xvar/loot-pickup-msgs' into 'master' Implemented loot pickup chat messages (#616) and the option for playing different sounds for picked up items See merge request veloren/veloren!1118	2020-06-28 12:34:58 +00:00
Ben Wallis	a9d3f984f0	Implemented loot pickup chat messages and the option for playing different sounds for picked up items * Added chat message when an item is picked up * Changed InventoryUpdateEvent::Collected to InventoryUpdateEvent::Collected(Item) to facilitate the client being aware of what was picked up * Added SfxInventoryEvent enum to allow different sounds to be used based on the item type. The RON mapping/de-serialization doesn't support matching on structs so we have to give it fixed enum values which are determined in TryFrom<&InventoryUpdateEvent> for SfxEvent * Refactored InventoryManip::Pickup arm of match in inventory_manip::handle_inventory for clarity/better warning messages * Fixed a bug that prevented the CollectFailed event from being raised when a player's inventory is full * Added a panic for the situation where an item is pushed into the players inventory and then the deletion of the entity fails as this would indicate an item dupe bug - this could potentially be reworked to pull the item back from the player's inventory but this seems like there's be a more correct transactional way to do this. * Added two temporary sounds to prove the per-item sound functionality (pickup sounds for Swords and Staffs)	2020-06-28 13:05:28 +01:00
Joshua Barretto	41b03208cb	Merge branch 'xvar/mouse-button-names' into 'master' Fixed long mouse button names overflowing hotbar slots (#637) See merge request veloren/veloren!1120	2020-06-28 11:11:29 +00:00
CapsizeGlimmer	883d9acf30	cargo fmt	2020-06-27 17:43:46 -04:00
CapsizeGlimmer	3d29c3254a	Add setting for displaying character names in chat. Placate cargo clippy.	2020-06-27 17:43:46 -04:00
CapsizeGlimmer	59db2fcd3b	Admin status added when registering; cargo fmt	2020-06-27 17:43:45 -04:00
CapsizeGlimmer	92127292d4	Added option to disable speech bubble icons. Aligned settings>gameplay menu again.	2020-06-27 17:40:03 -04:00
Monty Marz	a204072e78	fix	2020-06-27 17:40:03 -04:00
Monty Marz	3ed646b512	icon frame	2020-06-27 17:40:03 -04:00
Monty Marz	0969c236d6	fix dark bubble tail not being displayed correctly	2020-06-27 17:40:03 -04:00
CapsizeGlimmer	2d2aba3a5d	Chat bubble text shadows. Fix panic when re-joining a group or faction	2020-06-27 17:40:03 -04:00
CapsizeGlimmer	b04810cae5	misc chat mode changes	2020-06-27 17:40:03 -04:00
CapsizeGlimmer	5ad212b7ed	Add chat types for offline, online. Implement Pfau's fixes	2020-06-27 17:40:03 -04:00
Pfauenauge90	a497fb92d3	icons	2020-06-27 17:20:26 -04:00
Pfauenauge90	f83c58498f	bubble colors	2020-06-27 17:20:26 -04:00
CapsizeGlimmer	b7d7696d89	Implement MR!1043 changes suggested by Imbris	2020-06-27 17:20:26 -04:00
CapsizeGlimmer	34acc4ddf3	Players are removed from social menu when logged out.	2020-06-27 17:20:26 -04:00
CapsizeGlimmer	aabf9d7b21	fix chat-cli name formatting.	2020-06-27 17:20:26 -04:00
Delyth Williams	6644375764	Fix sprites w/o models	2020-06-27 21:08:21 +00:00
CapsizeGlimmer	2a0f0053d4	Added chat mode icons to speech bubbles	2020-06-27 17:03:30 -04:00
CapsizeGlimmer	35ed03aa18	Implement chat mode icons in chat window	2020-06-27 17:03:30 -04:00
CapsizeGlimmer	5cbecb29e6	Implement /join_group and /join_faction commands	2020-06-27 16:42:26 -04:00
CapsizeGlimmer	289ef5d6b2	Move message processing and chat bubbles to the client	2020-06-27 16:42:26 -04:00
CapsizeGlimmer	0b2a3ebe8b	Re-implement names in chat. It is done client-side now and /alias changes are retroactive.	2020-06-27 16:42:25 -04:00
CapsizeGlimmer	b08d717eac	Rework chat processing	2020-06-27 16:29:03 -04:00
CapsizeGlimmer	702a21302c	Base implementation of /group /faction /say /region	2020-06-27 16:26:02 -04:00
Ben Wallis	8434957d01	Fixed long mouse button names overflowing hotbar slots (#637 )	2020-06-27 20:48:10 +01:00
Delyth Williams	94164b7839	Welsh pixie/armour	2020-06-26 16:26:00 +00:00
Delyth Williams	9a79101f57	Welsh pixie/grassets	2020-06-25 21:12:31 +00:00
Joshua Barretto	b46e080ade	Added server-side maximum view distance setting	2020-06-25 18:46:04 +01:00
Imbris	6501611372	Merge branch 'shandley/character-loading' into 'master' Move character DB ops off the main thread See merge request veloren/veloren!1075	2020-06-25 16:16:15 +00:00
Songtronix	f44df23935	feat: add server whitelist	2020-06-24 17:36:19 +02:00
Monty Marz	fc48d0ddec	Merge branch 'pfau/alpha-disclaimer' into 'master' Pfau/alpha disclaimer See merge request veloren/veloren!1109	2020-06-24 13:44:39 +00:00
Monty Marz	32f6d42ed9	alpha disclaimer	2020-06-24 13:44:39 +00:00
Songtronix	750b9e198d	fix: hot-anim feature	2020-06-24 14:35:52 +02:00
Songtronix	d18b11d831	fix: do not store the password in the settings	2020-06-24 10:26:16 +02:00
Shane Handley	255ad97289	- Move the remaining character data loading to the message/thread formatharacter list actions - Handle/notify the client of errors during character load by returning to character select with the error, clean up client and server states - Add player_uuid check when loading character data.	2020-06-24 11:47:41 +10:00
Shane Handley	304e06cbce	Fix clippy warnings after toolchain update	2020-06-23 16:52:04 +10:00
Marcel Märtens	15fc5787e4	switch log behavior for env variable and removed gfx spam by default	2020-06-22 16:49:40 +02:00
Marcel Märtens	9485b45e70	switch to `tracing` stlye and enhance logs with usefull information - Updated CHANGELOG - reduce dependencies - found out that we have alot of duplicate coding... alot...	2020-06-22 09:53:15 +02:00
Kevin Glasson	589254e4ab	Convert all other veloren crates to use tracing - Completely removed both `log` and `pretty_env_logger` and replaced with `tracing` and `tracing_subscriber` where necessary. - Converted all `log::info!(...)` et al. statements to just use the shorthand macro i.e. `info!`. This was mostly to make renaming easier.	2020-06-21 23:19:41 +08:00
Kevin Glasson	af3af6c169	Convert voxygen to use tracing There are several noteable changes in this commit that mean that logging will behave differently to how it did previously. - There are now no separate filter levels for terminal and file output. This is a feature that is lacking in `tracing` but is set to be resolved by https://github.com/tokio-rs/tracing/pull/508. At which point we MAY include it. - The default log level was previously `WARN` - it is now `INFO`.	2020-06-21 23:17:25 +08:00
Imbris	78bb801216	Fix cargo test failing	2020-06-19 01:46:20 -04:00
jshipsey	838eadda4e	add hotloads to all anims	2020-06-19 00:48:19 -04:00
Imbris	124ed52554	Windows is weird, cargo is weird..... (also tidy up a few things)	2020-06-19 00:48:19 -04:00
Imbris	18e6b59966	Switch to using modify events with 300ms delay to prevent double reloading when notify produces multiple events at once	2020-06-19 00:48:19 -04:00
Imbris	01923d1580	Use debug, try to fix windows path	2020-06-19 00:48:19 -04:00
Imbris	d00e88b804	Hotreload animations using libloading	2020-06-19 00:48:19 -04:00
Kevin Glasson	19c2bf1181	Add hotbar state persistence. Persist the hotbar state to disk by writing it out to a `profile.ron` situated next to the existing `settings.ron`. There are individual profiles for every character on every server. On creation of a new character the default hotbar state will be `[None; 10]` i.e. the hotbar will be empty. Resolves: https://gitlab.com/veloren/veloren/-/issues/577	2020-06-19 08:00:21 +08:00
Ben Wallis	6da7a11d33	Fixed suppressed clippy warnings for #587 - clone_on_copy	2020-06-18 22:25:48 +01:00
Marcel	d2f8372447	Merge branch 'xvar/fix-window-moving-bug' into 'master' Voxygen: Fixed weird window movement caused by moving the window with the cursor grabbed (#588) See merge request veloren/veloren!1088	2020-06-17 17:47:33 +00:00
Ben Wallis	4a4a106232	Voxygen: Fixed weird window movement caused by moving the window with the cursor grabbed (#588 )	2020-06-17 12:40:11 +01:00
Justin Shipsey	2f896849d4	Wield glider instead of weapon when attempting glide wield, change behavior when running into walls to not drop out of gliding	2020-06-16 21:32:39 +00:00
Delyth Williams	b73da5507e	added new flora	2020-06-15 16:39:21 +00:00
Shane Handley	825cf98a00	Fixes a bug where run sfx were being played during a roll.	2020-06-15 06:53:50 +10:00
Imbris	4901dde20d	Merge branch 'shandley/docs-audio' into 'master' Add documentation for audio module. See merge request veloren/veloren!1060	2020-06-14 16:56:32 +00:00
S Handley	00dd75526c	Add documentation for audio module.	2020-06-14 16:56:32 +00:00
Imbris	26e53409d8	Merge branch 'xvar/clippy-globally-suppress-option_map_unit_fn' into 'master' Globally suppressed clippy lint option_map_unit_fn for #587 See merge request veloren/veloren!1071	2020-06-14 16:48:07 +00:00
Ben Wallis	c1c968f479	Globally suppressed clippy lint option_map_unit_fn for #587	2020-06-14 16:48:07 +00:00
Imbris	fb47115695	Merge branch 'xvar/clippy-fixes-redundant_closure_found' into 'master' Fixed suppressed clippy warnings for #587 - redundant_closure See merge request veloren/veloren!1065	2020-06-14 16:33:04 +00:00
Imbris	aff43e6bea	Stop rendering 0 size images	2020-06-14 12:06:47 -04:00
Songtronix	779769f64e	hotfix: panic trying to create a character	2020-06-14 12:40:08 +02:00
Justin Shipsey	688f917308	asset missing fix	2020-06-14 09:22:21 +00:00
Songtronix	69710cde5c	Merge branch 'jtai/log-chat-messages' into 'master' log-chat-messages See merge request veloren/veloren!1076	2020-06-14 08:41:41 +00:00
Monty Marz	716f936f6c	fix broken main menu	2020-06-14 02:11:31 +02:00
jshipsey	cd8f2c801e	log-chat-messages	2020-06-13 15:21:58 -04:00
Ben Wallis	4d6c553b1b	Fixed suppressed clippy warnings for #587 - redundant_closure	2020-06-12 20:47:22 +01:00
Ben Wallis	8ed2109bcf	Fixed suppressed clippy warnings for #587 - collapsible_if	2020-06-12 20:34:54 +01:00
Forest Anderson	7459a1e95a	Merge branch 'xvar/clippy-fixes-many_single_char_names' into 'master' Fixed suppressed clippy warnings for #587 - many_single_char_names See merge request veloren/veloren!1066	2020-06-12 08:02:53 +00:00
Ben Wallis	967fd9280b	Fixed suppressed clippy warnings for #587 - many_single_char_names	2020-06-11 20:07:46 +01:00
Marcel Märtens	0e59ee901e	dependency reduction: - authc no longer uses reqwest - image only supports PNG - replace routille with tiny_http - several other dependencies - cargo upgrade - following improvement was measured on R7 1700X: before: - cargo build: 3076.73s user / 4:45 total / 589 dependencies - cargo test: 6118.38s user / 7:30 total / 959 dependencies after: - cargo build: 2680.54s user / 4:05 total / 480 dependencies - cargo test: 5351.81s user / 7:04 total / 791 dependencies - added xMAC94x to CODEOWNERS for Cargo.toml, he will protect them from now on and hit people with evil looks ;)	2020-06-11 20:55:34 +02:00
S Handley	eda2f14940	Use empty sound data when a sound file cannot be loaded	2020-06-11 12:53:24 +00:00
Ben Wallis	950c62efc6	Suppressed all existing clippy warnings in preparation for fixes as part of #587	2020-06-10 22:01:42 +01:00
Shane Handley	6a1cec8860	Docs, make adding event mappers easier for sfx, remove placeholder sounds.	2020-06-09 00:41:46 +10:00
Shane Handley	faf04bb4f3	Fix some updated weapon references and an incomplete match after rebasing.	2020-06-08 10:19:42 +10:00
Shane Handley	987a025d36	Introduce a ToolCategory so we can ignore the specific type of weapon when deciding on the SFX to play when wielding/attacking.	2020-06-08 10:19:42 +10:00
Shane Handley	802bce1698	Target the specific attack types, to handle TripeStrike etc... Removed the Axe sfx until the animations show the swing	2020-06-08 10:19:41 +10:00
Shane Handley	d5cc5c8537	Add initial attack sfx code with bow shot sounds.	2020-06-08 10:19:41 +10:00
Ben Wallis	1d564f53c7	Fix #322 - Refactored audio output device enumeration to fail gracefully when audio devices with null or otherwise unusable names are encountered	2020-06-07 16:24:22 +01:00
Imbris	a981d72d28	Merge branch 'imbris/fix-multibyte-whitspace-panic' into 'master' Fix panic with multibyte whitespace characters Closes #583 See merge request veloren/veloren!1045	2020-06-06 20:17:11 +00:00
Imbris	efe071d998	Fix panic with multibyte whitespace characters	2020-06-06 15:58:16 -04:00
Joey Maher	458ac4af5e	Adds simple auto walk functionality. Toggleable or push to hold	2020-06-06 13:09:01 -05:00
Joey Maher	25e74ee6e2	Toggle_lantern after dropping a Lantern slot item	2020-06-06 07:37:43 -05:00
Joey Maher	76f7f4fd98	Renaming and adding comments	2020-06-05 16:33:39 -05:00
Joey Maher	09541af551	Moving to a single crossbeam channel as a detail of Window, using strings instead of ClientEvent, and formatting	2020-06-05 15:53:15 -05:00
Joey Maher	8d90952074	Add channel to send messages up from methods like fetch_events to hud	2020-06-05 14:27:22 -05:00
S Handley	e0633a238e	Update CHANGELOG and a TODO, fix safer deserialisation for inventory data.	2020-06-04 11:44:33 +00:00
jshipsey	b0b0fca64a	fix shoulders in charselect	2020-06-04 02:14:03 -04:00
Monty Marz	6c0587393e	update german translation	2020-06-03 19:32:54 +00:00
Monty Marz	b34da9b07b	More item drops	2020-06-03 17:59:09 +00:00
Joshua Barretto	475f62b57f	Merge branch 'zesterer/small-fixes' into 'master' Better physics comments, removed camera snapping See merge request veloren/veloren!1034	2020-06-01 20:50:24 +00:00
Joshua Barretto	9a069c93dc	Better physics comments, removed camera snapping	2020-06-01 21:33:20 +01:00
scott-c	136bf271b8	Fix social list having incorrect player count	2020-06-01 22:04:44 +08:00
scott-c	c23183b1ca	Add character name and level to social window	2020-06-01 22:04:44 +08:00
scott-c	66f6368e83	Handle out of bounds panic	2020-06-01 21:56:46 +08:00
scott-c	288c7cdbfa	fix #562 Confusing chat alias	2020-06-01 21:36:39 +08:00
Justin Shipsey	3877efec50	optimization and tails	2020-06-01 00:33:24 +00:00
Monty Marz	f7d6f76a04	Added 36 Swords I added 36 sword models to the code.	2020-05-29 18:23:00 +00:00
CapsizeGlimmer	d5216cc8f3	Redraw dark mode bubbles. Add padding to light mode bubbles.	2020-05-27 13:49:19 +02:00
CapsizeGlimmer	3cea76b82f	NPCs now call for help when you hit them. Redraw speech bubble dark mode.	2020-05-27 13:49:18 +02:00
CapsizeGlimmer	3c07d02218	Add a dark mode to speech bubbles; consistantly use 'speech bubble' instead of 'chat bubble'	2020-05-27 13:49:17 +02:00
CapsizeGlimmer	c65967ccdb	Chatting now creates speech bubbles	2020-05-27 13:49:14 +02:00
CapsizeGlimmer	73a29b339c	Added chat bubbles. Refactored bubble+name+hp+energy into new overhead widget	2020-05-27 13:49:13 +02:00
Justin Shipsey	ea07d744a7	orientation animation	2020-05-27 06:41:55 +00:00
Treeco	ec2ed4da2c	Change a bunch of settings defaults, fix sprite looting key	2020-05-25 15:44:27 +01:00
Monty Marz	9d7e0aad12	Aeronic/forest tune	2020-05-21 04:09:59 +00:00
Joshua Barretto	f09af7980f	Fixed aiming for non-humanoids	2020-05-19 14:47:51 +01:00
Joshua Barretto	5c3a08e450	Updated changelog and fmt	2020-05-19 14:41:08 +01:00
Joshua Barretto	05e6df1b65	Added overhead aiming camera	2020-05-19 14:26:53 +01:00
Joshua Barretto	2f47d09af4	Comment fixes and fmt	2020-05-19 00:35:58 +01:00
Joshua Barretto	f1b166d15d	Innumerable camera improvements	2020-05-18 23:40:28 +01:00
Justin Shipsey	bb85dab281	Merge branch 'treeco/build-mode-fixes' into 'master' Swapped block placement and destruction buttons See merge request veloren/veloren!995	2020-05-16 23:48:25 +00:00
Monty Marz	ecb7963730	Pfau/0.6 bg	2020-05-16 12:48:29 +00:00
Marcel Märtens	ec03c4518a	Change the version number to 0.6	2020-05-16 00:50:40 +02:00
Treeco	a338ed3f24	Swapped block placement and destruction buttons Also capped placement range to match destruction range	2020-05-15 17:39:44 +01:00
Mckol	cbfe3d52fc	Merge branch 'Mckol/552-fix-persistence-crash' into 'master' Fix #552 Closes #552 See merge request veloren/veloren!984	2020-05-15 00:45:41 +00:00
Mckol	48c5d37a5d	Make singleplayer use voxygen's config path for persistence path.	2020-05-15 01:54:13 +02:00
Imbris	649075c89a	Merge branch 'imbris/small-fix' into 'master' Show main menu even if there are no stats See merge request veloren/veloren!990	2020-05-14 23:47:34 +00:00
Imbris	eac11ecfe8	Show main menu even if there are no stats	2020-05-14 19:10:27 -04:00
CapsizeGlimmer	0a723614f9	Popup message when setting waypoint	2020-05-14 16:56:10 +00:00
Shane Handley	e852e0cfab	- Update the stats of characters individually, reverting the change with big combined updates. - Add a timer to the stats persistence system and change the frequency that it runs to 10s - Seperate the loading of character data for the character list during selection, and the full data we will grab during state creation. Ideally additional persisted bits can get returned at the same point and added to the ecs within the same block.	2020-05-13 09:14:09 +10:00
Shane Handley	7c6c9f4302	Stats persistence - Update client code to use persisted stats - Add a system for stats persistence - Add a basic scheduler to control duration between execution of persistence systems	2020-05-13 09:14:08 +10:00
Shane Handley	e5853dbdd4	Initial models, migration and client code for stats persistence.	2020-05-13 09:14:08 +10:00
jshipsey	ceb771bb2c	keep mobs from exploding whenever they're hit	2020-05-11 21:44:21 -04:00
jshipsey	ef70949d5d	cyclops	2020-05-11 21:44:21 -04:00
jshipsey	137c700b80	fix swim bug	2020-05-11 21:44:21 -04:00
Forest Anderson	28402e2bc1	Merge branch 'CapsizeGlimmer/tab_completion' into 'master' Capsize glimmer/tab completion See merge request veloren/veloren!972	2020-05-11 17:49:26 +00:00
Imbris	3450bfabfd	Add orientation to debug text	2020-05-11 00:10:03 -04:00
Imbris	8aa88b22a5	Fix panic with dragging into the same loadout slot	2020-05-11 00:08:43 -04:00
CapsizeGlimmer	9d118b55a0	Fixed player list tab completion	2020-05-10 19:17:17 -04:00
CapsizeGlimmer	b486de28ac	Implement tab completion of enums (/object /time /spawn) and numbers	2020-05-10 19:16:34 -04:00
CapsizeGlimmer	28e94afd3f	Finish tab completion implementation	2020-05-10 19:16:15 -04:00
CapsizeGlimmer	24fa23fef4	Initial client implementation of tab completion	2020-05-10 19:16:01 -04:00
CapsizeGlimmer	58b0e9ef75	Move cursor to end when moving through chat history	2020-05-09 21:51:02 -04:00
jshipsey	5b48fe5661	delete unused jump file	2020-05-09 19:59:34 -04:00
Snowram	4ba222abcd	Fix dragon jaw Z fighting	2020-05-10 01:40:53 +02:00
jshipsey	41ff0bde69	rebase	2020-05-09 18:56:08 -04:00
jshipsey	cf392b5a66	fmt	2020-05-09 18:11:25 -04:00
jshipsey	62bd79dba7	dragon and general animation cleanup	2020-05-09 18:10:24 -04:00
Snowram	5b77c74497	Add cockatrice	2020-05-09 18:09:27 -04:00
Snowram	0248c6a44e	Cleanup	2020-05-09 18:09:27 -04:00
jshipsey	a6de8159f6	dragon adjustments. tweaks to humanoid run, fix for first person glide and other small fixes	2020-05-09 18:09:06 -04:00
Snowram	9d2277ecd4	Better animations	2020-05-09 18:09:06 -04:00
jshipsey	5b518b137c	skeletal tweaks	2020-05-09 18:09:06 -04:00
Snowram	cd452cc715	New dragon model, added jaw, splitted head into upper/lower	2020-05-09 18:09:05 -04:00
Snowram	875838ecdf	Initial fly animation work	2020-05-09 18:08:35 -04:00
Snowram	9027967fb7	Initial run animation work	2020-05-09 18:08:35 -04:00
Snowram	7f0d1e9543	Initial idle animation work	2020-05-09 18:08:35 -04:00
Snowram	33f8a47cfa	Symmetry of dragon skeleton	2020-05-09 18:08:35 -04:00
Robin Gilh	edcde84505	Dragon work 2	2020-05-09 18:07:31 -04:00
Robin Gilh	40360ff149	Dragon work	2020-05-09 18:07:31 -04:00
S Handley	5a13b54cbf	- Load characters after login. - Make the character screen load with an empty character list from the server, send event to the server for character creation with data, but not yet saving them to the DB. - Working but messy character saving to DB - Add the character_data to the client, rather than keep it in the GLobalState.	2020-05-09 15:41:25 +00:00
CapsizeGlimmer	28c454f9ca	Fix infinitys and NaNs in lights	2020-05-04 17:17:54 -04:00
CapsizeGlimmer	701f38ab69	Enter the world by pressing "enter" at character selection	2020-05-04 19:08:51 +02:00
CapsizeGlimmer	4e7f8c686a	Equipped lanterns now provide an illumination effect.	2020-05-04 15:15:31 +00:00
Monty Marz	f5c2341167	Shoulder offsets, meta.ron versioning	2020-05-01 21:27:12 +00:00
Monty Marz	c792cc05a9	Villagers and Cultists	2020-04-30 20:43:24 +00:00
Joshua Barretto	1e91f7a0ab	Added 1 extra bit per figure vertex position component, resolved char screen bug	2020-04-29 15:22:08 +01:00
Marcel Märtens	83af40a460	Allow for 0.5 offsets in figures	2020-04-29 14:10:46 +02:00
Justin Shipsey	171e865f57	new animals	2020-04-28 03:13:23 +00:00
Justin Shipsey	b4af588a00	skel attribute transfer	2020-04-27 05:11:34 +00:00
Joshua Barretto	390e46b752	Fixed unit tests	2020-04-26 18:50:21 +01:00
Monty Marz	6d7cb8654d	Merge branch 'pfau/ui-fixes' into 'master' UI Fixes See merge request veloren/veloren!946	2020-04-26 01:44:56 +00:00
Monty Marz	4521791591	UI Fixes	2020-04-26 01:44:56 +00:00
Justin Shipsey	6fa13bcb7e	body/anim tweaks	2020-04-26 01:09:03 +00:00
Joshua Barretto	90de779559	Better LoD variable names	2020-04-25 21:44:23 +01:00
Joshua Barretto	93105105e0	Added extra LoD level to terrain sprites	2020-04-25 21:44:23 +01:00
Joshua Barretto	8e95444d85	Made GPU bone updates more conservative for moar fps	2020-04-25 21:44:23 +01:00
Joshua Barretto	7208b37dc5	Squashed figure vertices for better performance	2020-04-25 21:44:23 +01:00
Joshua Barretto	37301706d4	Reduced size of terrain sprite vertices	2020-04-25 21:44:23 +01:00
Joshua Barretto	c05f4fe009	Added configurable sprite view distance, minor bug fixes	2020-04-25 21:44:23 +01:00
Joshua Barretto	8bf5709ddf	Implemented Treeco's z-only LoD suggestion	2020-04-25 21:44:23 +01:00
Joshua Barretto	1feae79243	Added reseeding for sites	2020-04-25 21:44:23 +01:00
Pfauenauge90	3421b3d8da	sprites VD slider visuals	2020-04-25 21:44:23 +01:00
Joshua Barretto	ebd1537769	Fixed figure update rate at a distance	2020-04-25 21:44:23 +01:00
Joshua Barretto	39b88dbcb1	Added LoD for figures and reduced update rates for far figures	2020-04-25 21:44:23 +01:00
Joshua Barretto	3e62f7edc3	Better LoD distance scaling	2020-04-25 21:44:23 +01:00
Joshua Barretto	e498d78b6c	Fixed boundary meshing issue for scaled terrain sprites	2020-04-25 21:44:23 +01:00
Joshua Barretto	b2c8dc0806	Added terrain sprite LoD	2020-04-25 21:44:23 +01:00
Treeco	dd08def18f	Add camera smoothing setting	2020-04-23 22:59:34 +00:00
Joshua Barretto	0a892e488a	Updated examples	2020-04-23 18:20:34 +01:00
Joshua Barretto	1a4c7f46f4	Fixed second render chunk counting issue	2020-04-23 18:19:42 +01:00
Joshua Barretto	2a6a19f7ef	fmt	2020-04-23 18:19:42 +01:00
Joshua Barretto	0c491bb558	Fixed incorrect chunk render counter	2020-04-23 18:19:42 +01:00
Joshua Barretto	01e2cd2b88	Warning cleanup	2020-04-23 18:19:42 +01:00
Joshua Barretto	444f2ecb45	Made /waypoint admin-only, MR cleanup	2020-04-23 18:19:41 +01:00
Joshua Barretto	1983fd8ec1	Cleanup, fixed clouds, removed 45-degree terrain sprites	2020-04-23 18:19:41 +01:00
Joshua Barretto	60bf396e4f	Added doors to houses	2020-04-23 18:19:41 +01:00
Monty Marz	44c5002db3	Pfau/crops	2020-04-23 18:19:41 +01:00
Joshua Barretto	431e199731	Added correctly generating world paths, sub-voxel shader noise	2020-04-23 18:19:41 +01:00
Joshua Barretto	431b2ae07b	Fixed window mask layering, fmt	2020-04-23 18:19:41 +01:00
Joshua Barretto	58874803a3	Disabled chunk mesh sorting for now	2020-04-23 18:19:41 +01:00
Joshua Barretto	77d0292e91	Added windows to buildings and scarecrows	2020-04-23 18:19:41 +01:00
Joshua Barretto	a9adebcab3	Improved rendering performance with smarter meshing order	2020-04-23 18:19:41 +01:00
Pfauenauge90	db5311189d	scarecrow	2020-04-23 18:19:41 +01:00
jshipsey	729912d33b	corrected villager empty weapon issue	2020-04-23 18:19:41 +01:00
jshipsey	a89b28e117	adjusted run animation to allow villager walking	2020-04-23 18:19:41 +01:00
Pfauenauge90	98704a4753	turnip and window blocks	2020-04-23 18:19:41 +01:00
Joshua Barretto	6448c17110	Fixed sprite AO, overhauled entity spawning, better enemy spawning in dungeons, made agents more skilled at combat	2020-04-23 18:19:41 +01:00
Monty Marz	0fb3a115da	Add more crops	2020-04-23 18:19:41 +01:00
Joshua Barretto	e3ebdc56b3	Fixed figure AO (still need to do sprite AO), added more control over NPC spawning, loot in dungeons	2020-04-23 18:19:41 +01:00
Joshua Barretto	866fd1992e	Fixed bad AO quad flipping in dark places, bosses spawning in dungeon walls, large creatues being uncompromisingly pedantic when trying to path towards targets	2020-04-23 18:19:41 +01:00
Joshua Barretto	fd14223c33	Basic boss spawning in dungeons, better AO	2020-04-23 18:19:41 +01:00
Joshua Barretto	c4879e991d	Enabled AO in darkness, better light attenuation	2020-04-23 18:19:41 +01:00
Joshua Barretto	568a8ab87c	Increased block rendering altitude range	2020-04-23 18:19:41 +01:00
Joshua Barretto	48e67ba9c0	Fixed terrain sprite AO	2020-04-23 18:19:41 +01:00
Joshua Barretto	f999edffaa	Fixed crop crash issues	2020-04-23 18:19:41 +01:00
Pfauenauge90	d57ca371e2	fix panic	2020-04-23 18:19:41 +01:00
Pfauenauge90	4b72a07e22	sprites	2020-04-23 18:19:41 +01:00
Pfauenauge90	fd3ffdf28b	pizza sprite	2020-04-23 18:19:40 +01:00
Pfauenauge	67f27ef970	ember sprite	2020-04-23 18:19:40 +01:00
Joshua Barretto	8c73ec982c	Resolved rebase problems	2020-04-23 18:19:40 +01:00
Joshua Barretto	b3c9122395	Overhauled domestic economy simulation, better debug information	2020-04-23 18:19:40 +01:00
Joshua Barretto	a0dae82a2b	Added correctly allocated labours, fishing	2020-04-23 18:19:40 +01:00
Joshua Barretto	df5aa93fd7	Better AO, fixed cloud pixelation	2020-04-23 18:19:40 +01:00
Joshua Barretto	3d4a294b83	Smoothed camera motion, gentler orientation lerping	2020-04-23 18:19:40 +01:00
Joshua Barretto	5f2d0021a3	Reversed water draw order	2020-04-23 18:19:40 +01:00
Joshua Barretto	0021bd6452	Added new settlement generation to world, basic rendering	2020-04-23 18:19:40 +01:00
Joshua Barretto	944a37b848	Initial settlement generation work	2020-04-23 18:19:40 +01:00
Songtronix	26e27f4198	fix toolchain	2020-04-21 20:04:55 +00:00
Imbris	b3c54a9bbb	Merge branch 'olexorus/fix_serverlist_panic' into 'master' Fix panic if default server index is out of bounds See merge request veloren/veloren!909	2020-04-14 17:06:51 +00:00
Olexorus	027d0f11da	Fix panic if default server index is out of bounds	2020-04-14 18:32:01 +02:00
Pfauenauge	25a9d5bf2f	resolved comments	2020-04-12 21:45:19 +02:00
Imbris	b98680b9cb	fix example	2020-04-12 13:42:09 -04:00
Pfauenauge90	cee1c2f85b	cleanup, slot background, scaling	2020-04-12 18:41:10 +02:00
Imbris	b9a66a93b7	Add backgound to hotbar slots	2020-04-12 18:41:09 +02:00
Imbris	c6b5570637	Move item amount text to bottom right	2020-04-12 18:41:09 +02:00
Imbris	cae5313127	tooltips for the skillbar	2020-04-12 18:41:08 +02:00
jshipsey	d7e605e658	lantern visuals, random cape flutter	2020-04-12 18:41:08 +02:00
Imbris	2c4c006396	Lantern tweaks, remove unused bones	2020-04-12 18:41:07 +02:00
Imbris	f81f91162d	Basic hotbar functionality	2020-04-12 18:41:07 +02:00
Imbris	77d13376d3	Add right click to use, latern is not armor tweaks	2020-04-12 18:41:07 +02:00
Imbris	f52d66d721	Fix selecting and remove amount text when dragging	2020-04-12 18:41:06 +02:00
Imbris	c1c09dce1b	Enable unequipping as well as equipping to specific slots	2020-04-12 18:41:06 +02:00
Imbris	66b4c0d529	rework slot trait	2020-04-12 18:41:05 +02:00
jshipsey	e2d60b858e	cape work	2020-04-12 18:41:05 +02:00
Pfauenauge90	88a938653b	translation fix	2020-04-12 18:41:04 +02:00
Pfauenauge90	0a52dc61d6	hotbar text shadows	2020-04-12 18:41:04 +02:00
Pfauenauge90	f24ba71d94	hotbar keybindings	2020-04-12 18:41:03 +02:00
Pfauenauge90	a29f199e80	fmt	2020-04-12 18:41:02 +02:00
Pfauenauge90	2263b9be95	starter chest, removed unused key commands	2020-04-12 18:41:02 +02:00
Pfauenauge90	d62dfffd69	starter armor in char creation	2020-04-12 18:41:01 +02:00
Pfauenauge90	0fb5b73606	fix	2020-04-12 18:41:00 +02:00
Pfauenauge90	85f9f80024	starter equip	2020-04-12 18:41:00 +02:00
Pfauenauge	6dcdd80ec8	smarter code	2020-04-12 18:40:59 +02:00
Pfauenauge	c6eda08679	fmt	2020-04-12 18:40:59 +02:00
Pfauenauge	d5128b751d	png item images, fix map cursor	2020-04-12 18:40:59 +02:00
Pfauenauge90	ca667fd02b	tooltips	2020-04-12 18:40:58 +02:00
jshipsey	ea2c646df3	initial cape implementation	2020-04-12 18:40:57 +02:00
Pfauenauge90	fa03f9ddb9	slot kinds	2020-04-12 18:40:56 +02:00
Pfauenauge90	f5a768dccf	more armour types	2020-04-12 18:40:56 +02:00
Pfauenauge90	7f97fbac0b	cape item	2020-04-12 18:40:56 +02:00
Pfauenauge90	771baaaae5	cape item	2020-04-12 18:40:55 +02:00
Imbris	1f31b7f123	Drag things!	2020-04-12 18:40:55 +02:00
Imbris	6c336c015e	Make remove skin in armor item images	2020-04-12 18:40:54 +02:00
Imbris	77948d27ca	Scale content image based on slot size, fix weapon images not showing, stop selection of empty slots	2020-04-12 18:40:54 +02:00
Imbris	4c5f668203	Don't show icon when slot is filled and have a separate image for filled slot backgrounds	2020-04-12 18:40:54 +02:00
Pfauenauge	cac2321464	armor slot visuals	2020-04-12 18:40:53 +02:00
Imbris	0b932ae99a	Use new slot widget for armor slots	2020-04-12 18:40:53 +02:00
Imbris	968c064874	Restore slot interaction functionality	2020-04-12 18:40:52 +02:00
Imbris	9c76bdde0e	Setup basic generic slot system and used it for the inventory slots	2020-04-12 18:40:52 +02:00
Olexorus	4bd7e5ab67	Allow passwords with up to 35 characters	2020-04-12 13:52:39 +02:00
Carbonhell	c0c92c4259	Fixes mouse_input event not being pushed everytime	2020-04-09 18:43:12 +02:00
Carbonhell	20ec77eeb0	Fixes mouseinput event ignoring cursor_grabbed being true	2020-04-08 23:46:42 +02:00
Capucho	b6078d832a	Fixed the player being rendered after dying	2020-04-08 21:28:33 +01:00
Carbonhell	198c875559	Carbonhell/keybindings	2020-04-08 17:36:37 +00:00
Capucho	8f6686adc1	Fix the problems of players walking over water with dithering	2020-04-07 22:50:01 +00:00
Monty Marz	32db0df208	Merge branch 'pfau/small_ui_fixes' into 'master' Small UI fixes See merge request veloren/veloren!888	2020-04-04 21:51:06 +00:00
Monty Marz	07242644ca	Small UI fixes	2020-04-04 21:51:06 +00:00
Imbris	e2c818b556	Merge branch 'imbris/fix' into 'master' Remove newline from password when pressing enter See merge request veloren/veloren!887	2020-04-04 21:45:30 +00:00
Capucho	a21ae27a77	Add player transparency and silhouette	2020-04-04 19:36:55 +00:00
Imbris	d36c2cac99	Trim newlines from password when pressing enter	2020-04-04 13:55:25 -04:00
Songtronix	4fdf6896ab	Merge branch 'shandley/fix-sfx' into 'master' Fix run SFX See merge request veloren/veloren!880	2020-04-02 07:05:33 +00:00
Shane Handley	3e4b40380f	fix: Restore run SFX when the character is using a weapon other than the sword.	2020-04-02 14:47:26 +11:00
Imbris	831d7c77a6	Make Asset impls avoid panics when parsing fails	2020-04-01 20:06:15 -04:00
Imbris	97148cb6bb	Merge branch 'master' into 'combat' # Conflicts: # CHANGELOG.md	2020-04-01 20:42:27 +00:00
Imbris	87a82bb59a	Fix tests	2020-04-01 11:41:26 -04:00
Marli Frost	3806f08eb0	feat: configure audio output using an enum	2020-03-31 22:29:30 +01:00
Marli Frost	a83f09bd60	fix: avoid rodio API when audio is disabled	2020-03-31 21:28:09 +01:00
Marli Frost	c82d1b9316	allow the game to start without an audio device	2020-03-31 21:27:55 +01:00
Imbris	508def2701	Merge branch 'capucho/resume-do-not-eject-cursor' into 'master' Don't eject mouse on resume Closes #307 See merge request veloren/veloren!873	2020-03-31 16:50:45 +00:00
Imbris	7b6c6111f0	Merge branch 'capucho/password_cursor_fix' into 'master' Fix the cursor lagging behind on the password field See merge request veloren/veloren!859	2020-03-31 16:39:56 +00:00
Imbris	b3791a2b4e	Upgrade vek version so that it actually uses the patch	2020-03-30 19:44:51 -04:00
Capucho	3f1f9b9ab0	Make so that the resume button doesn't eject the mouse	2020-03-30 22:00:46 +01:00
Capucho	abc1a041fa	Added a portuguese translation	2020-03-30 22:57:26 +02:00
AdamWhitehurst	d3b99fc026	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-29 13:40:08 -07:00
AdamWhitehurst	dcc9d44b1c	remove unused timed_combo	2020-03-29 13:40:03 -07:00
jshipsey	ff56e5f9f9	fireball damage tweaks/staff shooting anim	2020-03-29 14:00:05 -04:00
jshipsey	fa54c90558	cleanup, tweak to triplestrike stage 1	2020-03-29 03:53:52 -04:00
Pfauenauge90	e3a5051b52	small fix	2020-03-28 18:06:00 +01:00
Imbris	d3b5b1e637	Remove None variant fromm armor types	2020-03-28 03:51:24 -04:00
Imbris	f551c4a2c5	Move armor types to a new location, use a const for the moving cutoff in voxygen anims	2020-03-28 01:52:12 -04:00
jshipsey	8fd774f21a	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-27 23:59:45 -04:00
jshipsey	49ba196671	proper bow animation	2020-03-27 23:59:05 -04:00
Imbris	ba3fa16c33	Create Dir type for better enforcement of non NaN, normalized representations of directions	2020-03-27 22:02:07 -04:00
Capucho	15d2a6d3dc	Fix the wrong default keybind change	2020-03-27 19:36:20 +00:00
Capucho	15ecdfb9b4	Added an option for hold and added everything to the settings	2020-03-27 18:35:52 +00:00
AdamWhitehurst	d774091fa4	Add triple_strike anims for axe and hammer	2020-03-27 11:00:58 -07:00
Pfauenauge90	0b3fb2dd3c	fire bolt visuals	2020-03-27 18:31:45 +01:00
timokoesters	6fe5c5724c	Fix char selection not showing tools	2020-03-27 18:17:41 +01:00
Pfauenauge90	c3a4f897da	update help screen	2020-03-27 17:50:34 +01:00
Pfauenauge90	11be9c10b2	remapped default look key, removed unused keys	2020-03-27 16:09:51 +01:00
jshipsey	0ffff86e25	third attack for triple strike	2020-03-27 01:57:30 -04:00
jshipsey	1c3d1d260c	small animation tweaks	2020-03-26 23:51:55 -04:00
Pfauenauge90	50b7206577	asset cleanup, map visuals	2020-03-27 04:06:27 +01:00
Shane Handley	362771be4b	SFX and unit test fixes.	2020-03-27 12:06:25 +11:00
timokoesters	fe2aa7da7b	Merge remote-tracking branch 'origin/master' into combat	2020-03-26 23:43:33 +01:00
jshipsey	7692f1d354	fixed wield feet while jumping, tweaked charge anim	2020-03-26 18:26:23 -04:00
Capucho	03396eb77e	Implement #505	2020-03-26 21:22:21 +00:00
jshipsey	175fea98ef	more cleanup, WIP fake swimming	2020-03-26 01:35:25 -04:00
Pfauenauge90	5f10cdf0c6	adjusted foot step sounds, inventory space above bag	2020-03-25 21:06:01 +01:00
Pfauenauge90	8b05dda1d9	assset cleanup, transparency, new icons	2020-03-25 16:47:48 +01:00
Imbris	3889ec7292	climbing tweaks, fix triple strike overflow, fix Last<CharacterState> not registered	2020-03-25 02:05:28 -04:00
Imbris	6ba158b7e1	Input handling changes	2020-03-25 01:38:37 -04:00
Adam Whitehurst	37ec191021	update controller tick fn	2020-03-25 01:38:25 -04:00
jshipsey	c7d9b5ae0f	fixed critter animation	2020-03-25 01:29:55 -04:00
jshipsey	047f6b8a01	fixed swimming, better charge	2020-03-25 01:22:07 -04:00
jshipsey	a6537ed69b	starting foot movement with attacks, clearing some dead code	2020-03-25 00:15:06 -04:00
Pfauenauge90	550dd144bc	new icon art	2020-03-25 01:41:43 +01:00
Capucho	7851a407b1	Fix the cursor lagging behind on password field	2020-03-24 21:41:59 +00:00
timokoesters	58585e0810	Better climbing, fireball impl	2020-03-24 20:09:23 +01:00
timokoesters	99e7e1f785	Split staff into 3 abilities	2020-03-24 14:00:22 +01:00
jshipsey	7a4f0fa9ac	climb fix, const tweak update, trying equip anims	2020-03-24 00:24:31 -04:00
Pfauenauge90	7f30ec3d55	colors for inventory space counter	2020-03-24 01:31:14 +01:00
timokoesters	43d4e8aad2	Better inventory counter	2020-03-24 00:38:00 +01:00
timokoesters	1c145e8d3a	Add inventory counter	2020-03-24 00:23:21 +01:00
timokoesters	c01cd62f5f	Move meta.dat to ron, so we don't create memory allocation errors	2020-03-23 14:18:05 +01:00
timokoesters	fb16106960	Merge remote-tracking branch 'origin/master' into combat	2020-03-23 11:30:47 +01:00
jshipsey	eddf3ec658	raised run anim speed 20%	2020-03-22 21:32:34 -04:00
Capucho	0358caa173	Fix the wrong logs directory being displayed on panic	2020-03-22 22:06:05 +00:00
jshipsey	9cbbe0311f	rewrote the whole stupid skeleton to work much smarter	2020-03-22 16:06:53 -04:00
jshipsey	3baa0471ec	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-22 11:55:35 -04:00
jshipsey	0773524031	wield idle, wield run	2020-03-22 11:55:28 -04:00
Pfauenauge90	662f5b1037	removed warnings and item test values	2020-03-22 14:55:08 +01:00
Adam Whitehurst	db8d89a4d9	* rename CharacterState equals() -> same_variant()	2020-03-22 05:46:09 -07:00
Imbris	41c424ac13	Optimized uses of emitters, cleanup	2020-03-22 00:49:46 -04:00
jshipsey	eafd761d5a	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-22 00:14:11 -04:00
jshipsey	32c85d1bab	axe attack	2020-03-22 00:11:24 -04:00
Imbris	f399085974	Flip models for hands, shoulders, and feet of humanoids	2020-03-21 18:48:21 -04:00
Adam Whitehurst	c5378b7065	Better triple_strike handling	2020-03-21 14:55:04 -07:00
Adam Whitehurst	819c2767bc	* move swap loadout to handle_swap_loadout util fn * impl From<JoinData> for StateUpdate	2020-03-21 14:16:26 -07:00
jshipsey	a861f6ad26	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-21 15:47:28 -04:00
jshipsey	14f560f21b	proper hammer smash, small tweaks	2020-03-21 15:47:16 -04:00
jshipsey	221f675217	spin attack	2020-03-21 14:54:29 -04:00
Adam Whitehurst	3ae2b8de2e	Remove excess code	2020-03-21 10:32:32 -07:00
Adam Whitehurst	180ec89060	add SwapLoadout	2020-03-21 10:26:38 -07:00
jshipsey	49986a0e09	bow work	2020-03-21 03:40:14 -04:00
Imbris	08db424169	Add safe_slerp function that ensures that slerping returns non-NaN normalized values	2020-03-21 00:53:41 -04:00
jshipsey	514d65eb7c	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-20 18:54:54 -04:00
jshipsey	a0785e693a	shooting anim state, cast anim, small tweaks	2020-03-20 18:54:27 -04:00
Adam Whitehurst	0cdb80427d	better triple_strike	2020-03-20 15:03:29 -07:00
Pfauenauge90	4153df66ea	stat icons, frame colours	2020-03-20 20:52:32 +01:00
timokoesters	44ec09a8e7	Go to idle state when picking items up	2020-03-20 20:23:04 +01:00
timokoesters	df858cb370	Remove all warnings	2020-03-20 15:45:36 +01:00
timokoesters	c630df7f9a	Ranged weapons now give xp on kill and also make enemies angry	2020-03-20 14:26:18 +01:00
Pfauenauge90	6836a043af	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-20 13:02:35 +01:00
Pfauenauge90	4f1104a417	new loading screen bg	2020-03-20 13:01:31 +01:00
Songtronix	b940cde501	change(panic): mention the game version in panic	2020-03-20 09:47:00 +01:00
jshipsey	50e96efe6b	hammer go smash	2020-03-20 02:38:53 -04:00
jshipsey	93bea033d9	axe, hammer proper wields	2020-03-20 01:27:54 -04:00
Pfauenauge90	6094e4b017	added chest drops	2020-03-20 01:11:02 +01:00
Adam Whitehurst	0b7a572178	update triple_strike	2020-03-19 15:40:03 -07:00
Pfauenauge90	3145b26cd6	item images	2020-03-19 22:36:40 +01:00
timokoesters	1e1ce2adbf	Fix weapon not updating after swapping to a weapon of the same type	2020-03-19 20:57:36 +01:00
timokoesters	26674390ab	Hide player body after death	2020-03-19 20:36:19 +01:00
Pfauenauge90	44d3f4c4ac	fix	2020-03-19 20:01:31 +01:00
Pfauenauge90	3c0e070ed0	stack numbers	2020-03-19 19:33:59 +01:00
Pfauenauge90	e16bb66fb3	fix	2020-03-19 18:19:05 +01:00
Pfauenauge90	466b80e8a8	added const tweaker	2020-03-19 18:11:45 +01:00
timokoesters	6c129c9b8d	Fix amounts out of range	2020-03-19 16:51:50 +01:00
Pfauenauge90	0bb0d5e7a6	Update bag.rs	2020-03-19 16:43:11 +01:00
Pfauenauge90	041277917b	Update bag.rs	2020-03-19 15:49:32 +01:00
timokoesters	449ae22730	Add inventory stacking	2020-03-19 14:32:17 +01:00
timokoesters	87c276b292	Add hard coded loot	2020-03-18 20:37:42 +01:00
Pfauenauge90	1cb2022d35	UI visuals	2020-03-18 19:51:48 +01:00
Pfauenauge90	43bae55961	coin/currency visuals	2020-03-18 12:05:36 +01:00
Pfauenauge90	70511e0f4e	background images	2020-03-18 01:43:55 +01:00
Pfauenauge90	04c8ed9a3c	armour slot bgs	2020-03-17 19:48:15 +01:00
Pfauenauge90	d752501db1	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-17 19:04:11 +01:00
Pfauenauge90	c9d09b8cdd	more slots	2020-03-17 19:04:06 +01:00
timokoesters	4741e41230	Add support for different models per weapon type	2020-03-17 18:28:07 +01:00
Pfauenauge90	431974cf8e	test armor slot	2020-03-17 17:02:50 +01:00
timokoesters	d6929ae0ea	Select newly created character automatically	2020-03-17 16:22:34 +01:00
timokoesters	08b44db1fc	Stop first person bounce in air	2020-03-17 16:08:53 +01:00
Pfauenauge90	b9f6dfac77	fixes	2020-03-17 16:07:20 +01:00
Pfauenauge90	40910b28e4	unclothed parts	2020-03-17 15:39:29 +01:00
Pfauenauge90	7ded921ecc	more UI visuals	2020-03-16 22:58:19 +01:00
timokoesters	b040e18246	Fix body parts not changing	2020-03-16 22:06:23 +01:00
Pfauenauge90	11e4289f28	small fixes	2020-03-16 20:50:01 +01:00
Pfauenauge90	2e41b59282	removed character window and questlog	2020-03-16 19:56:15 +01:00
Pfauenauge90	b9f61d4e7a	UI colourable in the code, stats window	2020-03-16 18:55:43 +01:00
Pfauenauge90	ab8b83f8d6	more bag parts	2020-03-16 18:55:31 +01:00
timokoesters	d5db1f6ca0	Add dash ability to sword M2	2020-03-16 16:34:53 +01:00
timokoesters	81591fcaf7	Make npcs attack again	2020-03-16 14:27:52 +01:00
timokoesters	1279f70184	Add shield item	2020-03-16 13:40:14 +01:00
timokoesters	4195273cf9	Adjust first person camera and underwater wield orientation	2020-03-16 13:19:51 +01:00
timokoesters	87acc01d48	Readd ranged and debug boost. Add bouncing while running in first person	2020-03-16 12:32:57 +01:00
Pfauenauge90	db6099a62f	reenabled inventory slots	2020-03-15 19:48:02 +01:00
timokoesters	1f78344d6f	Move equipment from loadout into body	2020-03-15 19:44:47 +01:00
Pfauenauge90	817cd24d54	minimap scale	2020-03-15 16:53:28 +01:00
Pfauenauge90	492db3ac5f	minimap position	2020-03-15 16:53:28 +01:00
Pfauenauge90	7b77064539	mmap visuals	2020-03-15 16:52:38 +01:00
Pfauenauge90	caf4159463	UI changes	2020-03-15 16:50:37 +01:00
Joshua Barretto	e20feeeb0c	Added armour items and equipping of armour	2020-03-15 16:42:09 +01:00
Pfauenauge90	1b170f70c3	Even less blending.	2020-03-15 15:53:51 +01:00
Pfauenauge90	0e7f3a6b00	Update vol.rs	2020-03-15 15:53:51 +01:00
timokoesters	aa963b7686	Merge remote-tracking branch 'origin/master' into clientstates	2020-03-15 15:27:06 +01:00
timokoesters	598a4c6cbb	Add loadout struct for info on weapon configurations	2020-03-14 22:33:20 +01:00
AdamWhitehurst	6fc94c22ba	Update timed combo, add CharacerBehavior trait	2020-03-14 12:50:07 -06:00
timokoesters	fe19698d52	Make abilities depend on weapon	2020-03-14 16:40:29 +01:00
Shane Handley	4e5d200b70	Fix: Make the dropped item collection range match the world item range limit.	2020-03-12 11:54:23 +09:00
Shane Handley	434dd96cd6	Check for the mousedown state before trying to collect an item via secondary mouse click.	2020-03-11 15:39:46 +09:00
Acrimon	406767ae31	Merge branch 'capucho/voxygen-logout-timeout' into 'master' FIX #513 logout timeout See merge request veloren/veloren!837	2020-03-10 22:12:29 +00:00
Mckol	c3f1afdf2b	Merge branch 'controller' into 'master' Controller support Closes #20 See merge request veloren/veloren!750	2020-03-10 21:00:13 +00:00
Mckol	8838682f0b	Added Controller support	2020-03-10 21:00:13 +00:00
S Handley	b2312a0487	Check that a targeted collectible is within a certain pickup range of the character before highlighting it	2020-03-10 20:50:04 +00:00
Capucho	16e4214a52	Switch states instead of popping	2020-03-10 20:34:50 +00:00
Capucho	9d805a745e	Proper fix to the logout timeout problem using Disconnect ACK	2020-03-10 20:34:50 +00:00
Capucho	d8ba63ffdc	Janky fix of the logout timeout problem	2020-03-10 20:34:50 +00:00
Acrimon	bc39b78173	Rebased.	2020-03-08 23:02:15 +01:00
Imbris	8d7c454029	Hide password text	2020-03-08 23:00:34 +01:00
Imbris	0022f8464d	Update auth	2020-03-08 22:59:22 +01:00
Songtronix	d2e12fd166	feat(auth): localisation of authentication errors	2020-03-08 22:58:43 +01:00
Imbris	a04c1b1d1d	Add uid to Player component fix: world examples	2020-03-08 22:58:38 +01:00
Acrimon	d4225cfb45	Auth error help message. main menu message about auth	2020-03-08 22:57:09 +01:00
Imbris	6cc07270ac	improve(login): more precise error handling during login	2020-03-08 22:56:59 +01:00
Songtronix	ac5ff453cc	improve(voxygen): error handling while connecting	2020-03-08 22:54:49 +01:00
Acrimon	7db0ff0b8c	Update chat-cli to work properly. Update reqwest to 0.10.0	2020-03-08 22:54:15 +01:00
Imbris	8ef1251dc2	Add warning prompt for untrusted auth servers, move some auth code into	2020-03-08 22:51:37 +01:00
Acrimon	584dcddba9	Updated to latest and greatest auth version.	2020-03-08 22:46:40 +01:00
Songtronix	50b845d1c3	:/ and reactivated the password field	2020-03-08 22:34:06 +01:00
jshipsey	bce9d4c24f	animation corrections	2020-03-08 17:02:25 -04:00
Snow	72b2334434	more eagle adjustements	2020-03-08 15:07:47 +00:00
Adam Whitehurst	49c7143144	Clean up warnings	2020-03-07 13:03:10 -08:00
Adam Whitehurst	54a7112ad9	resolve conflicts merging master -> clientstates	2020-03-07 12:49:48 -08:00
Adam Whitehurst	096d3b691e	Merge master	2020-03-07 12:49:15 -08:00
jshipsey	d4332c3138	eagle adjustments	2020-03-07 13:26:46 -05:00
Adam Whitehurst	b1d1299fe6	Clean up character states	2020-03-07 10:15:02 -08:00
Imbris	ed5afaec8a	Fix tests	2020-03-05 23:12:51 -05:00
Imbris	4a0c474be1	Remove `Client` dependency from Scene types and audio managers, add an example for using voxygen as a library to renderer images of characters	2020-03-05 23:12:51 -05:00
Acrimon	511bbd3899	Merge branch 'capucho/screenshots-logs-directory' into 'master' Save screenshots and logs in a fixed directory Closes #484 See merge request veloren/veloren!835	2020-03-05 19:26:07 +00:00
S Handley	ea53dea8a7	Fixes https://gitlab.com/veloren/veloren/issues/484 partially by saving logs to a fixed place (defined in the settings file)	2020-03-05 19:26:07 +00:00
Capucho	a3479f6a49	Fixed the bugs in the settings tab and the character button in the escape menu and unpause when there is more than 1 player	2020-03-05 18:55:14 +00:00
Capucho	6f6b8986b6	Removed logging, added the changes to the changelog and fixed the logout button	2020-03-05 18:55:14 +00:00
Capucho	f13314e3da	Fixed the erroneous load on pause	2020-03-05 18:38:39 +00:00
Capucho	af21d19ff3	Moved paused from GlobalState to SinglePlayer to prevent errors and unpauses now works using the resume button	2020-03-05 18:38:39 +00:00
Capucho	a97b694dfe	Groundwork for fixing #36 and rewrite of client timeouts so that they don't use Instant and Duration	2020-03-05 18:38:39 +00:00
Justin Shipsey	86e15695fc	weapon control bone	2020-03-05 14:02:11 +00:00
Shane Handley	9d8d61736b	Deselect the inventory slot after dropping an item.	2020-03-05 16:11:45 +09:00
S Handley	b0ca85069b	Piggyback on the InventoryUpdate events and attach some additional event info so that we can detect why the inventory update was triggered, and emit an associated sfx event that matches it.	2020-03-04 10:09:48 +00:00
S Handley	daa0a10c2c	Revert "Do that better, and add a TODO." This reverts commit `9b0f11bd89`. It wasn't better.	2020-03-01 19:45:05 +00:00
Shane Handley	0d2b26a3b8	SFX Fixes - Reinstate run, uncomment tests and make them pass, adjust config.	2020-02-25 22:03:29 +09:00
Justin Shipsey	5438514343	animation housekeeping	2020-02-25 06:47:56 +00:00
Shane Handley	d6f72876e9	Fix tests for movement sfx.	2020-02-25 10:01:41 +09:00
timokoesters	d0439fdd84	Merge remote-tracking branch 'origin/master' into clientstates	2020-02-24 21:34:17 +01:00
timokoesters	ac611f4618	fix: sync characterstates, better energy management	2020-02-24 20:57:33 +01:00
timokoesters	2fa902270e	fix: block	2020-02-24 18:10:42 +01:00
S Handley	d87061fe14	Add a volume option to SfxEvents, and use this to dispatch movement sfx for quadripeds at a volume proportionate to their size.	2020-02-23 01:26:51 +00:00
S Handley	9ab2833056	Add weapon wield/unwield sfx support	2020-02-21 02:56:54 +00:00
Monty Marz	2180040f70	Orc hairstyles, several tiny UI fixes, fixed beard warnings	2020-02-20 10:32:03 +00:00
Monty Marz	18f46a6f83	Fix Fonts	2020-02-17 16:22:49 +00:00
Treeco	abe47d8621	Gamma setting now works	2020-02-17 00:46:31 +00:00
Treeco	aaf1de9f9b	Added gamma setting, not hooked up yet	2020-02-16 20:32:17 +00:00
Rémy PHELIPOT	98c37d0b28	[i18n] Configurable fonts - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)	2020-02-16 16:02:38 +01:00
Monty Marz	90680d5490	Fix healthbar background alignment	2020-02-16 10:58:44 +00:00
S Handley	b739623579	Split the audio channels into SFX and music channels. This makes the Music Channel for exploration music a basic Sink without spatial audio functionality, which is not required.	2020-02-15 21:30:44 +00:00
Imbris	fb7edd2404	Make nametag positioning slightly better	2020-02-06 17:10:52 -05:00
Imbris	f8283116a8	Fix highlighting non-collectibles	2020-02-06 17:06:49 -05:00
Monty Marz	93d7c67cdc	Hack to allow minimap rotation. Currently it just always rotates towards the camera, but it wouldn't be hard to create a config option that swaps out the rotation of the indicator and the map.	2020-02-06 17:34:32 +00:00
timokoesters	0bc07a0835	Merge remote-tracking branch 'origin/master' into clientstates	2020-02-03 22:02:32 +01:00
timokoesters	aeb37a1f33	improvement: char speed	2020-02-03 20:43:36 +01:00
timokoesters	aa52c6fd4f	fix: jumping and attacking	2020-02-03 17:03:52 +01:00
S Handley	b7ce91fead	Move music under audio Also add some blank time after each track so that we get some silence between tracks.	2020-02-03 11:55:32 +00:00
Marcel Märtens	dae31ae5b6	apply new rustfmt - touching alot of files	2020-02-01 21:39:39 +01:00
Marcel Märtens	dd21235ff8	Apply prefixes to veloren source, espacially comments, so that reformating wont make it unreadable, especially enumerations and other source code in errosions file	2020-02-01 21:37:36 +01:00
Marcel Märtens	e960c2233b	Change the version number to 0.5	2020-01-31 17:26:45 +01:00
Joshua Barretto	faa86226c7	Collars	2020-01-29 12:01:28 +00:00
Justin Shipsey	908e099aa5	minor anim tweaks	2020-01-29 06:38:08 +00:00
Rémy PHELIPOT	ce54f27531	Add missing translations	2020-01-27 20:34:36 +01:00
Rémy PHELIPOT	c501b2d0bf	Use English instead of saved language if loading fails	2020-01-27 19:59:17 +01:00
Rémy PHELIPOT	8946ed8d82	Add missing translations in voxygen Fix #436	2020-01-27 19:59:17 +01:00
Rémy PHELIPOT	f60a68d96d	Improve i18n "get" performances by returning a &str	2020-01-27 19:59:17 +01:00
timokoesters	76dfac7366	fix: rolling	2020-01-27 18:32:05 +01:00
Justin Shipsey	53e57cb5dc	quad_medium animation	2020-01-27 14:16:23 +00:00
Treeco	6bcab1e89b	Fixed lag caused when turning the camera with large entity counts	2020-01-26 20:04:56 +00:00
Joshua Barretto	d04a595b3f	Made waypoints work, added waypoint spawning	2020-01-26 12:52:28 +00:00
Joshua Barretto	11193a692a	Better neutral AI, initial waypoint objects	2020-01-26 12:52:28 +00:00
Joshua Barretto	2d9aa21eef	Added test world, friendly NPC pathfinding	2020-01-26 12:52:07 +00:00
Monty Marz	49071400d2	Fix: Healthbars size	2020-01-26 01:19:36 +00:00
Justin Shipsey	64690279af	new mobs alligators	2020-01-26 00:22:48 +00:00
Monty Marz	b583f60326	35 new ground sprites, UI fixes	2020-01-25 11:14:02 +00:00
Monty Marz	4287c76e95	Fix: Player can't push the "Enter World" button anymore without having a character.	2020-01-25 10:36:30 +00:00
Imbris	460f5e6f26	Enable pixel art resizing for voxel based ui elements	2020-01-24 23:14:59 -05:00
Imbris	e5d841e62f	Adds fullscreen and window size settings and coverage based pixel art scaling	2020-01-24 23:14:59 -05:00
Imbris	166aba61f0	Make nametages etc fixed size and only display within limited range	2020-01-24 22:09:45 -05:00
timokoesters	6515daddce	fixes	2020-01-24 16:57:24 +01:00
Pfauenauge90	c08c545474	fixed numbers spam	2020-01-24 16:10:38 +01:00
Joshua Yanovski	3383e991e7	Erosion cleanup, part 1. Covers all files touched by MR that are not in world/src/sim.	2020-01-23 18:18:17 +01:00
Joshua Yanovski	49e7e55cd6	Fix warnings in examples and benchmarks.	2020-01-23 18:18:16 +01:00
Joshua Yanovski	1d6d0ea03d	Fix all warnings.	2020-01-23 18:18:16 +01:00
Joshua Yanovski	1358f1dffa	Changes to worldgen, adding more sedmient etc.	2020-01-23 18:18:14 +01:00
Joshua Yanovski	14e4dfb53f	Re-fix map orientation.	2020-01-23 18:18:13 +01:00
Joshua Yanovski	e91578ffdb	Cargo fmt most things (except erosion.rs).	2020-01-23 18:18:12 +01:00
Joshua Yanovski	2b38927345	Fixes for nonstandard chunk and map sizes. Also fixes a longstanding map rendering issue.	2020-01-23 18:18:11 +01:00
Joshua Yanovski	9520ef4f6d	Implement sending world map across the network.	2020-01-23 18:18:11 +01:00
Joshua Yanovski	72287f2041	Implement carving strategy for lake connections. Also fix mapgen slopes and make a much more pleasing world.	2020-01-23 18:18:08 +01:00
Monty Marz	bfee0a6f9e	Character stats displayed in char window, pulsating active slot in inventory	2020-01-23 17:14:02 +00:00
Monty Marz	1365abae99	Clean up unused UI assets	2020-01-22 21:56:03 +00:00
timokoesters	7b558b4542	refactor: combine actionstate and movestate	2020-01-21 23:54:59 +01:00
Monty Marz	e2707ff24a	start menu text	2020-01-21 22:04:39 +00:00
Gilbert Röhrbein	c2b99f3a62	Fix panic in case no default audio device found when audio off	2020-01-21 18:09:37 +01:00
Joshua Barretto	8e7a8aa4f9	Shader optimisations	2020-01-21 12:58:20 +00:00
Joshua Barretto	8a0bd9220b	Fixed button font	2020-01-20 22:54:51 +00:00
Joshua Barretto	4b5cc272ac	sync	2020-01-20 22:51:55 +00:00
Joshua Barretto	397fa7777f	Switched to enum-based char creation state	2020-01-20 22:29:14 +00:00
Rémy PHELIPOT	a6f9f533a5	Localization system for Voxygen - Added a localization system in voxygen - Support English and French languages - Added a configuration option in the interface settings to change the language	2020-01-20 21:07:25 +01:00
Joshua Barretto	0223a60a1e	Merge branch 'zesterer/cs-char-saving' into 'master' Client-side character saving See merge request veloren/veloren!737	2020-01-20 18:03:28 +00:00
Joshua Barretto	6f26f2afb1	fmt	2020-01-20 17:45:28 +00:00
Pfauenauge	caa5abf183	updated info main menu info	2020-01-20 18:08:05 +01:00
S Handley	b44955ba30	Remove currently unused audio assets This clears out about 56MB of unused audio files. There were also some unused methods in the audio modules which referenced a file, which has also been removed.	2020-01-20 15:07:30 +00:00
Joshua Barretto	fc1e66fb31	Solved character select body bug	2020-01-20 15:04:53 +00:00
Joshua Barretto	8f86e45a72	Enumerated Body type	2020-01-20 14:21:06 +00:00
Joshua Barretto	2c42aaf5f5	Added client-side character saving	2020-01-20 13:37:29 +00:00
Joshua Yanovski	898b5c6593	Fix benchmarks and profile overrides. This was necessary because Cargo recently deprecated the "overrides" keyword in favor of "package", and Criterion changed its interface. This commit also now lists more configurable keys, so if they aren't set to their defaults the user will be able to find them. This includes the roll key, which wasn't listed earlier and is different on Windows and Mac. It does not include the respawn key because that key is already shown when you die.	2020-01-20 14:16:28 +01:00
Joshua Yanovski	355a1b204a	Fixes for OS X machines. Handles scroll wheel events in pixels (enabling the scroll wheel) and sets rolling and wall leaping to use left shift by default on OS X (instead of middle mouse click, which is absent by default on Apple trackpads). Also updates the controls UI to show the actual assigned keys for those controls which are configurable.	2020-01-20 05:12:41 +01:00
Imbris	38c48317f7	Fix lighting calc bug, lower meshing bench sample size	2020-01-19 18:14:07 -05:00
Pfauenauge90	8a0efd3654	added TODO for energy numbers	2020-01-19 22:39:20 +01:00
Pfauenauge90	885e698e5a	charge icon update	2020-01-19 22:39:19 +01:00
Pfauenauge90	6a32845e58	various fixes	2020-01-19 22:39:19 +01:00
Pfauenauge90	480b920fa3	skillbar background fix	2020-01-19 22:39:18 +01:00
Pfauenauge90	863e4c4962	darkened button for unavailabe charge	2020-01-19 22:39:18 +01:00
Imbris	94210070f7	fmt fix	2020-01-19 16:03:27 -05:00
Imbris	3c8d0a3bb9	fix typo, replace u32 with Vec3<u8> in light propagation queue	2020-01-19 16:03:27 -05:00
Imbris	4b01c1b082	add: capability to disable blending for particular BlockKinds	2020-01-19 16:03:27 -05:00
timokoesters	ae1fa5e4c4	improvement: fog doesn't go back and forth anymore	2020-01-19 16:03:27 -05:00
Imbris	b3cdde3ce9	fix: panic in terrain meshing	2020-01-19 16:03:27 -05:00
Imbris	5666f18ded	Add terrain meshing benchmark	2020-01-19 16:02:12 -05:00
Imbris	6f6dc1b16b	Cleanup	2020-01-19 16:02:12 -05:00
Imbris	aa48729376	Compress position used in propagation queue, decrease outer bounds to the area sunlight can reach the inner area from	2020-01-19 16:02:12 -05:00
Imbris	09239caf88	While copying terrain sample to flat array, keep track of highest and lowest positions with exposed faces in order to constrain further iteration	2020-01-19 16:02:12 -05:00
Imbris	3347438d51	Propagate light via queue to avoid block lookups	2020-01-19 16:02:12 -05:00
Imbris	211c076b8d	Remove unnecessary sampling in meshing light calculations	2020-01-19 16:02:12 -05:00
Imbris	33993638fe	Experiment with replacing hashmap in light calculations	2020-01-19 16:02:12 -05:00
Imbris	9d6bf66a32	Add options to turn off the clouds and to render ugly water	2020-01-19 14:05:31 -05:00
S Handley	309834df1b	fix: Prevent dispatching Run SFX if an entity is not moving This adds the entity's velocity as an argument when mapping the movement state to an SFX event, and prevents the run SFX from being returned if the velocity is below a threshold. This will prevent hearing the run sfx when stuck in a corner, or running into a surface where the character is not actually moving their feet.	2020-01-18 18:49:17 +00:00
Gilbert Röhrbein	b2503397c9	Fix panic in case no default audio device found when audio off	2020-01-18 19:16:23 +01:00
Monty Marz	cb5976b9de	create character button position change	2020-01-18 15:42:21 +00:00
Monty Marz	a4274ef8aa	Charge Icon and flashing skillbar	2020-01-17 22:00:00 +00:00
AdamWhitehurst	976eface66	Update from MR comments	2020-01-17 08:39:21 -08:00
Adam Whitehurst	5959d2a5c7	Fix SFX and Assets	2020-01-16 05:28:45 -08:00
Adam Whitehurst	d82e93b39f	Merge master and build	2020-01-16 05:27:30 -08:00
Gilbert Röhrbein	28060e7b6e	fixing #405 - Energy as its own component	2020-01-12 22:25:04 +01:00
Monty Marz	f6dfb74b3e	fix slightly lower trigger velocity slighty more transp map image	2020-01-12 19:01:02 +00:00
S Handley	00c1493548	Play the Run SFX when a character lands after jumping or falling This is a small detail but makes a noticable difference.	2020-01-12 16:35:20 +00:00
Piotr Korgól	e1adf40856	Improvement: Replace all '..=b' with '..b + 1'	2020-01-12 15:46:53 +01:00
Pfauenauge90	e0fc3ce425	fixed number shadow for "0" damage appearing on level up	2020-01-11 21:31:57 +01:00
Imbris	2b4d4aa480	Merge branch 'yusdacra/tweaks' into 'master' Fixes minor issues with frustum culling See merge request veloren/veloren!712	2020-01-11 16:36:51 +00:00
Songtronix	70eb2eed33	remove: discord rich presence	2020-01-10 17:01:50 +01:00
Monty Marz	851d7858e6	Scrolling Combat Text (SCT)	2020-01-10 00:33:38 +00:00
Yusuf Bera Ertan	127f8fb72b	Fix `lpindex` not being updated for culled objects, and don't recalculate frustum for every entity	2020-01-09 22:22:06 +03:00
AdamWhitehurst	de36e75264	Fix imports, update matches	2020-01-08 11:31:42 -08:00
Yusuf Bera Ertan	4a0a2d5229	Cargo fmt	2020-01-08 20:09:54 +03:00
Yusuf Bera Ertan	71db9d6350	Replace radio list with drop down selector for AA mode setting	2020-01-07 20:37:55 +03:00
Yusuf Bera Ertan	24013f1a32	Use `treeculler` crate	2020-01-07 19:40:06 +03:00
Adam Whitehurst	8648641362	Grooming	2020-01-07 07:49:08 -08:00
Yusuf Bera Ertan	0b67dad4a5	Fix figure visible value not updating	2020-01-07 18:46:37 +03:00
Yusuf Bera Ertan	31d18b3381	Use temporal coherence for figure frustum culling, don't process figures if they are not in view frustum	2020-01-07 18:46:22 +03:00
Yusuf Bera Ertan	c19c222a90	Use temporal coherence for chunk frustum culling	2020-01-07 18:46:09 +03:00
Yusuf Bera Ertan	e32153e980	Improve frustum culling by using AABBs, add related debug information	2020-01-07 18:44:33 +03:00
Yusuf Bera Ertan	fd9cc76786	Reimplement #210	2020-01-07 18:40:45 +03:00
Pierce Brooks	43febb5bf3	fix #426 : Use new dispatch dependency to ensure proper thread routing of msgbox NSAlert calls ( correct MR workflow )	2020-01-07 05:45:43 +00:00
Imbris	4fa05150a2	Merge branch 'imbris/char-screen-transition' into 'master' Fix issues regarding going back to the character selection screen Closes #386 See merge request veloren/veloren!700	2020-01-02 19:40:21 +00:00
Joshua Barretto	423e741cb6	Merge branch 'zesterer/better-rollin' into 'master' Made rolling less slippy, added tilt See merge request veloren/veloren!699	2020-01-02 18:35:27 +00:00
S Handley	2644e29484	Refactor and Rename for clarity Implements a potential structure for splitting the SFX event mapping into smaller individual files for maintainability. - Remove inventory events for now: For a later commit. - No longer panic when there is a failure parsing the sfx file: log the error and not play sfx.	2020-01-01 02:55:48 +00:00
Imbris	06ea29bd4c	Small connection error handling improvement	2019-12-31 16:38:13 -05:00
Imbris	ede05c47b0	fix(char screen induced ghosts): Adds removing extra components and deleting entities clientside when going back to the character screen. Also, simplifies ClientState by removing the Dead variant and removing ClientMsg::StateRequest in favor of more specific ClientMsg variants.	2019-12-31 16:38:13 -05:00
AdamWhitehurst	b67a4835f4	Update disabled state flags	2019-12-31 05:19:23 -08:00
Joshua Barretto	cfbf69ae89	Made rolling less slippy, added tilt	2019-12-30 15:16:21 +00:00
AdamWhitehurst	ba7ca785f6	Successful build	2019-12-30 05:56:42 -08:00
Monty Marz	8aff5faa83	assets update acacia trees updated help.png bigger map zone name npc levels from 0-10 boss levels from 20-50	2019-12-30 12:16:35 +00:00
Imbris	ec3e075020	fix(player list): Show players not in range on the player list fix(overflow): Stops including block updates that fail (since chunks don't exist on the client) in `TerrainUpdates` (which would trigger meshing of those nonexistent chunks). Furthermore, removes remeshing of chunks with block updates if those chunks don't have all their neighbours (since those wouldn't be meshed in the first place).	2019-12-29 20:51:05 -05:00
AdamWhitehurst	9c6ce9babd	Begin implementing combat actions	2019-12-29 15:47:42 -08:00
AdamWhitehurst	ca44497258	Add movement_utils	2019-12-28 08:10:39 -08:00
AdamWhitehurst	8e0317e03d	refactor states to handle update logic	2019-12-26 06:43:59 -08:00
AdamWhitehurst	c2ceabea0e	finish movment states handle() fn logic	2019-12-22 08:08:48 -08:00
AdamWhitehurst	1ab09220b0	Rudimentary Stand State handle() move	2019-12-21 07:57:15 -08:00
Imbris	934c5d6846	Various tweaks: moved radius determination to function on , comments, simplified server Destroy event code, debug assert modified components aren't removed in change tracking, etc	2019-12-20 22:51:35 -05:00
Imbris	5813f626d1	cleanup	2019-12-20 22:48:14 -05:00
Imbris	d341073a44	Upgrade to specs 0.15.1	2019-12-20 22:48:14 -05:00
Imbris	e49cafafbf	Actually send deletion messages	2019-12-20 22:48:14 -05:00
Songtronix	f070c139e9	change(log): only print out log file errors, no panic	2019-12-20 15:59:50 +01:00
Songtronix	b03e4ac261	feat(log): configurable creation of log file additionally allows to ignore any errors with the log file furthermore prints out full log file path to the user incase of a panic	2019-12-20 15:45:30 +01:00
Songtronix	9141cc07d0	feat(env): configurable verbosity of log file via VOXYGEN_FILE_LOG environment variable	2019-12-20 15:45:30 +01:00
Songtronix	0d919a9dc6	improve(log): adjust verbosity of some logging fix: settings do not log due to logging being initialized to late	2019-12-20 15:45:30 +01:00
S Handley	8c5320d20f	Update title music and temporarily remove attack sfx - Updated title music with a version provided by aeronic which fades out more gracefully - Removed attack SFX as it was included in the movement processing, but will return later as part of a similar chunk of code which processes combat sfx independent of movement.	2019-12-20 04:04:05 +00:00
S Handley	da2d36ed76	(fix) Set the music and sfx volumes immediately after initialising the audio frontend. Fixes #373	2019-12-10 14:02:51 +00:00
Adam Whitehurst	20575e0aab	Update controller	2019-12-09 14:45:10 +00:00
S Handley	56f9c5d35f	Fix the glider_close sfx event This was failing to trigger since we now have a MovementState::Fall, but the sfx mapper was still trying to work this out itself based on velocity. We no longer need to track velocity as a result and can use the MovementState. Also silenced warnings resulting from unused vars when running tests.	2019-12-09 09:50:14 +00:00
Treeco	d88376f365	Added mouse inversion setting	2019-12-06 23:00:02 +00:00
Adam Whitehurst	92d99af53c	feat: weapon-type dependent wield and attack durations also some controller.rs cleanup	2019-12-03 06:30:08 +00:00
Treeco	7c17c45f47	made first person camera follow race heights, minor zoom chances	2019-12-01 19:05:28 +00:00
Adam Whitehurst	4e574cb29a	Inputs enhancements	2019-11-29 15:20:35 +00:00
Monty Marz	d0b7891a34	Set overflow checks to 'false' for release builds in order to bandaid fix recent master error	2019-11-28 13:32:38 +00:00
Monty Marz	040e1a7535	Fix map being inverted and indicator positioning	2019-11-26 22:39:07 +00:00
Monty Marz	b3eb0b270f	Region name display fix	2019-11-24 16:45:13 +00:00
Songtronix	fa93e35861	upgrade(dep): msgbox Fix: FreeBSD compilation	2019-11-24 08:49:14 +01:00
S Handley	ea2e0d17de	SFX system This is an event based approach to SFX sounds. There is a specific character sound event mapper which determines sfx to play based on character or NPC state, as well as emitting sfx events for non-character-triggers such as levelling up.	2019-11-23 08:26:39 +00:00
Monty Marz	370e94b1ad	Loading Screen with pulsating text, 2 new hairstyles	2019-11-23 00:51:18 +00:00
Songtronix	e885a78deb	change(deps): enforce crossbeam version	2019-11-22 19:12:58 +01:00
Songtronix	2f93dd2c38	adjust logging level	2019-11-22 19:12:58 +01:00
Songtronix	bdcea57201	feat(log): add date to log file	2019-11-22 19:12:58 +01:00
Songtronix	bb64c8ed76	change(log): remove all spam from logging	2019-11-22 19:12:58 +01:00
Songtronix	7abf2a0fb9	change(log): switch to fern	2019-11-22 19:12:58 +01:00
Joshua Barretto	8745d0a3af	Non-linear depth buffer	2019-11-20 09:59:27 +00:00
Joshua Barretto	9993a4c81a	Smoother water at distance, fixed warnings	2019-11-19 19:22:56 +00:00
Joshua Barretto	28e625635f	Split terrain rendering to avoid redrawing skybox	2019-11-19 19:09:22 +00:00
Joshua Barretto	5162256e45	Faster and more visually pleasing clouds	2019-11-19 19:09:22 +00:00
Joshua Barretto	aa111d34e5	Added clouds	2019-11-19 19:09:22 +00:00
Joshua Barretto	eb7b55d3ad	Merge branch 'zesterer/better-water' into 'master' Better water See merge request veloren/veloren!643	2019-11-12 14:55:54 +00:00
Adam Whitehurst	59826a364a	Remove unnecessary elided lifetimes	2019-11-11 08:26:44 -08:00
Adam Whitehurst	64a0d8d91f	Make character anims conditional by Tool held	2019-11-10 15:36:47 -08:00
Monty Marz	a9a7b95037	Login desc	2019-11-09 23:19:41 +00:00
timokoesters	b6552556e7	fix: show error on client failure again	2019-11-07 09:42:03 +09:00
Shane Handley	0fabe70960	Ignore warning about variant never being constructed. It's being used elsewhere. Not sure why that isn't being picked up.	2019-11-06 21:34:19 +01:00
Shane Handley	4330b33ce0	Hmm, alright have it your way rust. Not my change, so leaving it alone.	2019-11-06 21:34:18 +01:00
Shane Handley	fb3350c605	Removed error which is now handled by the ServerTimeout case	2019-11-06 21:34:18 +01:00
Shane Handley	15c725bfde	Address code review points: - Clarify caffeine fueled comment - Be better at comparing Instant's, and catch the 0 seconds case to say Goodbye to the user - Switch println for 'info!'	2019-11-06 21:34:18 +01:00
Shane Handley	b15c107f0b	Re-add the handling of error when the player loses connection on the character select screen.	2019-11-06 21:34:17 +01:00
Shane Handley	69b008e0e6	Fix issue with the timeout error showing when there is an intentional logout from the game.	2019-11-06 21:34:17 +01:00
Shane Handley	81f41e278e	Remove unused warn and fix dangling parameter.	2019-11-06 21:34:17 +01:00
timokoesters	4a65cddd15	improvement: remove `wait` because it now always retries	2019-11-06 21:34:16 +01:00
Shane Handley	26acd8b427	Bump up the timeout tie for booting the single player server	2019-11-06 21:34:16 +01:00
timokoesters	c733c95718	improvement: UI for connecting to singleplayer servers + threading fixes	2019-11-06 21:34:15 +01:00
timokoesters	21f126acd4	feat: show errors in main menu when client fails Instead of `[ERROR] Failed to tick the scene: Network(Bincode(Io(Custom { kind: UnexpectedEof, error: "failed to fill whole buffer" })))`	2019-11-06 21:34:15 +01:00
Shane Handley	3b24af76ab	Formatting	2019-11-06 21:34:15 +01:00
Shane Handley	ef6f8b509a	Eeek, remove logging.	2019-11-06 21:34:14 +01:00
Shane Handley	fe9ad3fa19	Network timeout updates - Bugfix: Check whether the server response (pong) is greater than the timeout period, rather than the ping (which will always fire regardless of connection status) This was causing the timeout error event to never fire. - Feature: Send the player notifications to the chat window that they will be kicked due to disconnection for 6 seconds before kicking them back to the main menu.	2019-11-06 21:34:14 +01:00
Joshua Barretto	671313a523	Overhauled water shaders	2019-11-05 15:45:01 +00:00
soruh	6dfa146484	Mitgated RUSTSEC-2019-0014 by updating `noise` and disabling its default features, specifically `image`, which had the vulnerability.	2019-11-05 11:14:39 +00:00
soruh	e3bd152d24	update toolchain to `nightly-2019-11-04`	2019-11-04 18:26:32 +01:00
Monty Marz	240b620c13	login info text	2019-11-01 20:53:52 +00:00
Acrimon	5beea76624	Remove heaptrack as it is now deprecated.	2019-10-29 06:55:45 +00:00
Monty Marz	a0a8011d7e	Updated: Help Window, Map, Item Descriptions	2019-10-27 22:22:40 +00:00
jshipsey	12f83cf270	rebase, small fixes	2019-10-25 22:20:38 -04:00
jshipsey	c5942dfcc9	purged references to npckind from anim files, removed warnings	2019-10-25 21:50:14 -04:00
jshipsey	2b5fd372c5	streamlined body part naming scheme, swapped quadruped to quadruped_small, rewrote mesh names to reflect body type instead of npckind. finally.	2019-10-25 21:50:14 -04:00
jshipsey	ada6142c1f	added large bipeds, small birbs, small fish skeletons	2019-10-25 21:47:23 -04:00
jshipsey	4f5f7402f0	added dragon skeleton	2019-10-25 21:44:33 -04:00
jshipsey	e858c31b4c	fish_medium and bird_medium skelingtons	2019-10-25 21:39:06 -04:00
jshipsey	574f070758	added large bipeds, small birbs, small fish skeletons	2019-10-25 21:34:29 -04:00
jshipsey	644939810f	added dragon skeleton	2019-10-25 21:33:59 -04:00
jshipsey	54fc712076	fish_medium and bird_medium skelingtons	2019-10-25 21:33:02 -04:00
Marcel	ee915671ef	Merge branch 'songtronix/set-voxygen-config-via-env' into 'master' customizable config file location via environment variable See merge request veloren/veloren!617	2019-10-25 18:52:38 +00:00
Timo Koesters	0ae15bb251	Merge branch 'timo-items-as-ron' into 'master' feat: store items as RON files See merge request veloren/veloren!618	2019-10-25 08:57:39 +00:00
Imbris	c18fe8042b	Merge branch 'imbris/mesh-speed' into 'master' Speed up terrain meshing ~20% See merge request veloren/veloren!625	2019-10-25 02:22:03 +00:00
Imbris	4bcc55ad34	improvement: roughly ~20% speedup of terrain meshing by eliminating redundant lookups of terrain blocks	2019-10-24 20:02:29 -04:00
timokoesters	f1b728b89b	improvement: load_cloned returns a result	2019-10-24 23:55:24 +02:00
timokoesters	0a1e12c9ad	improvement: make debug items of type ItemKind::Tool This way all items that can be held in a hand are tools	2019-10-24 23:55:24 +02:00
timokoesters	20248a4818	feat: store items as RON files When a new item is created, a ron file will be used as a template	2019-10-24 23:47:26 +02:00
Monty Marz	f4ba68c60d	.floating(true) for help window background to make it layer above every recent and future widget	2019-10-24 18:21:17 +00:00
Joshua Barretto	7d86a360d6	Merge branch 'soruh/fix-welcome-window-depth' into 'master' fix the welcome window not being closeable, due to it being obscured by the chat See merge request veloren/veloren!623	2019-10-24 12:49:20 +00:00
Imbris	2fad65c749	Merge branch 'imbris/graphic-cache' into 'master' Rework GraphicCache to use multiple texture atlases if necessary and put large images in their own textures. See merge request veloren/veloren!609	2019-10-24 05:27:09 +00:00
Imbris	a200dafd45	Fix possess bug, remove commented code, drain controller events	2019-10-24 00:00:00 -04:00
Imbris	966b2bfbff	Integrate new systems with metrics	2019-10-23 23:50:06 -04:00
Imbris	2703c8afe1	Move serverside client to a component and communications into server ecs systems	2019-10-23 23:50:06 -04:00
soruh	f186aac2ea	fix the welcome window not being closeable due to the chat being in front of it, by giving the welcome window a depth of -1.0. The value of -1.0 is very arbitrary, but has some effect on further development, so there should be consideration concerning it. if something is supposed to be over/under the welcome window and over/under something else with a different depth at the same time, the resulting depth could become really ugly. Of course it's always possible to change depths afterwards, but this often breaks things, so the general scope of depths should imo be considered, before this becomes a problem.	2019-10-24 00:46:40 +02:00
Monty Marz	3e0ac48bd8	Multiple Assets and UI fixes and additions	2019-10-23 19:40:45 +00:00
Songtronix	e8a077a5d6	feat(env): customizable config file location	2019-10-22 17:15:10 +02:00
Isaac Freund	355c7666b9	Allow dropping items Items can now be dropped by clicking to select the item then clicking outside of the bag.	2019-10-22 01:40:58 +02:00
Imbris	8bb54976eb	Rework GraphicCache to use multiple texture atlases and put large images in their own textures.	2019-10-19 21:28:30 -04:00
Songtronix	fffffff536	fix(crash): overflowing the stack	2019-10-18 14:19:02 +02:00
Songtronix	fe4a61354a	change(menu): display version with hash and date	2019-10-18 15:51:07 +02:00
Imbris	39656e92be	Merge branch '276-hotloading-armor' into 'master' Resolve "Enable hotloading of different offsets for armors/weapons" Closes #276 See merge request veloren/veloren!545	2019-10-18 00:29:09 +00:00
Adam Fogle	c41627d75f	Removed the recolor property from the armor ron files.	2019-10-17 19:45:29 -04:00
Monty Marz	fdfab6a807	refactor: create_projectile doesn't take a light It returns a builder so the caller can just do it	2019-10-17 20:59:36 +00:00
Joshua Barretto	1f39659a54	Merge branch 'zesterer/small-fixes' into 'master' Performance Improvements See merge request veloren/veloren!597	2019-10-17 20:56:37 +00:00
Joshua Barretto	04c64dc122	Better (and faster) water shaders	2019-10-17 17:11:55 +01:00
Shane Handley	ab59d1f262	Title music fix (fixes #342 ) Fix issue with title music restarting and playing in multiple channels when the player chooses a play state but then returns to the main menu.	2019-10-17 16:14:16 +09:00
Joshua Barretto	c01e19fc05	Don't render water that isn't there, improved chunk render order	2019-10-16 12:40:18 +01:00
Joshua Yanovski	8ae2692b6e	Allow canceling chunk generation. Currently we only do this when no players are in range of the chunk. We also send the first client who posted the chunk a message indicating that it's canceled, the hope being that this will be a performance win in single player mode since you don't have to wait three seconds to realize that the server won't generate the chunk for you. We now check an atomic flag for every column sample in a chunk. We could probably do this less frequently, but since it's a relaxed load it has essentially no performance impact on Intel architectures.	2019-10-16 11:39:41 +00:00
Adam Fogle	3a4c307d38	Code cleanup, formatting changes, and fixed the cloth belt's offset.	2019-10-16 00:42:57 -04:00
Joshua Barretto	707b79f2c8	Smoother movement, Space for climbing	2019-10-14 11:22:48 +01:00
Joshua Barretto	4bbc340f52	Faster meshing, better dusk	2019-10-14 10:48:40 +01:00
jshipsey	deadd665c8	tweaks animations to better align with true positions	2019-10-12 14:19:55 -04:00
Adam Fogle	8f7b4afafd	Manifest file is now used to load armor. Redid how pants renders so they can use underlying skin model/coloring, same as chest armor. Redid how belts render so they can use the underly skin color, same as shoulder or foot. Converted a manifest variable name to snake case.	2019-10-12 08:31:42 -04:00
Adam Fogle	a5db28113f	Redid the mainfest files to remove race/gender. Now based on armor slot enum. Added color to the manifest files. Manifest files aren't yet being used, but will load.	2019-10-12 08:31:42 -04:00
Adam Fogle	a2b2d0d493	Created Spec structs for each armor type. Moved mesh creating code for each armor type into matching struct. Each Spec struct now loads the matching manifest file. Manifest file is NOT used yet. Warning thrown due to adding new parameter to the mesh function for use reading the manifest file.	2019-10-12 08:31:42 -04:00
Adam Fogle	da54cf76bc	Armor names now end with left/right. Armor names no longer include their armor part. This should be inferred from their folder.	2019-10-12 08:31:42 -04:00
Marcel Märtens	30c9fcc911	Fix bug that metrics took a random port always introduced in !584 also removed the duplicate port from the server creation process, using the server settings struct now	2019-10-11 14:19:55 +02:00
Acrimon	a70f3cfd68	Merge branch 'overclockx64/near-plane-increase' into 'master' Increased near plane value, fixing character flickering on macOS See merge request veloren/veloren!575	2019-10-10 22:45:06 +00:00
Imbris	2651cb9179	Adjust far plane and bring near plane back in a bit	2019-10-10 22:24:24 +00:00
Marcel Märtens	20c520a044	Change the version number to 0.4	2019-10-10 15:48:01 +02:00
Luc Fauvel	b3697e1ea7	Increased near plane value	2019-10-09 22:23:09 -04:00
Forest Anderson	e7b97e0c66	md5sum assets	2019-10-09 22:42:39 +00:00
Monty Marz	d82ec6715a	Item icons, chests and more	2019-10-09 19:28:05 +00:00
Joshua Barretto	889fd678c6	More opaque water surface	2019-10-08 12:21:05 +01:00
Wu Yu Wei	75df4600bd	Switch portpicker dependemcy to git A pull request to fix has been created on original repository. But since 0.4 is coming out pretty soon, let's swithc to this fork temporary.	2019-10-07 15:35:20 +00:00
Joshua Barretto	1a9408c397	Merge branch 'timo-arrowheight' into 'master' timo arrow spawn height See merge request veloren/veloren!558	2019-10-06 20:19:01 +00:00
timokoesters	25cc1f0103	fix: orientation now supports z rotation	2019-10-06 22:03:29 +02:00
Monty Marz	b3862278af	Help window, UI fixes, asset fixes	2019-10-06 19:19:08 +00:00
Brian Lewis	86619d4192	Fix crashing due to error in Alsa. This uses a more recent version of cpal (a dependency of rodio hence the rodio change) which seems to have fixed a crash due to 'device not available: "Invalid argument"' coming from Alsa. The change in cpal also made some functions now return `Result` instead of a bare type which I dealt with by using `expect` to minimize how far these changes fan out into the code but maybe this isn't ideal. Fixing https://gitlab.com/veloren/veloren/issues/280 - Crash with ALSA	2019-10-06 11:24:42 +02:00
Forest Anderson	b13f9f37f7	Revert "Merge branch 'angelonfira/change-memory-allocator-to-jemalloc' into 'master'" This reverts merge request !547	2019-10-06 01:31:47 +00:00
Forest Anderson	0304b51159	Chanced to ignore msvc instead of windows Change server to ignore msvc	2019-10-05 17:57:29 -04:00
Forest Anderson	e1bab6afe0	Added jemalloc for Linux systems	2019-10-05 17:57:29 -04:00
Forest Anderson	9ef98ce1a5	Remove heaptrack	2019-10-05 17:57:29 -04:00
Timo Koesters	f3787879d3	fix(bow): adds bow icon art	2019-10-05 21:51:08 +00:00
timokoesters	4a99e5bc1e	refactor: joined on &stats twice	2019-10-05 17:37:10 +02:00
Piotr Korgól	152efaee3b	Make nametags display levels	2019-10-05 17:37:09 +02:00
Songtronix	43cae5ea64	Fix discord rich presence	2019-10-05 15:35:59 +00:00
Wu Yu Wei	193ff105e2	Update client-side password hashing to argon2	2019-10-05 13:12:20 +00:00
jshipsey	66e8f4c4bc	added bow wielding animations	2019-10-04 21:02:45 +02:00
timokoesters	469349a426	fix(render): figures without vel don't render	2019-10-04 21:02:44 +02:00
Pfauenauge90	e404ea0d4f	assets, rotation, offset changes	2019-10-04 21:02:42 +02:00
Pfauenauge90	39e5530d45	made bow available in char selection	2019-10-04 21:02:40 +02:00
Pfauenauge	b5180320fb	bow position	2019-10-04 21:02:40 +02:00
timokoesters	d46f1e1859	Initial bow & arrow implementation	2019-10-04 21:02:39 +02:00
Monty Marz	4c1eba1f3e	Assets update, aesthetics, minor fixes	2019-10-04 18:27:12 +00:00
Shane Handley	b1d775728a	Play some music on game launch	2019-10-05 02:31:24 +09:00
Mckol	9aba318df2	Hash the passwords client-side	2019-10-04 16:44:31 +00:00
Nicolas	6e4d556073	Add max chat message length Fixes #115 Credit to @scorpion9979 for the previous implementation (https://gitlab.com/veloren/veloren/merge_requests/215)	2019-10-04 16:14:54 +02:00
S Handley	810a7e5b5d	This is a re-commit of this feature from MR yarn run test where shandley had a catastrophic git cockup.	2019-10-04 09:58:58 +00:00
Acrimon	03bf74f414	Updated toolchain version and a bunch of deps.	2019-10-03 17:19:22 -04:00
Forest Anderson	6715f02a4e	Merge branch 'stevedagiraffe/add-option-to-invert-scroll-wheel' into 'master' Resolve #266 "Add option to invert scroll wheel" Closes #266 See merge request veloren/veloren!528	2019-10-02 23:39:32 +00:00
stevedagiraffe	f1b78d21c8	Formatted with fmt	2019-10-03 09:16:46 +10:00
Songtronix	bced3cb638	feat(voxygen): add logo for windows executable	2019-10-02 16:57:08 +02:00
stevedagiraffe	8680e92548	Added ability to toggle zoom inversion in settings Displayed as checkbox under the Gameplay tab.	2019-10-02 23:09:05 +10:00
stevedagiraffe	f149182290	associated zoom inversion to GameplaySettings	2019-10-02 22:44:41 +10:00
Justin Shipsey	27f3bebe40	Char overhaul and asset update	2019-10-02 10:05:17 +00:00
Imbris	83b5ca3335	Higher level cache abstraction	2019-10-01 02:10:28 -04:00
Imbris	89a1c45ac7	Cache most recent chunk access in terrain meshing	2019-10-01 02:10:28 -04:00
Carbonhell	6f6fdd87af	Function to cancel pending server connections in the login screen.	2019-09-29 19:12:26 +00:00
Monty Marz	11a022abb3	Better stepping sounds (and minor voxel model fixes)	2019-09-27 16:04:22 +00:00
Joshua Barretto	45fbd75907	Merge branch 'zesterer/small-fixes' into 'master' Zesterer/small fixes See merge request veloren/veloren!517	2019-09-27 13:09:55 +00:00
Joshua Barretto	8d2f1d470c	Removed unnecessary code	2019-09-27 14:03:08 +01:00
Joshua Barretto	a90ceddde0	Fixed cold near oceans, faster meshing	2019-09-27 12:46:20 +01:00
Joshua Barretto	09197049cb	Made meshing considerably faster	2019-09-27 11:06:32 +01:00
Imbris	5ca65a6894	UI tweaks	2019-09-27 00:23:42 -04:00
Imbris	799e962663	AA mode UI improvements	2019-09-26 23:46:49 -04:00
Imbris	a3daa6065a	Add aa modes, with ui interface to switch	2019-09-26 23:14:27 -04:00
Imbris	432e828517	Add MSAAx4	2019-09-26 23:14:27 -04:00
Joshua Barretto	ccc10a0447	Resolved warnings	2019-09-26 16:07:09 +01:00
Pfauenauge90	1a2b32b44b	fixed merging issue, tooltip descriptions colour	2019-09-26 16:00:24 +02:00
Joshua Barretto	3a8b146687	Added item descriptions to tooltip	2019-09-26 14:41:04 +01:00
Pfauenauge90	de4af54928	test tooltips	2019-09-26 15:16:58 +02:00
Pfauenauge90	b62ae6f4a7	fix	2019-09-26 15:16:57 +02:00
timokoesters	1fc7c9b67b	Fix rot_imgs and tooltip manager	2019-09-26 15:16:57 +02:00
Pfauenauge90	931e53ebbe	added item tooltips	2019-09-26 15:16:57 +02:00
Joshua Barretto	bdf74cf151	Fixed typo	2019-09-26 14:03:41 +01:00
Joshua Barretto	81dc77c87b	Resolved warnings	2019-09-26 13:34:15 +01:00
Joshua Barretto	59e6febb41	Fixed build placement bug, changed climb to LControl	2019-09-26 12:03:39 +01:00
Joshua Barretto	bef4f11536	Added sprite selection	2019-09-26 11:43:03 +01:00
Joshua Barretto	dff67e1c41	Added block collection, improved controls for it	2019-09-26 00:15:07 +01:00
Joshua Barretto	e22fe81a2f	Added velorite	2019-09-26 00:15:07 +01:00
Vechro	deec1e6bca	Remove player shadow on death	2019-09-26 00:15:07 +01:00
Joshua Barretto	f57c2ec453	Made consumable items have an effect, better damage animation	2019-09-26 00:15:07 +01:00
Joshua Barretto	a961a267f1	Added apple and mushroom collection	2019-09-26 00:15:07 +01:00
Joshua Barretto	b0a1619698	Fixed shadow distance culling	2019-09-26 00:15:07 +01:00
Joshua Barretto	499344ccab	Added entity shadows	2019-09-26 00:15:07 +01:00
Joshua Barretto	899a7c56ab	Dark water	2019-09-26 00:15:07 +01:00
Joshua Barretto	207568a012	Better day/night cycle, less intense sun	2019-09-26 00:15:07 +01:00
Pfauenauge90	dec418d1a4	char selection time and VD changed	2019-09-26 00:15:07 +01:00
Joshua Barretto	b62830b8b4	Better hills	2019-09-26 00:15:07 +01:00
Joshua Barretto	46fdc87014	Animated chunk loading	2019-09-26 00:15:07 +01:00
Joshua Barretto	8bcb3c44f7	Reminder about remesh for lighting updates	2019-09-26 00:15:07 +01:00
Joshua Barretto	2416b77a33	Meshing performance improvements	2019-09-26 00:15:07 +01:00
Joshua Barretto	3979dddbc1	Faster meshing, better AO, colour correction	2019-09-26 00:15:07 +01:00
Joshua Barretto	2bd8967921	Prevented extreme blending	2019-09-26 00:15:07 +01:00
Joshua Barretto	f1d590464f	Added colour smoothing	2019-09-26 00:15:07 +01:00
Joshua Barretto	6d745fc472	Fixed floodfill algorithm	2019-09-26 00:15:07 +01:00
Imbris	34221a0f1d	Disable AO	2019-09-26 00:15:07 +01:00
Joshua Barretto	d745acc948	Floodfill shadows, smooth shadow lighting	2019-09-26 00:15:07 +01:00
Shane Handley	ef3ad3519b	Update previous references to 'volume' to prevent ambiguity. Update label for audio device selection in settings dialog. I don't think it is displayed, but maybe useful for documentation.	2019-09-25 01:25:24 +09:00
Shane Handley	8cf6546dec	Add an additional SFX Volume control to the in-game settings dialog and supporting events.	2019-09-25 01:18:09 +09:00
Imbris	cceb21240b	Fix feature names	2019-09-21 13:41:02 -04:00
Monty Marz	11244bc182	Delete char window visuals, small scrolling fix for char creation background	2019-09-20 12:59:23 +00:00
Monty Marz	3a0131306f	Character assets Part 1	2019-09-18 16:46:12 +00:00
Imbris	2ad816449c	Make some voxygen dependencies optional	2019-09-15 17:03:33 -04:00
Imbris	28250c9f14	Fix always returning the default settings	2019-09-12 23:37:28 -04:00
Arash Outadi	b986603215	Run cargo fmt	2019-09-12 22:47:51 -04:00
Arash Outadi	57eb3b2de4	Add code path for invalid settings file	2019-09-12 22:47:50 -04:00
Joshua Barretto	3f2e22f039	Exponential interpolation for linear damping With an additional approximation to allow for the same size jumps given different framerates.	2019-09-09 19:11:40 +00:00
Joshua Barretto	933e48ac3b	Merge branch 'fix-jump-height' into 'master' Fix jump height See merge request veloren/veloren!485	2019-09-08 15:50:08 +00:00
Geno	247f0818c1	Footstep volume fix	2019-09-08 15:47:52 +00:00
Forest	c31b01b051	Bumped version	2019-09-08 11:15:46 -04:00
scott-c	2b3749d2f4	Fix performance regression; simplify FigureKey	2019-09-08 19:52:57 +08:00
Andrew Pritchard	2e63152d90	Merge branch 'fix-jump-height' into 'fix-jump-height' Fix jump height See merge request veloren/veloren!477	2019-09-07 12:48:49 +00:00
Timo Koesters	92c0edcb98	Merge branch 'timo-attack' into 'master' Fix wolfs not attacking and adjust movement while attacking See merge request veloren/veloren!484	2019-09-07 10:25:57 +00:00
timokoesters	9f83130466	Fix audio	2019-09-07 11:46:21 +02:00
haslersn	d99bef6803	voxygen: Make the `Terrain` struct generic	2019-09-06 15:43:31 +02:00
haslersn	1796c09ca1	common: Rework volume API See the doc comments in `common/src/vol.rs` for more information on the API itself. The changes include: * Consistent `Err`/`Error` naming. * Types are named `...Error`. * `enum` variants are named `...Err`. * Rename `VolMap{2d, 3d}` -> `VolGrid{2d, 3d}`. This is in preparation to an upcoming change where a “map” in the game related sense will be added. * Add volume iterators. There are two types of them: * _Position_ iterators obtained from the trait `IntoPosIterator` using the method `fn pos_iter(self, lower_bound: Vec3<i32>, upper_bound: Vec3<i32>) -> ...` which returns an iterator over `Vec3<i32>`. * _Volume_ iterators obtained from the trait `IntoVolIterator` using the method `fn vol_iter(self, lower_bound: Vec3<i32>, upper_bound: Vec3<i32>) -> ...` which returns an iterator over `(Vec3<i32>, &Self::Vox)`. Those traits will usually be implemented by references to volume types (i.e. `impl IntoVolIterator<'a> for &'a T` where `T` is some type which usually implements several volume traits, such as `Chunk`). * _Position_ iterators iterate over the positions valid for that volume. * _Volume_ iterators do the same but return not only the position but also the voxel at that position, in each iteration. * Introduce trait `RectSizedVol` for the use case which we have with `Chonk`: A `Chonk` is sized only in x and y direction. * Introduce traits `RasterableVol`, `RectRasterableVol` * `RasterableVol` represents a volume that is compile-time sized and has its lower bound at `(0, 0, 0)`. The name `RasterableVol` was chosen because such a volume can be used with `VolGrid3d`. * `RectRasterableVol` represents a volume that is compile-time sized at least in x and y direction and has its lower bound at `(0, 0, z)`. There's no requirement on he lower bound or size in z direction. The name `RectRasterableVol` was chosen because such a volume can be used with `VolGrid2d`.	2019-09-06 15:43:31 +02:00
Joshua Barretto	66c58840ef	Merge branch 'scott-c/first-person-model' into 'master' Add first person models See merge request veloren/veloren!443	2019-09-06 13:02:03 +00:00
scott-c	37d9acedb0	cleanup comment	2019-09-06 20:22:17 +08:00
scott-c	fcdb0843fc	Cleanup unused import	2019-09-06 19:35:47 +08:00
scott-c	930e075ad1	half camera height when rolling	2019-09-06 19:29:52 +08:00
Joshua Barretto	f574b1748a	Merge branch 'desttinghim/sound-effects' into 'master' Sound Effects Closes #163 and #97 See merge request veloren/veloren!473	2019-09-06 11:19:32 +00:00
scott-c	645debe230	Hide player hands when rolling in first person	2019-09-06 19:12:46 +08:00
Louis Pearson	7f27385f95	Removed unescessary if statements	2019-09-06 05:02:29 -06:00
scott-c	836525c33a	Simplify model cache key, fixes performance issue	2019-09-06 18:59:05 +08:00
Louis Pearson	02af86d2d6	Change ear pos to Vec3	2019-09-06 04:44:15 -06:00
Louis Pearson	059d968499	Cargo fmt	2019-09-06 04:38:02 -06:00
Louis Pearson	675d72a3ce	Code cleanup	2019-09-06 04:36:42 -06:00
Louis Pearson	57fe89e5c8	Fix warnings	2019-09-06 04:25:17 -06:00
scott-c	bc1ccfc99b	Fix first person weapon visible while not wielding	2019-09-06 18:22:26 +08:00
Louis Pearson	3fe12ee85f	Fix settings move	2019-09-06 04:06:26 -06:00
Andrew Pritchard	b4c74279b7	Vec3 is apprently not Copy, Set near plane to 0.1 to prevent tirangle flickering	2019-09-06 13:24:42 +08:00
Monty Marz	943495c0c5	Pixel art for axe and flying rod, shadow for zone names and death message	2019-09-05 17:28:33 +00:00
Louis Pearson	8e5f993a5b	Format files	2019-09-05 03:11:18 -06:00
Louis Pearson	2bca20cf69	Get sound effects working	2019-09-05 03:08:09 -06:00
Louis Pearson	529cb40dc4	Add soundcache Still getting the stuttering. Time to rethink channels	2019-09-05 03:08:09 -06:00
Louis Pearson	65008f7d54	Adds proper 3d sound? Looks like loading the footstep files every time a sound is played becomes a problem rather quickly.	2019-09-05 03:08:09 -06:00
Louis Pearson	b5a979c82e	Change footstep rate	2019-09-05 03:08:09 -06:00
Louis Pearson	00830108e9	Add positional audio Orientation needs to be set now	2019-09-05 03:08:09 -06:00
Louis Pearson	fcb141a160	Add delay to walking sounds	2019-09-05 03:08:09 -06:00
Louis Pearson	ad3bd0b2ce	Add footstep sounds, implement crude footstep sounding Sounds are played every tick, which is not good.	2019-09-05 03:08:09 -06:00
Louis Pearson	41cd20aaf8	Add play_music call to audiofrontend	2019-09-05 03:08:09 -06:00
Louis Pearson	132d108086	Remove audio/base.rs	2019-09-05 03:08:09 -06:00
Louis Pearson	447cfec19f	Add support for fading sounds	2019-09-05 03:08:09 -06:00
Louis Pearson	9dc1f8f549	Revamp AudioFrontend audio::base had a lot of unnescessary abstractions and constructs. The current code simplifies the API in a way that makes sense and that will allow sound effects and fading to be added in an incremental way.	2019-09-05 03:08:09 -06:00
Louis Pearson	0fe5b66dce	Use latest version of Rodio instead of custom branch	2019-09-05 03:04:53 -06:00
scott-c	d045dbb2f6	Reduce first person camera interpolation time	2019-09-04 22:05:59 +08:00
scott-c	5fd4f00012	Add first person models	2019-09-04 22:05:59 +08:00
Imbris	fc9c87878e	Fix some warnings, cleanup comment	2019-09-03 23:09:29 -04:00
Imbris	8a994ada8e	Remove derpy eyes :( , fix undead eye indices, fmt	2019-09-03 23:06:15 -04:00
Imbris	cc331c10b6	Remove use of empty.vox	2019-09-03 23:06:09 -04:00
Imbris	074eee06e6	Add pants coloring, chest and pants sliders	2019-09-03 23:06:06 -04:00
Imbris	0ffc534df2	Add separate eye color lists for each race	2019-09-03 23:06:02 -04:00
Imbris	c4999f5e9d	adjust how figure head coloring is done	2019-09-03 23:05:58 -04:00
Imbris	9d086949d1	Add basic index based coloring for figures	2019-09-03 23:05:56 -04:00
Imbris	fd251c4d3a	Fix sliders, remove uneeded method, fix aspect ratio in character creation	2019-09-03 23:05:54 -04:00
Imbris	7bebffb2af	Add ron file for head offsets, segment unionizer	2019-09-03 23:05:52 -04:00
Imbris	6289ce8c7f	Split up figure.rs	2019-09-03 23:05:50 -04:00
Imbris	ab34377309	Add basic segment combination	2019-09-03 23:05:50 -04:00
Imbris	0668823493	Save settings, start log, & set panic hook first	2019-09-03 23:05:47 -04:00
Marcel	9a9ac6bebf	Merge branch 'imbris/tooltip-enhancements' into 'master' Add ImageFrame widget, make tooltips use this, align ui to the pixels properly See merge request veloren/veloren!474	2019-09-03 06:44:38 +00:00
Imbris	625f83e535	Don't add adjacent duplicates to the history	2019-09-02 01:07:16 -04:00
Imbris	47d0904588	Directly adjust chat input when traversing history	2019-09-02 00:54:44 -04:00
tommy	12029d7e7f	Added SetText event, rewritten based on comments	2019-09-01 23:43:06 -04:00
tommy	a63e67b8d9	Basic chat window history functionality	2019-09-01 23:43:04 -04:00
Imbris	e8e053095b	Remove copy-pasted comment	2019-09-01 16:41:40 -04:00
Imbris	ba186e59cc	Adjust tooltip layout by moving title to the right of images	2019-09-01 16:30:26 -04:00
Imbris	3d7326b65f	Tooltips: make title optional, improve spacing, make it simple to add similar tooltips to multiple widgets	2019-09-01 15:34:21 -04:00
Imbris	3ccbb0f38d	Convert tooltips to use ImageFrame, add autosizing	2019-09-01 15:34:20 -04:00
Imbris	e9bedf529d	Pixel perfection, vox orientation, image rotation	2019-09-01 15:34:20 -04:00
Imbris	66ebdb2355	Add ImageFrame widget	2019-09-01 15:34:19 -04:00
Monty Marz	f53904b534	More sprites, ui fixes, lianas	2019-09-01 19:04:03 +00:00
Joshua Barretto	6919886475	Merge branch 'zesterer/worldgen' into 'master' Worldgen improvements See merge request veloren/veloren!457	2019-08-31 21:37:54 +00:00
Joshua Barretto	cc214982bf	Fixed warnings	2019-08-31 11:44:52 +01:00
Joshua Barretto	17a61e0b7c	Fixed terrain sprite transparency issue	2019-08-31 11:44:52 +01:00
Joshua Barretto	27c208d1a5	Fixed terrain sprite transparency layering	2019-08-31 11:44:52 +01:00
Joshua Barretto	1fcb4a0313	Added Generator trait, fixed ocean lighting	2019-08-31 11:44:52 +01:00
jshipsey	bb71bdd4a2	removing to make gitlab compiler happy	2019-08-30 23:18:56 -04:00
jshipsey	3c473d6d6c	rebase	2019-08-30 23:01:29 -04:00
jshipsey	b81cd6a8f9	combine character.action movement blocks	2019-08-30 22:51:46 -04:00
timokoesters	9a832dd56b	Move std::mem::discriminant into new method	2019-08-30 22:51:46 -04:00
timokoesters	d822356161	Remove warning	2019-08-30 22:51:46 -04:00
jshipsey	78bf7a0997	slowed movement for block/attack, cleaned up code, made foot speed velocity dependent, tweaked blocking animation	2019-08-30 22:50:53 -04:00
timokoesters	b99bac87db	Make npcs roll correctly	2019-08-30 22:50:53 -04:00
timokoesters	77a48c61a1	Fix rolling for the player	2019-08-30 22:50:53 -04:00
jshipsey	d84c07c1cb	fixed tiny feet in char creation	2019-08-30 22:50:53 -04:00
jshipsey	f8d0b1040a	readded cidle	2019-08-30 22:50:53 -04:00
jshipsey	bec942753e	some stuff fixed, other stuff still broken	2019-08-30 22:50:53 -04:00
timokoesters	cd3e340647	Use movement anim as base and action anim as overwrite	2019-08-30 22:50:53 -04:00
jshipsey	e6197d4c10	separate static anims for feet (run/static)	2019-08-30 22:50:53 -04:00
timokoesters	637b4642d8	Split animations	2019-08-30 22:50:53 -04:00
timokoesters	15978d216b	Rename controller main, alt to primary, secondary	2019-08-31 00:13:45 +02:00
timokoesters	bd8e71c5aa	Rename activate_inventory_slot to use_inventory_slot	2019-08-30 22:46:45 +02:00
timokoesters	b063694d05	Implement icons based on weapon	2019-08-29 21:48:05 +02:00
timokoesters	952ec35857	Remove warnings	2019-08-29 19:54:53 +02:00
Pfauenauge90	12365ee381	Axe offset	2019-08-29 19:44:29 +02:00
Pfauenauge90	9a391332a6	fmt	2019-08-29 19:44:29 +02:00
Pfauenauge90	50c4764588	changed debug wand visuals, added icons for 2h sword main and alt attack	2019-08-29 19:44:29 +02:00
timokoesters	6e1c78e5d5	Add debug mode item giving speed boost in look_dir on click	2019-08-29 19:44:28 +02:00
timokoesters	155605841b	Use comp::Stats to store Equipment, make char weapon selection work	2019-08-29 19:44:28 +02:00
yashaslokesh	be71aea20b	Changed exp type from f64 to u32 and altered exp calculations and function signatures to adhere to the new types Signed-off-by: Yashas Lokesh <yashas.lokesh@gmail.com>	2019-08-27 22:33:14 +00:00
timokoesters	cd061aba85	Make respawn hint text base on key bindings	2019-08-27 14:42:53 +02:00
timokoesters	6b4dfcc533	Allow mapping the same key to multile actions (LMB = attack + respawn)	2019-08-27 14:03:40 +02:00
timokoesters	186db16707	Rename attack, block to main, alt	2019-08-27 14:03:39 +02:00
timokoesters	84d0f61596	Make pipeline succeed	2019-08-26 14:05:17 +02:00
timokoesters	c4879307af	Update to github vek repo	2019-08-26 13:12:45 +02:00
timokoesters	eb34e5bb27	fmt	2019-08-26 13:12:43 +02:00
timokoesters	a715a84ea7	Implement unstoppable rolling	2019-08-26 13:12:42 +02:00
timokoesters	e90f95bc75	Look in the direction of the camera	2019-08-26 13:12:38 +02:00
jshipsey	39bd888a7c	idle block animation	2019-08-26 13:12:38 +02:00
timokoesters	e7c61c30cc	Block when pressing right click while looking at the attacker	2019-08-26 13:12:37 +02:00
Vechro	0f0a28d87a	Small changes to velocity	2019-08-22 22:26:35 +03:00
Vechro	2077548d5c	Simplify debug info	2019-08-22 21:53:46 +03:00
Monty Marz	fade04d44e	Pfauenauge/plants grass	2019-08-21 17:22:05 +00:00
Joshua Barretto	0fcb3a174d	Random terrain sprite orientations	2019-08-21 16:22:49 +01:00
Joshua Barretto	75e1ee3cd7	Added per-instance transformation matrix, variable wind swaying	2019-08-21 13:47:29 +01:00
Joshua Barretto	590ce1a987	Fixed sprite mesh offsets	2019-08-20 16:54:12 +01:00
Joshua Barretto	4ed21a2e59	Sprite render distance tweaks and optimisations	2019-08-20 11:05:01 +01:00
Joshua Barretto	5f09ab3a4f	Added multiple sprite block kind support	2019-08-20 00:31:11 +01:00
Joshua Barretto	7960e6ea6d	Sprite distance fading, grass	2019-08-19 22:54:16 +01:00
Joshua Barretto	b31cca4bb3	Added wheat and sprite rendering	2019-08-19 21:09:35 +01:00
Joshua Barretto	6f35786b84	Added Instances construct	2019-08-19 18:23:47 +01:00
Joshua Barretto	e2082088c8	Added sprite pipeline	2019-08-19 18:01:23 +01:00
Acrimon	a41cf1a83d	Disabled unsafe using lint level.	2019-08-19 14:39:23 +02:00
Monty Marz	7168850f05	Fix low fps	2019-08-19 08:03:19 +00:00
Monty Marz	29f6186139	hotbar changes completely switched to. vox files easier to see design gradient and numbers on the health/mana bar	2019-08-18 18:07:21 +00:00
Joshua Barretto	75dbebbd05	More interesting waves	2019-08-18 10:33:18 +01:00
Joshua Barretto	f0e52e6002	Better reflections and water fog	2019-08-18 10:33:18 +01:00
Joshua Barretto	825d8bb632	Fixed water in caves, made water reflection vary with lighting	2019-08-18 10:33:18 +01:00
Joshua Barretto	fa6825f13b	Better fluid meshing, disabled fluid backface culling and depth buffer writing	2019-08-18 10:33:18 +01:00
Joshua Barretto	42237a84e4	Added translucent meshing pass, water reflections	2019-08-18 10:33:18 +01:00
Luc Fauvel	4a29900914	Copying terrain pipeline and shaders for fluids	2019-08-18 10:33:18 +01:00
jshipsey	2ca81323d5	added shoulder movement and fixed placement	2019-08-18 02:35:27 -04:00
Imbris	f12821db35	Merge branch 'imbris/srgb' into 'master' Handle srgb values more accurately, Load shaders at runtime + hotloading Closes #79 See merge request veloren/veloren!412	2019-08-16 22:44:14 +00:00
Joshua Barretto	e9fc2789d1	Merge branch 'scott-c/cull-entities-outside-viewport' into 'master' Scott c/cull entities outside viewport Closes #207 See merge request veloren/veloren!442	2019-08-16 16:47:02 +00:00
scott-c	fce74c6218	cargo fmt	2019-08-17 00:11:06 +08:00
scott-c	2fabdfe0eb	unwrap_or instead of map_or	2019-08-17 00:08:09 +08:00
scott-c	dc73e4ffb7	use entity scale as hitbox for frustrum culling	2019-08-16 23:39:07 +08:00
scott-c	f312299e62	Replace view distance culling with frustum culling	2019-08-16 21:45:10 +08:00
Imbris	d89fff1499	Fix typo, move shaders back out of subfolders	2019-08-15 23:59:10 -04:00
Imbris	be0e0e52a8	Improve colors	2019-08-15 23:59:09 -04:00
Imbris	c09eb77149	Add srgb converion in shaders	2019-08-15 23:56:14 -04:00
Imbris	cb25c45dec	Move shaders, start asset reloading system	2019-08-15 23:56:12 -04:00
Acrimon	fda47fc322	[Voxygen] Switch mutexes to parking_lot and channels to crossbeam.	2019-08-16 00:07:09 +02:00
Piotr Korgól	0221de484e	Give singleplayer its own server settings	2019-08-14 17:51:59 +02:00
Geno	a9f20148a4	added first person switch	2019-08-13 17:54:13 +00:00
Acrimon	b4a46f3e6e	Finished switch to hashbrown.	2019-08-11 22:38:28 +02:00
Acrimon	0bbef0d851	Use hashbrown in voxygen instead of a billion different shitty maps.	2019-08-11 21:52:23 +02:00
Joshua Barretto	2191921721	Merge branch 'telastrus/auth' into 'master' Server-side authentication See merge request veloren/veloren!419	2019-08-09 01:37:44 +00:00
telastrus	07d3384b01	fixed the silent kick, made it actually proper	2019-08-08 17:58:36 -04:00
telastrus	66e254db7f	actually removed printlns	2019-08-08 12:09:14 -04:00
telastrus	35a3f67e19	ran cargo fmt	2019-08-08 12:05:38 -04:00
telastrus	de2082469d	auth done, no popup yet	2019-08-08 12:01:15 -04:00
telastrus	f2ed2870c6	90% there	2019-08-08 11:23:58 -04:00
telastrus	09b15e5278	velocity fix	2019-08-08 10:42:23 -04:00
telastrus	6d94d43021	still compiles	2019-08-07 23:56:02 -04:00
telastrus	157c4816b3	laying the groundwork	2019-08-07 15:42:44 -04:00
Monty Marz	aac53f9311	Part 1 of implementing the social window	2019-08-07 13:14:26 +00:00
telastrus	e4f2c73b85	undo unnecessary pub mod fixed comments fixed other comment	2019-08-06 22:46:25 -04:00
telastrus	0eafd42c0f	fall damage + velocity debug	2019-08-06 17:51:13 -04:00
Joshua Barretto	73a44d0fb1	Collision fixes, better camera in build mode	2019-08-06 16:00:14 +01:00
Marcel	86be3fccfc	Merge branch 'timo-cleanup' into 'master' Implement specifier syntax and cleanup See merge request veloren/veloren!413	2019-08-06 06:52:24 +00:00
timokoesters	1227596406	Implement specifier syntax and cleanup	2019-08-06 08:31:48 +02:00
telastrus	4dcb53bdb8	reverted some unnecessary changes corrected typo ran cargo fmt	2019-08-05 19:41:31 -04:00
telastrus	c098a5efd7	Added adjustable FOV slider	2019-08-05 12:37:52 -04:00
Joshua Barretto	a324f01a1d	Improved orientation slerping	2019-08-04 15:51:17 +01:00
Joshua Barretto	e5bcc8912e	Stopped stars appearing in the day	2019-08-04 15:30:45 +01:00
Piotr Korgól	d3f2ca69a4	Change the version number to 0.3	2019-08-04 13:53:59 +02:00
Joshua Barretto	783e8dbfc0	Reverted parenthesis removal	2019-08-04 12:35:03 +01:00
Joshua Barretto	8abfd2e10f	Reverted sun diffuse change	2019-08-04 12:25:15 +01:00
Tesseract	c36c78252c	Reverted to old star shader	2019-08-04 12:25:15 +01:00
Tesseract	ec34fcf9c8	Optimised fragment and vertex shaders. Framebuffer depth target changed from DEPTH24_STENCIL8 to DEPTH24 for faster depth writing and reading (no bitwise operations needed).	2019-08-04 12:25:15 +01:00
Monty Marz	8c1d244bf8	New Female Danari and Elf models, Airblocks for tower ruins and witch house	2019-08-04 11:23:01 +00:00
Joshua Barretto	c9f1a793db	Merge branch 'timo-kill-xp' into 'master' Give xp depending on max hp and lvl of entity killed See merge request veloren/veloren!400	2019-08-03 20:57:06 +00:00
timokoesters	7365dbe9e6	Give xp depending on max hp and lvl of entity killed	2019-08-03 21:30:01 +02:00
Joshua Barretto	fe0097c085	Made nametag position change with scale	2019-08-03 19:40:20 +01:00
Joshua Barretto	51fa4f3cfc	Merge branch 'animation-tweaks' into 'master' animation and movement tweaks See merge request veloren/veloren!389	2019-08-03 12:09:38 +00:00
timokoesters	6f598681fb	Fix combat animations for non humanoids	2019-08-03 12:53:39 +01:00
Joshua Barretto	677c5781ba	Added bosses, improved secret object spawn rates	2019-08-02 20:10:52 +01:00
jshipsey	13310ab9ca	improved animations and movement	2019-08-01 23:57:26 -04:00
Dominik Broński	f644b6ab89	Revert "Merge branch 'imbris/upgrade_specs' into 'master'" This reverts merge request !375	2019-08-01 23:32:33 +00:00
Imbris	5f56657f6c	Upgrade specs to 0.15	2019-08-01 18:09:13 -04:00
Monty Marz	a5926eb40a	0.3. login bg	2019-08-01 17:53:34 +00:00
Piotr Korgól	ec550620ad	Add a health bonus for level ups, fix pets	2019-08-01 18:56:08 +02:00
Joshua Barretto	cb8e3b9805	Fixed absolute darkness	2019-08-01 09:12:00 +01:00
Joshua Barretto	39fc1d6b71	Added entity pickup, changed item model	2019-08-01 09:12:00 +01:00
Joshua Barretto	331b6c8b3a	Altered Item structure	2019-08-01 09:12:00 +01:00
Joshua Barretto	b3cae2f3dd	Added better item manipulation	2019-08-01 09:09:26 +01:00
Joshua Barretto	fc49293874	Clickthrough on items	2019-08-01 09:09:26 +01:00
Pfauenauge90	37ee5b2802	fixed UI layering leading to unresponsive slots	2019-08-01 09:09:26 +01:00
Joshua Barretto	31f8794c39	Started work on inventory manipulation	2019-08-01 09:09:26 +01:00
Joshua Barretto	123a78552a	Fixed block-hopping on edges, added correct inventory slots	2019-08-01 09:09:26 +01:00
Monty Marz	5cfc60da50	Small chat fixes	2019-07-29 14:40:46 +00:00
Monty Marz	96b677a2b0	Tooltips	2019-07-29 14:06:13 +00:00
Acrimon	ee49ebe807	Update rand, log and scan_fmt	2019-07-29 13:42:26 +00:00
Joshua Barretto	4a198ca626	Numerous minor lighting fixes	2019-07-29 13:01:39 +01:00
Imbris	ff518a4a23	Ui scaling interface tweaks	2019-07-28 16:54:32 -04:00
Pfauenauge90	8e15117be7	set min and max values	2019-07-28 16:54:32 -04:00
Pfauenauge90	d33bbf26ad	aligned value position to crosshair transp. value	2019-07-28 16:54:32 -04:00
Pfauenauge90	e15c4eb40b	changed displayed value for scale	2019-07-28 16:54:31 -04:00
Pfauenauge90	1567c63421	checkboxes functionality	2019-07-28 16:54:31 -04:00
Pfauenauge90	7ce71dda02	visuals change	2019-07-28 16:54:31 -04:00
Imbris	4ad42c57e4	Add ui scale setting and slider	2019-07-28 16:54:30 -04:00
timokoesters	5aa864ee58	Update most dependencies	2019-07-28 22:47:23 +02:00
Monty Marz	33565b9480	added comment about object rotation, changed lantern spawning command, changed /tell output when you /tell yourself	2019-07-28 09:21:17 +00:00
Piotr Korgól	198d532e38	Show level and xp on character menu	2019-07-27 15:04:34 +02:00
Piotr Korgól	5c84508015	Get EXP for killing NPCs and Players, properly show EXP bar	2019-07-26 20:51:40 +02:00
Piotr Korgól	b1aace0110	Add Level and Exp component	2019-07-26 16:44:59 +02:00
tommy	95b5f4acfb	Added private, broadcast, and game_state messages	2019-07-26 07:29:37 -04:00
tommy	cc6aa6f33d	Adds colour to tells in chat box #194	2019-07-26 07:29:37 -04:00
Nero	53086cb3b2	Nero/light offsets	2019-07-25 20:51:20 +00:00
Piotr Korgól	46f19c8f64	Fix build mode inaccuracy	2019-07-25 15:00:17 +02:00
Piotr Korgól	4f73cc921b	Properly hide the player character	2019-07-24 16:45:27 +02:00
Piotr Korgól	fd841cdd33	An attempt at hiding the player in first person mode	2019-07-24 16:09:16 +02:00
Piotr Korgól	e33deac740	Change FP Mode distance to 0.1 to fix building	2019-07-24 15:04:12 +02:00
Piotr Korgól	00f490c3bf	Zoom out the camera when entering third person mode	2019-07-24 15:04:12 +02:00
Piotr Korgól	36948890a3	Add camera modes	2019-07-24 15:04:12 +02:00
Pfauenauge90	7aef8b10cd	offsets	2019-07-24 03:01:35 +02:00
Pfauenauge90	7a141ad111	More objects	2019-07-24 02:50:19 +02:00
Pfauenauge90	9fd2849c6c	chat warning for unknown objects	2019-07-24 02:50:19 +02:00
Pfauenauge90	85281e7e54	spawn objects by name	2019-07-24 02:50:19 +02:00
Vechro	f3c5ece983	Add tent	2019-07-24 02:50:19 +02:00
Vechro	81f66457de	Add cauldron	2019-07-24 02:50:19 +02:00
Acrimon	551433f03a	Hook the tracking allocator into binaries. Doesn't do any monitoring/logging. Just provides the data when you want it.	2019-07-24 02:18:50 +02:00
Sheldon Knuth	c2fa8bd615	[FIX] Callback hell of AudioDevice construction while opening audio settings window.	2019-07-23 09:54:41 +00:00
Monty Marz	7a4ad099ff	Crosshair variations	2019-07-23 01:02:57 +00:00
Monty Marz	ae4c569fc9	Static entities: Per model offsets, more models	2019-07-21 23:54:31 +00:00
Joshua Barretto	1cf8383eba	Moved lighting uniforms into light.glsl	2019-07-21 19:22:49 +01:00
Joshua Barretto	5cdfb26e0d	Added LightEmitter component	2019-07-21 19:22:49 +01:00
Joshua Barretto	16c8ecec66	Fixed light cap	2019-07-21 19:22:49 +01:00
Joshua Barretto	b34d22565e	Added point lights	2019-07-21 19:22:49 +01:00
Joshua Barretto	1dc654dde7	Added object entities	2019-07-21 19:22:49 +01:00
Tom Watson	cd456b6e2d	Revert "Add server name to char selection screen" This reverts commit `a4a9b97273`.	2019-07-21 18:13:17 +00:00
Songtronix	de2dbcef45	add global git hash constant	2019-07-21 17:45:31 +00:00
Joshua Barretto	215a09005e	Only change entity orientation when on the ground	2019-07-21 00:18:03 +01:00
Joshua Barretto	ce327445a7	Send block diffs instead of entire chunks on block change	2019-07-20 16:41:03 +01:00
Marcel Märtens	98b0a40a22	Change default port of veloren from 59003 to 14004 TCP and UDP Ports for applications should lie in a range between 1024-49151 the ports below are used for privileged services the ports above should be dynamicly assigned. Port 14004 seems to be used by no other service and i like it personally, so we choose it. Also deactivate the workaround for the secondary veloren server again	2019-07-20 13:59:35 +02:00
Joshua Barretto	44b3f67347	Merge branch 'zesterer/better_voxygen_errors' into 'master' Switched to Debug trait object for backend errors See merge request veloren/veloren!344	2019-07-20 11:14:29 +00:00
Tom Watson	3a1ae1b361	Send commands on client launch, closes #190	2019-07-18 22:50:46 +00:00
Joshua Barretto	752eca07b8	Switched to Debug trait object for backend errors	2019-07-18 16:42:31 +01:00
Forest Anderson	4ffe60f8e3	Merge branch '187_persist_default_server' into 'master' Save the server index when it changes, closes #187 Closes #187 See merge request veloren/veloren!332	2019-07-17 17:35:21 +00:00
Songtronix	b6c8bdc223	add configurable max player count	2019-07-17 18:32:01 +02:00
Songtronix	bbb024224d	add configureable server info	2019-07-17 18:32:01 +02:00
Songtronix	1213d9844b	add customizable port and worldseed	2019-07-17 18:32:00 +02:00
Marcel Märtens	242cdbe6e5	Change the default port for the veloren server because the original server is unanvailable for a few days and the secondary server cannot use the default veloren port	2019-07-15 19:42:13 +02:00
Monty Marz	ff6a72bc40	New orc head models	2019-07-14 14:34:47 +00:00
tommy	19ff836676	Remove TODO	2019-07-13 08:41:50 -04:00
tommy	f15194b6f8	Save the server index when it changes #187	2019-07-12 20:26:17 -04:00
Acrimon	20ac81a986	Fixed some misses.	2019-07-12 20:51:22 +02:00
Joshua Barretto	92d4b4dfbe	Smoothed world borders	2019-07-09 21:42:27 +01:00
Joshua Barretto	bb50bb8c81	Improved sunset shaders	2019-07-08 22:38:31 +01:00
Joshua Barretto	d79f7d9714	Colour improvements	2019-07-08 22:10:48 +01:00
Joshua Barretto	c2a11ed6b2	Improved worldgen performance with more precise z bound checks	2019-07-08 15:51:38 +01:00
Joshua Barretto	44b5473a82	Added rare structures, totally refactored structure spawning	2019-07-08 00:50:36 +01:00
jshipsey	529281e2c3	removed weapon_id attribs, replaced with matches	2019-07-07 19:24:20 -04:00
jshipsey	12667b9172	fmt	2019-07-07 18:06:29 -04:00
jshipsey	5cd1bfb3d2	adds support for animation substates, animates run/idle/jump for hammer	2019-07-07 18:04:27 -04:00
Forest Anderson	d45acdc645	Merge branch 'inventory-items' into 'master' crosshair changes (WIP!), inventory visuals, camera changes, savannah trees See merge request veloren/veloren!317	2019-07-07 15:42:50 +00:00
Pfauenauge90	0cc3c76542	fmt	2019-07-07 17:31:34 +02:00
Pfauenauge90	7f45d274a8	clean up	2019-07-07 16:19:20 +02:00
Pfauenauge90	f3bda57e67	fmt	2019-07-07 16:19:20 +02:00
Pfauenauge90	70f8fe9002	ui scaling relative to window size	2019-07-07 16:19:20 +02:00
Pfauenauge90	c27d55db6c	less numbers for the indicator text	2019-07-07 16:19:20 +02:00
Pfauenauge90	ff6d7206a3	fix	2019-07-07 16:19:19 +02:00
Pfauenauge90	94acd0f437	Crosshair transp slider	2019-07-07 16:19:19 +02:00
Pfauenauge90	3be2951029	crosshair correction	2019-07-07 16:19:19 +02:00
Pfauenauge90	de1cf1371c	colour and camera corrections	2019-07-07 16:19:19 +02:00
Pfauenauge90	d4a6f0c202	camera changes and nametag colour	2019-07-07 16:19:18 +02:00
Pfauenauge	bd94baa125	Added crosshair TODO	2019-07-07 16:19:18 +02:00
Pfauenauge	d186c4031e	Sharp crosshair (no multisampling)	2019-07-07 16:19:18 +02:00
Pfauenauge90	7455155198	more test items	2019-07-07 16:19:18 +02:00
Pfauenauge90	89cadf27be	fix fonts	2019-07-07 16:19:18 +02:00
Pfauenauge90	50e15333cd	set the inventory space test button to false by default and increased the starting inventory size to 10	2019-07-07 16:19:17 +02:00
Pfauenauge90	b99bd4a20a	Bag window expands with available space	2019-07-07 16:19:17 +02:00
Pfauenauge90	381b9cabd1	fmt	2019-07-07 16:19:17 +02:00
Pfauenauge	e66419b396	smaller border for available slots, item image size changed	2019-07-07 16:19:17 +02:00
Pfauenauge	991e4b15e5	fmt	2019-07-07 16:19:16 +02:00
Pfauenauge	03894cb2ab	Comments on example item, removed printing of available inventory space No.	2019-07-07 16:19:16 +02:00
Pfauenauge90	3ab01bd86b	added visual test item	2019-07-07 16:19:16 +02:00
Pfauenauge90	ff7fb032a4	fixed scaling of the slots	2019-07-07 16:19:16 +02:00
Pfauenauge90	be64662b14	added active inventory slots	2019-07-07 16:19:16 +02:00
Pfauenauge90	f4499e26af	added visual test item	2019-07-07 16:19:15 +02:00
Pfauenauge90	626978213f	fixed scaling of the slots	2019-07-07 16:19:15 +02:00
Pfauenauge90	12e7d749ec	added active inventory slots	2019-07-07 16:19:15 +02:00
Songtronix	07754b0a79	fmt	2019-07-07 16:16:07 +02:00
Songtronix	b4fe69be22	Fix warnings	2019-07-07 16:16:07 +02:00
Songtronix	8220564fa6	Fix rebasing issues	2019-07-07 16:16:07 +02:00
Songtronix	6fa086b964	remove expects, warnings, code duplication	2019-07-07 16:16:06 +02:00
Songtronix	2338084af0	Add Linux support	2019-07-07 16:16:06 +02:00
Songtronix	5ea624674d	add comment and logging error	2019-07-07 16:16:06 +02:00
Songtronix	1be8f5e422	Update status according the play state	2019-07-07 16:16:05 +02:00
Songtronix	1e40bd09ba	working discord presence	2019-07-07 16:16:05 +02:00
Songtronix	60500d9235	add discord feature with dependencies	2019-07-07 16:16:05 +02:00
Songtronix	9007f4aa5a	Adjust volume on startup	2019-07-07 14:12:28 +00:00
Forest Anderson	0ed35d3ef4	Fix rustc warning	2019-07-07 04:37:22 +00:00
Forest Anderson	5442bbfe62	Force CI to block on rustc warnings	2019-07-07 03:24:22 +00:00
Joshua Barretto	6a484ce162	fmt	2019-07-06 20:00:17 +01:00
Joshua Barretto	33b7e729c9	Added block picking	2019-07-06 20:00:17 +01:00
Joshua Barretto	d2ccbafe59	Made mesh scheduling fairer	2019-07-06 20:00:17 +01:00
Joshua Barretto	0c9843999b	fmt	2019-07-06 20:00:17 +01:00
Joshua Barretto	51ad1f1995	Improved remeshing performance	2019-07-06 20:00:17 +01:00
Joshua Barretto	6709b18cb6	Made shadows darker	2019-07-06 20:00:17 +01:00
Joshua Barretto	ef973faadf	Throttled mesh scheduling to improve remesh performance	2019-07-06 20:00:17 +01:00
Joshua Barretto	6fc2096dae	Reenabled towns, lighter days	2019-07-06 20:00:17 +01:00
Joshua Barretto	1641c4f788	Added mesh worker queue limit to prevent throttling of meshing queue	2019-07-06 20:00:17 +01:00
timokoesters	215693137b	Implement chat command key	2019-07-05 18:21:11 +02:00
timokoesters	203b3d4e76	Fix attacking bug	2019-07-04 20:14:14 +02:00
Piotr Korgól	e267ac7ed4	Resolve discussion	2019-07-04 19:33:59 +02:00
Piotr Korgól	356f5cb47a	Fix not being able to respawn in build mode	2019-07-04 19:25:09 +02:00
jshipsey	02ac56d84d	clearing animation warnings	2019-07-04 10:58:59 -04:00
Songtronix	61d0474e6c	comment out unused structs/functions in voxygen/audio	2019-07-04 14:27:28 +00:00
timokoesters	d7c159a4e1	Fix warnings all around voxygen	2019-07-04 14:08:01 +02:00
timokoesters	c2f7f69a69	Clean up ui	2019-07-04 13:24:44 +02:00
Piotr Korgól	04d3c077d0	Remove printlns	2019-07-03 22:38:28 +02:00
Piotr Korgól	e79f763226	Small cleanup to block placing and breaking	2019-07-03 22:28:13 +02:00
Piotr Korgól	42a4cc8095	Add block breaking	2019-07-03 21:56:54 +02:00
timokoesters	a702f7258a	Fix building	2019-07-03 21:28:07 +02:00
Piotr Korgól	fbdc1d954a	Handle block placing.	2019-07-03 21:28:07 +02:00
Piotr Korgól	e212d4d6f9	Fix comment	2019-07-03 21:28:07 +02:00
Piotr Korgól	7cf299503d	Add crosshair	2019-07-03 21:28:07 +02:00
Louis Pearson	67bfc6c4cf	Add field to turn off audio in settings	2019-07-03 13:13:38 -06:00
Sheldon Knuth	6d624e96a6	fix the missing set_playing(true) in AudioPlayer::load() to prevent infinity thread loop & adopt std::sync::{Mutex, Condvar} for accurate thread blocking.	2019-07-03 17:23:24 +00:00
Imbris	d2f8c47361	Pass BufReader to Asset::load()	2019-07-03 05:02:01 -04:00
Imbris	ce33a6e1f8	Remove warnings	2019-07-02 23:09:37 -04:00
Imbris	cff79eadc9	Add glyph cache resizing, move when resize occurs	2019-07-02 22:31:20 -04:00
Imbris	b5ed35fd27	Smaller graphics cache that removes unused items	2019-07-02 21:21:36 -04:00
Songtronix	0c0e93a61f	clean voxygen rs files	2019-07-02 21:29:38 +00:00
Songtronix	0c3d693561	clean warnings from voxygen/hud	2019-07-02 21:25:07 +00:00
Sheldon Knuth	c3671590e9	Loading `no-audio` mode from the game start without `rodio` crate initialisation completely	2019-07-02 18:35:40 +00:00
timokoesters	f5da167ce5	Fix warnings and clippy recommendations in common	2019-07-02 15:48:25 +02:00
Joshua Barretto	6dae0c8cd2	Revamped asset loading system	2019-07-02 14:15:53 +01:00
Sheldon Knuth	0ec240ea8e	Revamping the audio system for Voxygen from #163	2019-07-02 13:52:51 +01:00
Sheldon Knuth	de9d05999d	Removed send_msg in Action::Load(path) => ... due to non-existed receiver.	2019-07-02 20:04:24 +08:00
Sheldon Knuth	cdda20a1e8	hotfix on assets_folder issue by increasing the depth to 3.	2019-07-02 19:43:38 +08:00
Sheldon Knuth	ee32f752a6	add no-audio feature while constructing AudioFrontend with no_audio().	2019-07-02 11:45:28 +08:00
Sheldon Knuth	7f7d35fe7f	fix audio thread by removing PopError but use customised block function instead.	2019-07-02 11:29:00 +08:00
Sheldon Knuth	d75d632279	Add mpmc support to audio-base.	2019-07-02 11:29:00 +08:00
Joshua Barretto	631df59083	Merge branch 'zesterer/small-fixes' into 'master' Fixed chonk memory usage bug, added block manipulation See merge request veloren/veloren!278	2019-07-01 15:22:04 +00:00
Joshua Barretto	489f5f6b2a	fmt	2019-07-01 14:38:45 +01:00
Joshua Barretto	586b62ea28	Fixed remesh data race	2019-07-01 14:38:38 +01:00
Joshua Barretto	90566243ca	Removed debug printing	2019-07-01 14:37:32 +01:00
Joshua Barretto	c8a2e4722c	Fixed chonk memory usage bug, added block manipulation	2019-07-01 14:36:45 +01:00
jshipsey	cc548eb669	glider animation fix	2019-06-30 18:53:45 -04:00
jshipsey	e9bbe0e800	rebase	2019-06-30 18:53:45 -04:00
jshipsey	aea0d0002b	head position fixes	2019-06-30 18:53:45 -04:00
jshipsey	2ce5c5881e	combat run/jump/idle animation states	2019-06-30 18:53:44 -04:00
timokoesters	370e7db1ee	Fix death	2019-06-30 22:29:00 +02:00
Joshua Barretto	45e30d0c84	Merge branch 'issue_109' into 'master' Configured GameInput::Glide to be managed like the rest of events that stop on key release See merge request veloren/veloren!274	2019-06-30 18:52:19 +00:00
J. R. Vidal F	e2b4b5106a	Configured GameInput::Glide to be managed like the rest of events that stop on key release	2019-06-30 20:44:52 +02:00
Timo Koesters	96a2dfc15d	Merge branch 'timo-actor-body' into 'master' Remove Actor and use Body instead See merge request veloren/veloren!270	2019-06-30 17:55:23 +00:00
timokoesters	14400f6380	Remove Actor and use Body instead	2019-06-30 18:57:24 +02:00
J. R. Vidal F	fca9590cee	Fixed Issue #109 and some related problems that took place while holding shortcut keys	2019-06-30 06:20:50 +02:00
Joshua Barretto	f2df3a9d18	Block-hopping fix, better dusk shaders	2019-06-29 22:47:24 +01:00
Joshua Barretto	f1ba97ae7a	Merge branch 'timo-rolling-fix' into 'master' Rolling bugs + NPC bugs + "Impossible" bug See merge request veloren/veloren!265	2019-06-29 21:47:05 +00:00
timokoesters	d235374d8e	Fix npc and death bug	2019-06-29 22:43:44 +02:00
Joshua Barretto	324de39bfe	fmt	2019-06-29 16:48:43 +01:00
Joshua Barretto	0f386bbedb	Made days less blue and nights less light	2019-06-29 16:48:43 +01:00
Joshua Barretto	61e7da4f85	Added light tinting based on time of day	2019-06-29 16:48:43 +01:00
Joshua Barretto	0c918c835f	Prevented invalid username usage	2019-06-29 16:48:43 +01:00
Joshua Barretto	dd82fc24a8	Prevented UI resets when toggling HUD	2019-06-29 16:48:43 +01:00
Joshua Barretto	b5648f736d	Fixed day horizon bug	2019-06-29 16:48:43 +01:00
timokoesters	af52cfea6a	Show cursor when unfocussing the window	2019-06-29 03:43:35 +02:00
timokoesters	fe6f627d42	Clean up ecs actor body components	2019-06-29 01:49:33 +02:00
Mckol	b5db5b8d3d	Added error logging	2019-06-28 20:22:43 +02:00
Mckol	f1b1c41d92	Added catching audio panics You can still make it panic by poisoning some variable if you try to change the audio device in settings after launch`	2019-06-28 20:22:43 +02:00
Monty Marz	cef52a0440	Char fixes	2019-06-28 14:45:02 +00:00
Songtronix	eb28ba94f6	add git commit hash to debug window	2019-06-28 12:08:12 +00:00
Justin Shipsey	4ac7307f8f	minor main menu changes made the settings button's text grey and removed hover/press image as long as it's not functional changed server list placement and spacing	2019-06-28 08:24:13 +00:00
Joshua Barretto	d4beeacc88	Interp fix	2019-06-26 21:57:39 +01:00
Joshua Barretto	cfe7b0d8b6	Attempted voxygen interpolation dt fix	2019-06-26 21:57:39 +01:00
Joshua Barretto	f781aca8e9	fmt	2019-06-26 19:14:12 +01:00
Joshua Barretto	397c909bd4	Denser stars	2019-06-26 19:14:12 +01:00
Joshua Barretto	ad2bc635f8	Rewrote sky shaders, added stars	2019-06-26 19:14:12 +01:00
Joshua Barretto	325fa41d7e	Grass improvements	2019-06-26 19:14:12 +01:00
Joshua Barretto	0734529ef6	Made postprocessing brighter	2019-06-26 19:14:12 +01:00
Joshua Barretto	b94c0ace8c	Removed RefCell from column cache	2019-06-26 19:14:12 +01:00
Pfauenauge90	b5d529f824	changes restore	2019-06-26 19:14:12 +01:00
Pfauenauge	1dfc85a75b	char selection time freeze to prevent it from being dark	2019-06-26 19:14:12 +01:00
Joshua Barretto	b987bda9ce	Stronger shadows, fewer cliffs in oceans	2019-06-26 19:14:12 +01:00
Joshua Barretto	d0b38e9875	Worldgen performance improvements, better sun	2019-06-26 19:14:12 +01:00
Joshua Barretto	9279611d6d	Added longer day/night cycle, /time command	2019-06-26 19:14:12 +01:00
Joshua Barretto	fffef7c739	Better rivers, rewrote cliffs	2019-06-26 19:14:12 +01:00
Piotr Korgól	5f09e75541	Stop printing out chunk location	2019-06-26 19:14:12 +01:00
Piotr Korgól	4644199f1b	Make minimap title show location names	2019-06-26 19:14:12 +01:00
Pfauenauge90	ab2c0ad085	mid name parts	2019-06-26 19:14:12 +01:00
Joshua Barretto	04893338cd	Lowered horizon	2019-06-26 19:14:12 +01:00
Joshua Barretto	5e96e29ff1	AO improvements, day/night cycle	2019-06-26 19:14:12 +01:00
Joshua Barretto	d10ef37528	Fixed AO lighting issue	2019-06-26 19:14:12 +01:00
Joshua Barretto	451bbe9921	Basic region generation	2019-06-26 19:14:12 +01:00
Joshua Barretto	bc7cee1846	Lighting fixes	2019-06-26 19:14:12 +01:00
Joshua Barretto	bf5b1cb4ad	Calculate delta time properly, fix low fps collision issues by decreasing max dt	2019-06-26 19:14:12 +01:00
Joshua Barretto	25b48b9cf6	Removed dt debugging in animation code	2019-06-26 17:22:28 +01:00
Joshua Barretto	6c83edfc27	Don't fetch dt in figure.rs	2019-06-26 11:55:31 +01:00
Joshua Barretto	7b7d843d0f	Comments and fmt	2019-06-26 11:53:43 +01:00
Joshua Barretto	4a340f69b5	Camera clipping and block-hop fix	2019-06-26 11:53:43 +01:00
Joshua Barretto	692fa3f28d	Above-ground spawn point, better figure dt scaling	2019-06-26 11:53:43 +01:00
Joshua Barretto	d2b8f592df	Fixed dt figure interpolation scaling	2019-06-26 11:53:43 +01:00
Joshua Barretto	c2c5b9f5e7	Better camera interpolation	2019-06-26 11:53:43 +01:00
Joshua Barretto	af432ec510	Calculate delta time properly, fix low fps collision issues by decreasing max dt	2019-06-26 11:53:43 +01:00
Joshua Barretto	2c24ba7776	Fixed block-hopping, block-snapping, added interpolation to figures	2019-06-26 11:52:36 +01:00
Joshua Barretto	285cf2f973	Added proper 3D collisions	2019-06-26 11:52:36 +01:00
timokoesters	7fc53db328	Fix fps dependent animation interpolation by using dt	2019-06-25 21:43:45 +02:00
Imbris	16e5b6bafd	circular view distance	2019-06-23 15:49:15 -04:00
jshipsey	8dd1e46883	run tweaks	2019-06-16 19:59:15 +02:00
jshipsey	ed2773fbca	changed hand motion on run animation	2019-06-16 19:59:15 +02:00
jshipsey	8e019cdbec	lowered roll duration	2019-06-16 19:59:14 +02:00
jshipsey	0c534efddd	adjusted v-tilt, roll speed, run animation tempo	2019-06-16 19:59:13 +02:00
jshipsey	e066d98762	slight roll tweak, altered speeds in physics	2019-06-16 19:59:13 +02:00
jshipsey	ecf0d9647c	added roll physics, improved anims for roll, glide, run, attached hands to torso	2019-06-16 19:59:12 +02:00
timokoesters	7deb3da1af	Add `pub use phys::` and remove most `pub mod`s	2019-06-16 19:59:12 +02:00
timokoesters	955c20fa61	Remove crun and cidle components and inputs	2019-06-16 19:57:04 +02:00
timokoesters	e2c81dd036	Fixes for .maybe() and animation	2019-06-16 19:57:04 +02:00
jshipsey	4de5489367	groundwork for role, crun, cidle	2019-06-16 19:57:04 +02:00
timokoesters	69cb2ed84f	Revamp control system	2019-06-16 19:57:03 +02:00
Joshua Barretto	76344d142e	Added clouds	2019-06-15 18:23:01 +01:00
Joshua Barretto	73e999af87	Stopped printing chunk location every frame	2019-06-15 13:44:50 +01:00
Joshua Barretto	a9d30bbfb6	Adjusted tree colour variation	2019-06-15 11:36:26 +01:00
Joshua Barretto	9fed2c1534	Merged stumps, adjusted scale code	2019-06-13 11:59:05 +01:00
Joshua Barretto	fa8f3a4b49	Tweaked lighting and AO	2019-06-13 11:59:05 +01:00
Joshua Barretto	e671d8473c	Bluer snow, altered rock colour	2019-06-13 11:59:05 +01:00
Joshua Barretto	8071670a37	More trees, adjusted camera tilt	2019-06-13 11:59:05 +01:00
Joshua Barretto	38c836d6c5	Simpler cliffs, camera tilt	2019-06-13 11:59:05 +01:00
Joshua Barretto	581c4d0e3b	Fixed frustum culling efficiency bug	2019-06-13 11:59:05 +01:00
jshipsey	99b4406d79	cleared out unused animation variables	2019-06-13 00:14:06 -04:00
Marcel	9783ff56e8	Merge branch 'midge/mouse-sensitivity' into 'master' Better Settings Closes #142 and #132 See merge request veloren/veloren!216	2019-06-12 13:12:46 +00:00
Timo Koesters	99a1f153fb	Merge branch 'timo-cleanup' into 'master' Cleanup See merge request veloren/veloren!226	2019-06-11 07:00:46 +00:00
timokoesters	2ca0c62654	Cleanup	2019-06-10 22:44:03 +02:00
Songtronix	2f1021f955	Replace texture2D with texture to fix MacOS crash	2019-06-09 20:20:29 +02:00
Cody	b180f89104	Enhances deserialization so settings which are missing are added with default values.	2019-06-08 19:35:23 -04:00
Cody	026ac32972	Amends the suggested 1 FPS option to 15 to prevent accidental session crashes.	2019-06-08 12:23:58 -04:00
Cody	e18947eed1	Changes the fallback slider value to a safe one.	2019-06-08 12:23:58 -04:00
Cody	24f7323d04	Allows selection of an unstable 1 FPS option.	2019-06-08 12:23:58 -04:00
Cody	527f33a778	Adds an FPS setting and slider.	2019-06-08 12:23:58 -04:00
Monty Marz	8a19a6f2a3	Configurable max fps	2019-06-08 12:23:57 -04:00
Cody	41f3cd5803	Changes setting type to u32, enforces live in-game updates to setting.	2019-06-08 12:23:57 -04:00
Cody	a90d073c22	Adds mouse sensitivity sliders that update settings file.	2019-06-08 12:23:45 -04:00
timokoesters	037fcfe5da	Ungrab mouse when closing settings with X	2019-06-07 22:23:06 +02:00
Cody	14ac5babd4	Removes most unused imports; changes some unused variables to underscores or provides a leading underscore; removes some unnecessary variables and mutable declarations; and performs other miscellaneous warning fixes.	2019-06-06 14:48:41 +00:00
Joshua Barretto	afd983f6f8	Lighting fix	2019-06-06 12:25:06 +01:00
Joshua Barretto	427339cc9a	Smoothed fog VD opening	2019-06-06 11:09:25 +01:00
Joshua Barretto	8da46b48ac	Added frustum culling for chunks	2019-06-06 10:04:37 +01:00
Joshua Barretto	66cd8de0e1	Only draw chunks outside of fog boundary, reduce fog strength	2019-06-06 08:13:58 +01:00
Joshua Barretto	eb2d1f3278	Comment cleanup	2019-06-06 06:46:02 +01:00
Joshua Barretto	4ada144164	Changed debug flag in client	2019-06-05 20:52:51 +01:00
Joshua Barretto	d663da27b5	Made character the centre of the fog	2019-06-05 20:52:51 +01:00
Joshua Barretto	76dca0b0cf	Added dynamic fog growth	2019-06-05 20:52:51 +01:00
Joshua Barretto	9da2d82197	Added proper VD fog	2019-06-05 20:52:51 +01:00
Joshua Barretto	cd630b0816	Reduced threadpool threads to keep render thread smooth	2019-06-05 20:52:51 +01:00
Joshua Barretto	9a8552d5fb	Added rocks	2019-06-05 20:52:51 +01:00
Joshua Barretto	478cc24c91	Deferred normal unpacking to the terrain fragment shader	2019-06-05 20:52:51 +01:00
Joshua Barretto	92f2d36b0c	Optimised sub-terrain chonk storage, fixed hash chunk bug, altered terrain base	2019-06-05 20:52:51 +01:00
Louis Pearson	3723649d39	Update cpal	2019-06-05 13:17:19 -04:00
Joshua Barretto	3a1221068f	Merge branch 'voxel-shadows' into 'master' Shadows, deserts, snow, caves See merge request veloren/veloren!198	2019-06-03 22:13:10 +00:00
Joshua Barretto	c3cd3b9a69	Compressed vertex data even more	2019-06-04 00:09:49 +02:00
Joshua Barretto	8d04b9297e	disabled temporarily point light	2019-06-04 00:08:58 +02:00
Joshua Barretto	e2182b1a68	Added basic light	2019-06-03 22:50:47 +01:00
Pfauenauge90	ce6a9ac32d	Roots added fmt asset fix	2019-06-03 22:50:27 +01:00
Timo Koesters	930bc91174	Merge branch 'fix-server-info' into 'master' Add server info and player list to client See merge request veloren/veloren!197	2019-06-02 14:45:41 +00:00
Monty Marz	112f0515bd	Button added Former-commit-id: d8e88da53c3f8daa3216a7d0657f0934ec1a051f	2019-06-02 02:17:36 +00:00
Cody	04d4dc1da5	Reverts one erroneous change, further corrects another comment.	2019-06-01 00:52:20 -04:00
Cody	609742f8fa	Makes some quick in-game menu fixes.	2019-05-31 16:36:25 -04:00
Cody	75ca605f5d	Changes the physics misnomer Direction to Orientation and adjusts some ECS read_storage names.	2019-05-31 16:36:24 -04:00
Cody	b05eb2b861	Changes asset filenames for consistencies.	2019-05-31 16:36:24 -04:00
Cody	6c76667356	Addresses more naming schemes and typos.	2019-05-31 16:36:24 -04:00
Cody	b9377b5c33	cargo fmt	2019-05-31 16:36:23 -04:00
Cody	a258be7aac	Fixes some typos, comment inconsistencies, and incorrect naming conventions.	2019-05-31 16:36:16 -04:00
Louis Pearson	70b503868e	Add fix for headphone and invalid device params	2019-05-31 14:24:33 -06:00
Louis Pearson	64d38e687b	Move to latest version of cpal	2019-05-31 13:19:32 -06:00
Joshua Barretto	024afb9b4a	Added desert and snowy areas Former-commit-id: 220e404de8f64e35d9f54f2b0eeff3fe90c33802	2019-05-29 22:24:47 +01:00
Joshua Barretto	f49796dcef	Basic cave test Former-commit-id: 5b56bb882aca37d7fee1ee9c5e100ad2bf97834e	2019-05-29 14:49:27 +01:00
Joshua Barretto	1e2f130ad6	Added voxel shadows Former-commit-id: 86f8d6f53073736a7036ad3371eb6f283cfdac3c	2019-05-29 12:01:02 +01:00
Imbris	061ab9f45e	limit ingame element size Former-commit-id: b60e297096ad354cae77482fe84aca88bb9a8f3e	2019-05-28 20:47:03 -04:00
Imbris	c41fc026a8	fmt Former-commit-id: 288b2b5d5872aebd255e464c921521c0b8b864fa	2019-05-28 20:47:03 -04:00
Imbris	e3e8afd99b	Stop drawing entities outside the vd Former-commit-id: 34878fb66ec22ac77a7400724b80ad7f8321f4cf	2019-05-28 20:47:01 -04:00
timokoesters	59967c603c	Save settings when the game closes Former-commit-id: 0190f45ddbd87ec6ae2e4d4d959672d22e560907	2019-05-28 19:16:07 -04:00
Imbris	38416ef37c	Show disclaimer once Former-commit-id: f4937dba2caca207b02deb18ad209a8435e65b61	2019-05-28 19:16:07 -04:00
Imbris	045f41dae7	Use vd setting when creating client Former-commit-id: b9a32c6b2f1a61a407991507c63ba7d708723410	2019-05-28 19:16:06 -04:00
Joshua Barretto	ec3176a471	Merge branch 'audio-error-1' into 'master' Fix game crashing when trying to start audio Closes #112 See merge request veloren/veloren!187 Former-commit-id: e2c62779efae0a91edf1ad546fe1f077ddc5227e	2019-05-28 22:16:03 +00:00
Louis Pearson	a3dafde081	Add better version of Snowtop Former-commit-id: ea47207ec7651d8c7eedea14f77399e96c3546b6	2019-05-28 15:01:10 -06:00
Louis Pearson	4502def070	Fix game crashing when trying to start audio Former-commit-id: fa24d352f3d8721406fbeda9785689d681d42d27	2019-05-28 15:01:10 -06:00
Joshua Barretto	5b5cd7d341	Merge branch 'healthbar-rendering-when-less-than-full' into 'master' Only render other player's healthbars when less than 100% full Closes #123 See merge request veloren/veloren!195 Former-commit-id: 70607acd77d14b911574d328332f341e5f395b24	2019-05-28 20:37:37 +00:00
timokoesters	3d21cd7402	Get player count and calculate ping time Former-commit-id: 99da086195e301f1e6cba3ebe7fa5b745b86502a	2019-05-28 21:55:05 +02:00
JMS	e3902ea134	Fix debug coordinates window crashing when player has no Pos component yet Closes #136 Former-commit-id: eb7b2a4c525a4b2771a9ca168e566b24bd23c7b8	2019-05-28 15:40:50 -04:00
JMS	b5976b567e	Only render other player's healthbars when less than 100% full Implements part of #123 Former-commit-id: d927d153a39b016d029587351eeb5fa87ccb5197	2019-05-28 15:26:11 -04:00
JMS	4fcb6cd025	Add player coordinates to debug window Former-commit-id: 00285712652ed97c7f18a5f4834f1eaef269afc7	2019-05-28 14:23:24 -04:00
Marcel	b5b61462ee	Merge branch 'event-chat-messages' into 'master' Event chat messages See merge request veloren/veloren!188 Former-commit-id: 5701dd41f52f76ee5733a3580da9fab59dc539e7	2019-05-28 10:45:24 +00:00
Marcel	7cbc4dbfdb	Merge branch 'easy-run' into 'master' Add default-run to allow compiling with just `cargo run` See merge request veloren/veloren!189 Former-commit-id: e520b72762accce00e275a48d70bbec31f2dbd83	2019-05-28 10:27:45 +00:00
jshipsey	6cb1a75b93	speed tweak Former-commit-id: a3938ec59032794c7135facddecbf7131fb5262e	2019-05-27 19:48:44 -04:00
jshipsey	f9e2828de5	swing animation changes Former-commit-id: 1bc70090e938c12d6e133683932b470be102aecd	2019-05-27 19:03:52 -04:00
jshipsey	5f22c4e26f	swing animation Former-commit-id: 19e2c32aa36e3890e35df87f01bb0aec4cc8cf9c	2019-05-27 18:54:09 -04:00
timokoesters	7ced54ba54	Add default run to allow compiling with just `cargo run` Former-commit-id: 88c41361bda4b77c13d52217024e286cb7c0a565	2019-05-27 22:51:42 +02:00
timokoesters	2008400169	Implement killer name in chat Former-commit-id: 5aa87529179a684d5675c33e4001806aa2040802	2019-05-27 21:47:19 +02:00
timokoesters	a6439984be	Add connect, disconnect and kill messages Former-commit-id: c25f6fb0b594e5d61a965447359536ca17173aa7	2019-05-27 19:45:43 +02:00
Monty Marz	8a3b308224	Wolf model assets update Former-commit-id: 3bf065f97bd000ef3f140e3c776a34057217cdfd	2019-05-26 19:12:32 +00:00
Imbris	ec4bf7279a	Add check for typing Former-commit-id: 582d0b5894f44f8491b671823b09f064d139df02	2019-05-26 12:23:24 -04:00
Imbris	8754ea1661	Fix hud handle_event() match arm order Former-commit-id: 484b74fc9d82a18b5ac4d7da2dedcd426d100041	2019-05-26 12:12:10 -04:00
Timo Koesters	48a905ba86	Merge branch 'attack' into 'master' Attack fixes See merge request veloren/veloren!179 Former-commit-id: 97f1e109dcbcbf7f1d860cf3aebae871f93884cf	2019-05-26 16:07:08 +00:00
timokoesters	a7faa82aad	Fix invisibility Former-commit-id: daeed655d2af1d990eee5d03df22b8a9bcbdf011	2019-05-26 18:01:55 +02:00
timokoesters	4ebf2e13a5	Fix wolf red and dead velocity Former-commit-id: 2d59c545d3a101e630f56cc0c96d8579508dd99d	2019-05-26 17:34:00 +02:00
Imbris	3c7f463330	Don't create Consts if they are not needed Former-commit-id: 3af8652100c009afda53637b292ded67587d89d4	2019-05-26 11:24:26 -04:00

... 49 50 51 52 53 ...

5574 Commits