2617 Commits

Author	SHA1	Message	Date
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
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	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	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	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
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
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
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	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
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
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	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
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
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	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
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	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
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
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
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	1d6d0ea03d	Fix all warnings.	2020-01-23 18:18:16 +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