1322 Commits

Author	SHA1	Message	Date
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 mods	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