1303 Commits

Author	SHA1	Message	Date
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	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	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	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	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
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	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	d0b38e9875	Worldgen performance improvements, better sun	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	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	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
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	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	92f2d36b0c	Optimised sub-terrain chonk storage, fixed hash chunk bug, altered terrain base	2019-06-05 20:52:51 +01:00
Joshua Barretto	3a1221068f	Merge branch 'voxel-shadows' into 'master' ... Shadows, deserts, snow, caves See merge request veloren/veloren!198	2019-06-03 22:13:10 +00:00
Joshua Barretto	c3cd3b9a69	Compressed vertex data even more	2019-06-04 00:09:49 +02:00
Joshua Barretto	e2182b1a68	Added basic light	2019-06-03 22:50:47 +01:00
Pfauenauge90	ce6a9ac32d	Roots added ... fmt asset fix	2019-06-03 22:50:27 +01:00
Timo Koesters	930bc91174	Merge branch 'fix-server-info' into 'master' ... Add server info and player list to client See merge request veloren/veloren!197	2019-06-02 14:45:41 +00:00
Monty Marz	112f0515bd	Button added ... Former-commit-id: d8e88da53c3f8daa3216a7d0657f0934ec1a051f	2019-06-02 02:17:36 +00:00
Cody	04d4dc1da5	Reverts one erroneous change, further corrects another comment.	2019-06-01 00:52:20 -04:00
Cody	609742f8fa	Makes some quick in-game menu fixes.	2019-05-31 16:36:25 -04:00
Cody	75ca605f5d	Changes the physics misnomer Direction to Orientation and adjusts some ECS read_storage names.	2019-05-31 16:36:24 -04:00
Cody	b05eb2b861	Changes asset filenames for consistencies.	2019-05-31 16:36:24 -04:00
Cody	6c76667356	Addresses more naming schemes and typos.	2019-05-31 16:36:24 -04:00
Cody	b9377b5c33	cargo fmt	2019-05-31 16:36:23 -04:00
Cody	a258be7aac	Fixes some typos, comment inconsistencies, and incorrect naming conventions.	2019-05-31 16:36:16 -04:00
Joshua Barretto	024afb9b4a	Added desert and snowy areas ... Former-commit-id: 220e404de8f64e35d9f54f2b0eeff3fe90c33802	2019-05-29 22:24:47 +01:00
Joshua Barretto	f49796dcef	Basic cave test ... Former-commit-id: 5b56bb882aca37d7fee1ee9c5e100ad2bf97834e	2019-05-29 14:49:27 +01:00
Joshua Barretto	1e2f130ad6	Added voxel shadows ... Former-commit-id: 86f8d6f53073736a7036ad3371eb6f283cfdac3c	2019-05-29 12:01:02 +01:00
Imbris	061ab9f45e	limit ingame element size ... Former-commit-id: b60e297096ad354cae77482fe84aca88bb9a8f3e	2019-05-28 20:47:03 -04:00
Imbris	c41fc026a8	fmt ... Former-commit-id: 288b2b5d5872aebd255e464c921521c0b8b864fa	2019-05-28 20:47:03 -04:00
Imbris	e3e8afd99b	Stop drawing entities outside the vd ... Former-commit-id: 34878fb66ec22ac77a7400724b80ad7f8321f4cf	2019-05-28 20:47:01 -04:00
timokoesters	59967c603c	Save settings when the game closes ... Former-commit-id: 0190f45ddbd87ec6ae2e4d4d959672d22e560907	2019-05-28 19:16:07 -04:00
Imbris	38416ef37c	Show disclaimer once ... Former-commit-id: f4937dba2caca207b02deb18ad209a8435e65b61	2019-05-28 19:16:07 -04:00
Imbris	045f41dae7	Use vd setting when creating client ... Former-commit-id: b9a32c6b2f1a61a407991507c63ba7d708723410	2019-05-28 19:16:06 -04:00
Joshua Barretto	ec3176a471	Merge branch 'audio-error-1' into 'master' ... Fix game crashing when trying to start audio Closes #112 See merge request veloren/veloren!187 Former-commit-id: e2c62779efae0a91edf1ad546fe1f077ddc5227e	2019-05-28 22:16:03 +00:00
Louis Pearson	a3dafde081	Add better version of Snowtop ... Former-commit-id: ea47207ec7651d8c7eedea14f77399e96c3546b6	2019-05-28 15:01:10 -06:00
Joshua Barretto	5b5cd7d341	Merge branch 'healthbar-rendering-when-less-than-full' into 'master' ... Only render other player's healthbars when less than 100% full Closes #123 See merge request veloren/veloren!195 Former-commit-id: 70607acd77d14b911574d328332f341e5f395b24	2019-05-28 20:37:37 +00:00
timokoesters	3d21cd7402	Get player count and calculate ping time ... Former-commit-id: 99da086195e301f1e6cba3ebe7fa5b745b86502a	2019-05-28 21:55:05 +02:00
JMS	e3902ea134	Fix debug coordinates window crashing when player has no Pos component yet ... Closes #136 Former-commit-id: eb7b2a4c525a4b2771a9ca168e566b24bd23c7b8	2019-05-28 15:40:50 -04:00
JMS	b5976b567e	Only render other player's healthbars when less than 100% full ... Implements part of #123 Former-commit-id: d927d153a39b016d029587351eeb5fa87ccb5197	2019-05-28 15:26:11 -04:00
JMS	4fcb6cd025	Add player coordinates to debug window ... Former-commit-id: 00285712652ed97c7f18a5f4834f1eaef269afc7	2019-05-28 14:23:24 -04:00
Marcel	b5b61462ee	Merge branch 'event-chat-messages' into 'master' ... Event chat messages See merge request veloren/veloren!188 Former-commit-id: 5701dd41f52f76ee5733a3580da9fab59dc539e7	2019-05-28 10:45:24 +00:00
jshipsey	6cb1a75b93	speed tweak ... Former-commit-id: a3938ec59032794c7135facddecbf7131fb5262e	2019-05-27 19:48:44 -04:00
jshipsey	f9e2828de5	swing animation changes ... Former-commit-id: 1bc70090e938c12d6e133683932b470be102aecd	2019-05-27 19:03:52 -04:00
jshipsey	5f22c4e26f	swing animation ... Former-commit-id: 19e2c32aa36e3890e35df87f01bb0aec4cc8cf9c	2019-05-27 18:54:09 -04:00
timokoesters	2008400169	Implement killer name in chat ... Former-commit-id: 5aa87529179a684d5675c33e4001806aa2040802	2019-05-27 21:47:19 +02:00
timokoesters	a6439984be	Add connect, disconnect and kill messages ... Former-commit-id: c25f6fb0b594e5d61a965447359536ca17173aa7	2019-05-27 19:45:43 +02:00
Monty Marz	8a3b308224	Wolf model assets update ... Former-commit-id: 3bf065f97bd000ef3f140e3c776a34057217cdfd	2019-05-26 19:12:32 +00:00
Imbris	ec4bf7279a	Add check for typing ... Former-commit-id: 582d0b5894f44f8491b671823b09f064d139df02	2019-05-26 12:23:24 -04:00
Imbris	8754ea1661	Fix hud handle_event() match arm order ... Former-commit-id: 484b74fc9d82a18b5ac4d7da2dedcd426d100041	2019-05-26 12:12:10 -04:00
Timo Koesters	48a905ba86	Merge branch 'attack' into 'master' ... Attack fixes See merge request veloren/veloren!179 Former-commit-id: 97f1e109dcbcbf7f1d860cf3aebae871f93884cf	2019-05-26 16:07:08 +00:00
timokoesters	a7faa82aad	Fix invisibility ... Former-commit-id: daeed655d2af1d990eee5d03df22b8a9bcbdf011	2019-05-26 18:01:55 +02:00
timokoesters	4ebf2e13a5	Fix wolf red and dead velocity ... Former-commit-id: 2d59c545d3a101e630f56cc0c96d8579508dd99d	2019-05-26 17:34:00 +02:00
Imbris	3c7f463330	Don't create Consts if they are not needed ... Former-commit-id: 3af8652100c009afda53637b292ded67587d89d4	2019-05-26 11:24:26 -04:00
Imbris	4a8e85ef64	restore lost changes ... Former-commit-id: a94c52677287131e02c88748694dfbcaf90b531a	2019-05-26 11:24:25 -04:00
jshipsey	d179ccbd92	rebase fix ... Former-commit-id: b1a1136942ec37647401dfa28682f2ee33b760a2	2019-05-26 11:11:14 -04:00
jshipsey	b4e9359e3f	Merge branch 'pets' of https://gitlab.com/veloren/veloren into pets ... Former-commit-id: f6ab802ebcb24a6c9c5d1c4343ce6b4d68cf942d	2019-05-26 11:04:11 -04:00
jshipsey	7aab509701	rebase with combat merge ... Former-commit-id: 04885878ecaffba6b9bd78b2e59512d1914be3b1	2019-05-26 11:02:01 -04:00
jshipsey	c342a7136b	tweaking quadrupedmedium ... Former-commit-id: 61dac48095caa4c7f0fe92ff7badf360b1a1402d	2019-05-26 10:39:57 -04:00
jshipsey	cd4e36e32a	pipeline adjustment ... Former-commit-id: 9b263baee41e1701532aa09ed3cde51da42bd9de	2019-05-26 10:39:57 -04:00
jshipsey	51b54a0252	cleanup ... Former-commit-id: 62237741afd6d2f6a22030a378a612c3b62dc0ae	2019-05-26 10:39:57 -04:00
jshipsey	26da091b0b	add wolf ... Former-commit-id: b16aa2e7c382710c0705371cd36d57ddf62cf13c	2019-05-26 10:39:57 -04:00
jshipsey	fa07323083	tweaking quadrupedmedium ... Former-commit-id: 3e06337cd99ced44a786c55666764a8c54bc8b90	2019-05-26 10:25:56 -04:00
jshipsey	9a4e663ef9	pipeline adjustment ... Former-commit-id: 8f42b9971cb6a0f3fa9b7852fb52f4710acdcf12	2019-05-26 10:18:50 -04:00
timokoesters	f0397f1a32	log::error instead of panic ... Former-commit-id: 802f81425869698a95654d423fef93136617cb5f	2019-05-26 16:11:30 +02:00
timokoesters	64b00f41f4	Fix invisible chars ... Former-commit-id: cbb93e0511100b9b66f9ea22451c99a69b50b19c	2019-05-26 16:04:44 +02:00
timokoesters	cda253c3cf	Make Failed to tick go back to the main screen and move to ron ... Former-commit-id: 14d4ab3cb9d964805a2f275b932e93cef9b72d38	2019-05-26 12:58:43 +02:00
jshipsey	eddffb9d91	cleanup ... Former-commit-id: c4cad9ddce3d58bfb08a13959fe9bb97d44fd986	2019-05-26 00:43:16 -04:00
jshipsey	b7cbe1e67c	add wolf ... Former-commit-id: 49fee3e5056377966068bd690333f83192d1fd41	2019-05-25 23:31:49 -04:00
timokoesters	a18a8e0d15	Fix nametags showing on dead players (maybe) ... Former-commit-id: 94548e131ee7c94fc5546fa7410fc9694d1db68e	2019-05-26 00:34:24 +02:00
timokoesters	79a0edad85	Fix glider ... Former-commit-id: dbcdfef19b3cd428736e77176a958f128b7fe7ad	2019-05-26 00:04:40 +02:00
timokoesters	746e286b5b	Fixes ... Former-commit-id: 0bbbcf187248dd192e7e9a226bcf5b496437d578	2019-05-26 00:00:38 +02:00
timokoesters	4696cd2c8b	Add better inputs, input validation and more ... Former-commit-id: 3227221b12a674f66b011ce0ba734e226f223f34	2019-05-25 23:46:56 +02:00
timokoesters	3c0121538b	Make key binds work with mouse events ... Former-commit-id: 77421b44e92d7c60c39ebcb3f94a406ef7f027ff	2019-05-25 23:46:52 +02:00
timokoesters	075c0d9e11	Use type MouseButton instead of glutin::MouseButton ... Former-commit-id: 7fc8b2f3f42ed45455feaa4a36e225a981b768ac	2019-05-25 23:21:40 +02:00
timokoesters	f4434013db	Fix clear_terrain not changing Changes ... Former-commit-id: da7b02939d6d0bc7dbef7d923fb880081f6e08aa	2019-05-25 23:21:40 +02:00
timokoesters	525af4c201	Add Constant for damage fade ... Former-commit-id: 4b0e2ff6249ebcf814b036ba11c57ad094811e30	2019-05-25 23:21:40 +02:00
timokoesters	15d1a789d6	Better formatting ... Former-commit-id: 22b83b6dd5ad145a39b236436a019c6b172787d7	2019-05-25 23:21:39 +02:00
timokoesters	3697c47e33	Change client_state_pending to ClientState::Pending ... Former-commit-id: 4b6a304a138ccfbffc3b6e28d36feaa2693d01a7	2019-05-25 23:21:39 +02:00
timokoesters	1826a2b4f9	Implement fast respawn ... Former-commit-id: 17f9aceba5c40a5d3ddc2e0fd6795479487753fd	2019-05-25 23:21:39 +02:00
timokoesters	0344f3eba8	Implement hit time delay ... Former-commit-id: 6c1990645fd07e23de5eb97b6fc22f34ce09a6b7	2019-05-25 23:21:39 +02:00
timokoesters	e34a47d0d7	Fix chunk loading delay ... Former-commit-id: b287ab5be22ae6e4d0b10b5010e592a7a514cacb	2019-05-25 23:21:39 +02:00
timokoesters	f5751d65b1	Fix terrain not loading ... Former-commit-id: f9279878ab051c6083c4a1f5125531fe79151fb8	2019-05-25 23:21:39 +02:00
timokoesters	a0918d11b6	Fix red effect ... Former-commit-id: 1fd90a40aaaccb98aeb34715ee7cad5c0b3b3de7	2019-05-25 23:21:38 +02:00
timokoesters	ad5dcb4158	Make use of states in char-selection ... Former-commit-id: f74d4811bebb0e60093a96d70feeedaae8bc6c04	2019-05-25 23:21:38 +02:00
timokoesters	449b717777	Go back to char selection on death ... Former-commit-id: a8b5ee42f432ff2da8385225b17be654420f17d1	2019-05-25 23:21:37 +02:00
timokoesters	b3e4ca0a5d	Implement killing ... Change animation history to animation Add attack input event Implement killing with ecs systems for damage and death Sync attack properly Sync deaths Former-commit-id: 72b5be7d65d9d3fcbef50d4836a6f06ec218d69e	2019-05-25 23:21:37 +02:00
Joshua Barretto	242a23658c	Switched to pop_front ... Former-commit-id: 2653d3bb0fc5e9dd9c50eeb7b012d3cd4e94b439	2019-05-25 21:03:56 +01:00
Joshua Barretto	3534804697	Limited total messages ... Former-commit-id: 7c8e4a3f9e1d36731579300f7662a324566de6fb	2019-05-25 20:16:38 +01:00
Imbris	9edcabc679	Fix difficult grabbing after closing via button ... Former-commit-id: 2649d9e210d375f19d2970f15614be23d5173c67	2019-05-25 08:59:58 -04:00
Imbris	3daec2cb17	Don't take mouse events from an unfocused window ... Former-commit-id: 99b60171c86109606318c6f39b45370105e3a7d9	2019-05-25 08:59:58 -04:00
Imbris	a09c3691db	add pan and zoom sensitivity settings ... Former-commit-id: 26d2becc17cc3b9fce77e27f91834b0caf3ea77a	2019-05-25 08:59:58 -04:00
Imbris	25dbc54961	set player alias as nametag if default char name ... Former-commit-id: 0c6053842028b2b2743746267bb65a34a6581d71	2019-05-25 08:59:57 -04:00
jshipsey	e84d19b5c8	fmt ... Former-commit-id: d4c800b8c2e7667bb635de23c0f334bddd4b7a0d	2019-05-24 19:01:10 -04:00
jshipsey	8e896cc3c4	rotation simplification ... Former-commit-id: d6ddc514d76dee88477964a7cf053122e39a67a8	2019-05-24 18:43:49 -04:00
jshipsey	98630b3692	attack state ... Former-commit-id: 6d8a6b68aff7ae2439eb42b2cee017cec99d96df	2019-05-24 18:42:22 -04:00
jshipsey	ac41a2241c	laying groundwork for combat anims, untangling skeleton ... Former-commit-id: 442e7059ce0e62429c263fd0b95ee98b7d8bc0d2	2019-05-24 18:33:56 -04:00
jshipsey	a65d6e733f	rotation simplification ... Former-commit-id: 991b5710d14c27af8f34745caeef95df47be0bb0	2019-05-24 18:33:55 -04:00
jshipsey	5049b9a2ae	attack state ... Former-commit-id: 316d1dbb607688d88c067adc6498497aa67cb017	2019-05-24 18:33:55 -04:00
Joshua Barretto	4f2b27c338	fmt ... Former-commit-id: 2d9b4f53438a3849381d8723d0ab48b4015cd35c	2019-05-24 13:43:03 +01:00
Imbris	dd607ba9a4	add key to toggle ingame ui elements ... Former-commit-id: e57fc5410a93f6e467db4bb198d7510351fb2db6	2019-05-24 02:31:05 -04:00
Imbris	1d5bf26491	Round resolution scaling to powers of 2 ... Former-commit-id: c4ae59271076e1402eb1012257b6e40f082faf06	2019-05-24 02:31:04 -04:00
Imbris	24a14b083f	Scaling of ingame text rasterization to match final size ... Former-commit-id: 9f9e900afef2400af35d579e66ba95097e169b87	2019-05-24 02:31:04 -04:00
Imbris	a128abc925	Simplify ingame.rs, fix adding new entities ... Former-commit-id: b5fbf1a0155e8cb2cb7837004b3c0e43ca2ae92e	2019-05-24 02:31:04 -04:00
Imbris	db910855df	Simplify ingame.rs, fix adding new entities ... Former-commit-id: 3e92c4c8c1c580e2b2d95eecd213ac42cf0dd0bc	2019-05-24 02:31:03 -04:00
Imbris	e9683ba639	Link player stats, remove self name tag ... Former-commit-id: bb20c8f1515859ae7720484faa4b718253e0ccb7	2019-05-24 02:31:03 -04:00
Imbris	45bea22727	Add healthbars, rebase fixes, warning fixes ... Former-commit-id: e293133eb18452a53446d2d765ecbe00e50720ba	2019-05-24 02:31:03 -04:00
Imbris	93ec66a8b1	Add ability to position tuples of widgets ingame ... Former-commit-id: e2958a37e7062132d6a7b6d5ad61bd4002768532	2019-05-24 02:31:02 -04:00
Imbris	b828bffba9	Make name labels work ... Former-commit-id: 633905535d2842b320d347e368a28ac967a8469a	2019-05-24 02:31:02 -04:00
Imbris	7fd3854093	ingame_ui ... Former-commit-id: 5e836043d58f9217d711462d9f700e3eb096a076	2019-05-24 02:31:01 -04:00
Monty Marz	cc9b028bf1	Disclaimer ... Former-commit-id: dd115bb1971f066b19c3424c0a1352eb37dcb159	2019-05-23 22:45:48 +00:00
sxv20_	3e49c37a08	fix crash on view distance change related to borrows ... Former-commit-id: 0cfa022e0078b077f3bd128fc6f51d03898722ef	2019-05-23 10:30:46 +01:00
sxv20_	894b4339ca	move debug info DebugInfo struct ... Former-commit-id: 88bded303575ad742416d0299dc19d70dcc81c31	2019-05-23 10:30:00 +01:00
Algorhythm	6456198b38	Add ping indicator to debug HUD ... Former-commit-id: 7bd4a30e9b2dc97134e91f71c08cbb05ca109db5	2019-05-23 08:18:25 +00:00
Joshua Barretto	3963d4a3ef	fmt ... Former-commit-id: b76defa253e555cd381ab6ccf66c8e7f3e816433	2019-05-22 19:49:06 +01:00
Joshua Barretto	1684013138	Improved GPU memory usage by ~5x by compressing vertex data ... Former-commit-id: b657ae88e44c6ecbede8073ffe17991ba3a99886	2019-05-22 19:32:33 +01:00
Louis Pearson	e78ae4fefc	Remove hacks, clean up crufty code ... Former-commit-id: 7c10103235e8d9e2967baa1f8e33d68995bdf4d5	2019-05-22 05:29:38 -06:00
Louis Pearson	affa5c081e	Temporarily remove Ruination ... Former-commit-id: a63df9eaf187f7786b9a2a0e50194c3a7866edbe	2019-05-22 03:00:16 -06:00
Louis Pearson	eeceef12ef	Prevent framerate drop when accessing settings menu ... Former-commit-id: f51d1b700cd328b8156c7df97d6524277cc0718b	2019-05-21 16:44:51 -06:00
Louis Pearson	4dfebb779e	Use global_state for accessing settings in hud ... This has led to a performance regression. For some reason when the menu opens FPS drops to about 20. Former-commit-id: 84cdbec5ef40cf6189e544eba6b87981bb9514fe	2019-05-21 16:44:51 -06:00
Louis Pearson	9f1c70792f	Move to using only global_state for settings menu ... Former-commit-id: bb86c851f51c02af1a25d57f2be95d1947b330ad	2019-05-21 16:44:51 -06:00
Louis Pearson	f52954971d	Save view distance, volume, and audio device to settings when changed ... Former-commit-id: ac7db47520c6524b3f2d7a788907daabb73ad237	2019-05-21 16:44:51 -06:00
Louis Pearson	c8928587dd	Allow user to change audio device in the settings menu ... Former-commit-id: 645b91182509da70075bb57f8ea6f9cd638c0d8e	2019-05-21 16:44:51 -06:00
Louis Pearson	0437f88601	Prevent audio crashes by blocking jack by default ... Former-commit-id: 61243a38667f64d1c8f106b1191ae876fc652c63	2019-05-21 16:44:51 -06:00
Louis Pearson	ee6ec2d299	Continue implementing audio device selection ... Former-commit-id: 6b92cbdb2e93653f43c0ed4d04e1b8fc35cfe8cf	2019-05-21 16:44:51 -06:00
Louis Pearson	8dc35b8609	Add audio to settings ... Former-commit-id: 6e18b95bb3460a3b6d971b89c767045dcdbe7344	2019-05-21 16:44:51 -06:00
Louis Pearson	50fc7549b9	Add baby steps for audio device choice support ... Former-commit-id: 8c1d623b2a28997e7705ba2775b382b38e9a34ed	2019-05-21 16:44:51 -06:00
Louis Pearson	7cfd3ad1cd	Add field_grazing.ogg ... Former-commit-id: 36a5bf4a9af2d89e9acd8dd7404c0b4eb1836f5b	2019-05-21 16:44:51 -06:00
Joshua Barretto	fc25dc8c7f	fmt ... Former-commit-id: 1f7bec8da117091b3f2e8f58ce45b9caf1b6c89d	2019-05-21 23:31:38 +01:00
Joshua Barretto	a696847f67	Fixed singleplayer failure caused by worldgen ... Former-commit-id: a2fdb56682922694b32e4d25890afa7a90c5b923	2019-05-21 23:31:17 +01:00
Joshua Barretto	dcd2b4392d	Added rocks, improved hills ... Former-commit-id: c8f3d8fb550186bd87d0de953098971050fd1e03	2019-05-21 22:51:41 +01:00
Pfauenauge90	c13206d82d	Basic worldgen ... Former-commit-id: 3ca0afa95dd1d868a84a41129e889a203e8a7cd9	2019-05-21 22:51:41 +01:00
Joshua Barretto	5b2da36fd0	Added mega worldgen ... Former-commit-id: f7c88a1d387c282b78ab834dd63e64432b371552	2019-05-21 22:51:41 +01:00
Louis Pearson	7dc087fe93	Create config dir if needed ... Former-commit-id: 280e49f428207d5dc9a88607252df4b9f155d018	2019-05-20 15:32:16 -06:00
Louis Pearson	8de6d5ad3d	Stop saving singleplayer settings to network settings ... Former-commit-id: 06d43eda771e03b6b30d4bdc8ab01d2b3cd6efc2	2019-05-20 15:05:09 -06:00
Imbris	39caf7e51b	Don't allow negative volumes ... Former-commit-id: 35a52235fa4194d40ffc0d8d3243d0653dcca0a5	2019-05-19 17:50:20 -04:00
Imbris	888bd65036	Add volume adjustment, lower default volume ... Former-commit-id: 1b581ef16ceb4a7a26772352d24df9c84d846c88	2019-05-19 15:31:32 -04:00
Pfauenauge	13e916d485	visuals in settings - audio ... Former-commit-id: 51bfcdcbed1d8254c966e7a92a472b585ff61c01	2019-05-19 19:35:40 +02:00
Joshua Barretto	0a9d7d68d5	Merge branch 'VD-Slider' into 'master' ... View distance slider See merge request veloren/veloren!152 Former-commit-id: c285b72576f47e1e13ee5959669f51c8aa652ea0	2019-05-19 01:10:42 +00:00
Joshua Barretto	3508e4afcb	Added view distance configuration ... Former-commit-id: b3c7a21631ce0c6b058f25aede0e3e2895a16f81	2019-05-19 01:45:02 +01:00
Imbris	0349461533	Pass up Vd slider changes to session.rs & fmt ... Former-commit-id: 187a3d286e288d2159fcde292f78e2bc08ec796b	2019-05-18 19:55:06 -04:00
Pfauenauge	78173b4bce	added slider ... Former-commit-id: c01a2601365c9d4d4b03e58ca33d91469cfbba0f	2019-05-19 01:22:30 +02:00
Imbris	4f970b63ef	fix screen shot flipping ... Former-commit-id: 47ed01cd5f91445d1367121d939c01876008f643	2019-05-18 19:09:23 -04:00
Imbris	7855dfe52f	Add screenshot, fullscreen, & debug keys ... Former-commit-id: 9358575794b71535905c5133eb6764284c35fb34	2019-05-18 17:16:35 -04:00
Imbris	9e9e8be196	Tweak settings change event handling in hud ... Former-commit-id: 7b9a3163f2e85d202ef295cf6bd63de3ce753640	2019-05-18 17:09:03 -04:00
Louis Pearson	b0f26633d3	Remove lewton, fix filename issue ... Former-commit-id: 067f3bfe8ea4f20741107689bf55b01d7580b983	2019-05-18 14:26:16 -06:00
Louis Pearson	6b0fc57ce3	Move global maintains above rendering ... Also moves the call to the AudioFrontend constructor to take place in the GlobalState constructor Former-commit-id: 0be9df5a7355b6a7d1ce758894568d67df7db11a	2019-05-18 14:10:02 -06:00
Louis Pearson	22286c24e6	Play random music whenever a track ends ... To support this, a global_state.maintain() method was added that calls audio.maintain(). Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a	2019-05-18 13:53:57 -06:00
Louis Pearson	315767f19f	Add code to ignore jack as an audio device ... Former-commit-id: 1dbaa796f82f2e9be26a3648e9aaca81f3348134	2019-05-18 13:53:57 -06:00
Louis Pearson	5a04e98725	Change asset paths to be relative ... Former-commit-id: 6c5f18484fe1b7cbf417d45c38af5ffaa8d48ac6	2019-05-18 13:37:44 -06:00
Forest Anderson	2e7984ebc3	Char selection ... Former-commit-id: 8da211b00dcd9a550a8f46e79164ece8f5c193e5	2019-05-18 19:03:13 +00:00
Cody	6b09fd7c53	Pedantic comment and language fixes. ... Former-commit-id: eb49765c911aaa97a9c8ed351216a7a6f8411213	2019-05-17 18:32:07 -04:00
Joshua Barretto	7174830279	fmt ... Former-commit-id: 71912bdd2b8f40020153c5696cd5cc1af3f154cc	2019-05-17 18:54:56 +01:00
Joshua Barretto	91184356e7	Added chonks ... Former-commit-id: a62fb321dbfb7541feaa9de4e641db9887b061fd	2019-05-17 18:44:30 +01:00
Imbris	8e0c1b1abd	cleanup some warnings, pretty crash string literal ... Former-commit-id: 43492866f624c12c87762a94188c6c193e5bb90c	2019-05-17 03:55:51 -04:00
Imbris	c780b85f24	Stop crash when minimizing ... Former-commit-id: ca52ae2520bf5616d24f27d98244a470966f3573	2019-05-17 01:13:14 -04:00
Joshua Barretto	db4be8e492	Updated sphynx ... Former-commit-id: f81484571bda8c5e15ea2b6c0e8b9b6892b094a3	2019-05-17 00:05:46 +01:00
Joshua Barretto	6f984ca181	Added figure colour to shader and health component ... Former-commit-id: e2c23e5132991cc436a678af43782e31ffc55516	2019-05-16 23:34:57 +01:00
Joshua Barretto	7b09070fc8	fmt ... Former-commit-id: 8f0bc964e00bfd9461f752622862de5335678e5b	2019-05-16 20:23:45 +01:00
jshipsey	6db00e371d	popup origin fix ... Former-commit-id: 9a7ba69115e7b574bc2f3bf26afad71e3c682c38	2019-05-16 01:29:48 -04:00
jshipsey	50fa3cf098	glide anim ... Former-commit-id: b614a672b0a94f2b8803c0c1c22468b889242cc6	2019-05-16 00:40:35 -04:00
Joshua Barretto	5092df0e7f	Improved quadruped origin ... Former-commit-id: 35a360bf285f2495dda7859cb8d376d5aa16a1af	2019-05-15 17:06:58 +01:00
Joshua Barretto	8ef8c178d7	Added test gliding ... Former-commit-id: 7aa1513511490feec531f10e58ad955c485ac594	2019-05-15 13:26:14 +01:00
Joshua Barretto	8af606e348	Fixed singleplayer logout crash due to orphaned mesh worker ... Former-commit-id: 2b8c5aa0c906223ac043db8137ad95a0e29407c5	2019-05-15 13:26:14 +01:00
Joshua Barretto	1209f0393d	Added figure colour to shader and health component ... Former-commit-id: 222c39bd401ad0a9707eb348d5640717004dbf96	2019-05-15 13:26:14 +01:00
Imbris	8b97ee14bc	add backtrace to panic hook ... Former-commit-id: c831dfa85ebfa1ace05e5ffdec5cc68954394ae1	2019-05-15 13:24:32 +01:00
Louis Pearson	85e97e16d3	Change vec<u8> to BufReader ... Former-commit-id: 0e91de7976357c96ac58e4f4293c680b9ab98155	2019-05-15 13:24:32 +01:00
jshipsey	efc019f7a4	idle, run, jump animations ... Former-commit-id: e476dc3aaf2197876c80eeba17837aee976f8df9	2019-05-15 00:24:36 -04:00
Joshua Barretto	49cc422dfa	Fixed quadruped animation selection ... Former-commit-id: 03315efa2c88a4ac3517835b25f7a14cd1599cf0	2019-05-14 12:37:05 +01:00
jshipsey	2a2b873f56	added skeleton, needs animation fix ... Former-commit-id: f2c741426c073f3bfab3cdcd5b7f401a4fc6400e	2019-05-13 22:24:34 -04:00
Joshua Barretto	cf487589e2	Made model cache handle non-humanoids ... Former-commit-id: 4b3efb70ba24a8e4c8e1d933752e8ea28d3e8dd1	2019-05-14 01:02:37 +01:00
jshipsey	732c43ce11	first quadruped changes ... Former-commit-id: 71ad084a872c3bf96d5cbab53c376d214f3cdcd0	2019-05-13 19:43:10 -04:00
Imbris	ca60b86f53	add ImageSlider widget ... Former-commit-id: 218eb14090365f9ea3c6fb956fcdb989d51aaea2	2019-05-13 13:09:38 -04:00
Joshua Barretto	5c36aaf01f	Merge branch '79-glsl-include' into 'master' ... Move u_globals to shared included file See merge request veloren/veloren!124 Former-commit-id: 297d46cfe956881ae7a22528fc4c12b8c5ed5c56	2019-05-13 13:40:02 +00:00
Joshua Barretto	67241fec31	Massively increased efficiency of terrain meshing, chunks generate from centre ... Former-commit-id: 66217b9974a791044e4b1f3d4580761bd066113a	2019-05-13 13:08:17 +01:00
Joshua Barretto	ee380782fb	fmt ... Former-commit-id: 140f1e4f1809b70881a51a3bd943e1697a9dc0a2	2019-05-13 11:29:35 +01:00
Joshua Barretto	4f53be633e	sync ... Former-commit-id: 708f80eabb9dc4052d35ed03875ef7ae485d6170	2019-05-13 11:15:03 +01:00
Joshua Barretto	216819ca92	fmt ... Former-commit-id: 4fd53e02969d9d044367d81640a2975043c6953a	2019-05-13 11:06:58 +01:00
Joshua Barretto	761c6e9cf8	Switched to actor system ... Former-commit-id: d2a482f6209aff7aaa4e747e35ce4a7c8a79cdfc	2019-05-13 11:06:58 +01:00
robojumper	ba10ca38ba	Fix chunk meshing ... Former-commit-id: d3a53602e4b480ab9db0a2a98e25cbba5081b624	2019-05-13 11:03:47 +01:00
sxv20_	f600eca072	start fixing chunk rendering, noticed stack overflow crash ... Former-commit-id: 334904276580cd78f5d5e3bf010a86fcd822cfdf	2019-05-13 11:03:47 +01:00
sxv20_	592477752e	move sample() to returning VolMap, incomplete VolMap meshing code ... Former-commit-id: 77d3db6c3bf28364089647802f83d2d00f3a152d	2019-05-13 11:03:47 +01:00
sxv20_	a5db1fd0a6	fix TODO (unnecessary mpsc clone) ... Former-commit-id: 6f6319fa6bf86ee4eec4778c6795f71beab21e89	2019-05-13 11:03:47 +01:00
sxv20_	c2a806910b	fix chunks not getting rendered once unloaded and reloaded, remove weightings ... Former-commit-id: d98d1e9bb767d80173c531e8914163c1cc23d7fc	2019-05-13 11:03:47 +01:00
sxv20_	38da6af3c6	change remeshing queue from LinkedList to HashMap, add remesh weightings ... Former-commit-id: 28f0826501539848ca97721aff5057ccb4599736	2019-05-13 11:03:47 +01:00
jshipsey	98380df9b2	pipeline fix ... Former-commit-id: 5de7ef7070f1d978206a4e303058411627fac138	2019-05-12 22:39:16 -04:00
jshipsey	1bc03efa90	minor alignment fix ... Former-commit-id: ecfa2eff0982e21d523a8a454890a1e6ed6d9bd7	2019-05-12 22:10:47 -04:00
jshipsey	e8c91f753e	Merge branch 'master' of https://gitlab.com/veloren/veloren ... Former-commit-id: 9306d50f9ba615dd6ca091753ff26688767b6291	2019-05-12 21:52:44 -04:00
jshipsey	dec9632460	animation adjustments ... Former-commit-id: 8752caf0bdcac1c2938f048878a008e8f5cd18e0	2019-05-12 20:52:30 -04:00
Forest	3d14d791cf	Cleaned code ... Former-commit-id: fd4ef550ff58f621a129901d142d80266fbbc534	2019-05-12 15:57:39 -04:00
Joshua Barretto	a8981378bf	Improved performance and compilation speed for debug builds ... Former-commit-id: 5d8b1c27a8a2ebfe63797969ee2aba7452a09dd3	2019-05-12 18:43:55 +01:00
Joshua Barretto	d8f6025b68	Added rendering to character selection menu ... Former-commit-id: 82992904639ec2f468c70f43f3f8fe721a98de51	2019-05-12 14:03:08 +01:00
Joshua Barretto	fc0f2f0801	Added option to not stop raycasting on error ... Former-commit-id: 6e094b6514bcda2fbcdfe44dbb90900b50e939c2	2019-05-12 14:03:08 +01:00
Joshua Barretto	266101c90d	Added basic pets ... Former-commit-id: 1ef17505ecb11acb82541349343989128b78630f	2019-05-12 14:03:08 +01:00
Pfauenauge90	66eceb3ca7	Added Grid to main and offhand ... Former-commit-id: 6395ba9142d6da3e14c7363e0f38f4fc61de6b79	2019-05-12 14:52:43 +02:00
robojumper	ee9f54bacd	Move u_globals to shared included file ... Former-commit-id: b6122177ce98cd52bc032e2d8414671d3bcb9b5c	2019-05-12 11:23:21 +02:00
Imbris	cec01c0d69	rustfmt ... Former-commit-id: 227b7f5a55546c678617d157b739e61f15c4aa4b	2019-05-12 00:17:10 -04:00
Pfauenauge90	e7ab006db7	transparency ... Former-commit-id: 5a0c0f7267347c3758a266ff49670b55c6e6cc0c	2019-05-11 22:35:19 -04:00
Imbris	52cf7c6f94	rebase fix, re-arrange hud img_ids ... Former-commit-id: a5cb82f74afca531995fceea3ddf7ff53616dd1b	2019-05-11 22:35:15 -04:00
Pfauenauge90	fc4103561e	CharWindow ... Former-commit-id: 1fe067505229dc78dee4a0175fcbdbb2040599bd	2019-05-11 21:36:27 -04:00
Pfauenauge	a59f0e57aa	char window ... Former-commit-id: 2624ddd883c0ff555fc86efce767fda602de52eb	2019-05-11 21:36:27 -04:00
Pfauenauge	a6b792f930	Char Window ... Former-commit-id: 0109555602ba39950f304bd0adc80df6175c3728	2019-05-11 21:36:27 -04:00
Pfauenauge	789e448aa3	positioning ... Former-commit-id: 7583dfac4be650ecabaf49608712c8d3cb952bf5	2019-05-11 21:36:26 -04:00
Pfauenauge	3f57ab4f2a	positioning ... Former-commit-id: 510fcaea11f0e9293e73ba98fb9ad79b5dbbadb5	2019-05-11 21:34:50 -04:00
Pfauenauge90	657bba06e9	asset update and import ... Former-commit-id: 43f616f166c3df87a19f0eca80a65f7a3c0e374c	2019-05-11 21:33:48 -04:00
Pfauenauge	bd23732c74	char window ... Former-commit-id: 0c15336583eeaf32f0d86ef10b16c47f46d4db7f	2019-05-11 21:32:38 -04:00
Pfauenauge	5731484940	Char Window ... Former-commit-id: c44ca056fe76b00e803d96825da69385cfecad39	2019-05-11 21:32:36 -04:00
Pfauenauge	5aa5e84a46	positioning ... Former-commit-id: 4524965ee5fa82fc35c965061079d7b52919a74a	2019-05-11 21:32:34 -04:00
Pfauenauge90	757fbdd653	Asset Update ... Former-commit-id: 2f3e58679059c3c97cec9312c6fa436d5510b901	2019-05-11 21:32:30 -04:00
Pfauenauge	15816bdf6d	positioning ... Former-commit-id: 44e8406af9c2b6db60f78f7ff161b7c700f024fd	2019-05-11 21:31:17 -04:00
Pfauenauge90	0f6ec8dce3	asset update and import ... Former-commit-id: 455500aac3d82e2920bc02c6846ceb815122bb7d	2019-05-11 21:31:15 -04:00
Imbris	1948bc6392	fix & remove some unused uses, cursor toggle tweak ... Former-commit-id: b398b11606d983b7f80364a5689804e3491c218f	2019-05-11 10:59:48 -04:00
Imbris	aed6750885	add multisampling option to voxel graphics ... Former-commit-id: d5ca47cd029226d1268c6d860516bfea6f9c5cf6	2019-05-11 10:25:15 -04:00
Imbris	b99a8dea39	Stop recreating vertex buffers for ui ... Former-commit-id: 6e9326d1bca942e4da70281e3d86b624f9d2504a	2019-05-11 10:22:20 -04:00
Imbris	89c06e8359	split up voxygen/src/ui/mod.rs ... Former-commit-id: e220b1ce38f93fbb295c9aae3591e4b3899f57e4	2019-05-11 10:22:17 -04:00
Imbris	13350856db	small cleanup ... Former-commit-id: 2996ce0cf33337bf52810f1e52b2c02d6eba5c7f	2019-05-11 10:22:16 -04:00
Imbris	caea30a34f	make ui ignore resize to <1.0 events ... Former-commit-id: d4baa8234f6c25f2c28c07c1dbf06e6c191a4127	2019-05-11 10:22:16 -04:00
Forest Anderson	cf22cb99e7	Ran fmt ... Former-commit-id: 6acf43d8e4c446b3f50a673179b8df20d6da648c	2019-05-09 17:30:44 -04:00
Joshua Barretto	89f9589cf0	Fixes to head animations ... Former-commit-id: b595d4cdb459acbdd3a9a971aff8f0fbfd45981a	2019-05-09 20:18:13 +01:00
Joshua Barretto	54cc9e137a	fmt ... Former-commit-id: b43b7192f7a2dd71da26182ca0c74449867381f3	2019-05-09 18:58:16 +01:00
Joshua Barretto	3b44bda43c	Secret feature ... Former-commit-id: 254581d14d272f77b2d047dd8a740a458270c0b2	2019-05-09 18:57:47 +01:00
Joshua Barretto	cf4e02252a	Smartened up terrain generation ... Former-commit-id: d85448e5171bd27b04530da8e1ca927554136ebf	2019-05-09 18:57:47 +01:00
Joshua Barretto	94fd0b1a22	Fixed running animation, changed movement physics ... Former-commit-id: 1b4c1f63701668074874aa6efc65f883f29e2cc1	2019-05-09 18:57:47 +01:00
jshipsey	ac78d322d6	animation orientation fix, first jump ... Former-commit-id: e4653bbdc553e496edfe011bf5aa2f97a4cf3b90	2019-05-09 18:57:47 +01:00
Joshua Barretto	6da495f0bd	Fixed window resizing ... Former-commit-id: 81f2e18274aadb53b07704cf10c5c27efdccb032	2019-05-09 18:57:47 +01:00
Joshua Barretto	df9b64355a	Improved singleplayer error handling ... Former-commit-id: 0e33493bbb588ab0cd5278ec92b5859712446f4b	2019-05-09 18:57:47 +01:00
Joshua Barretto	e5db851f30	Added FXAA to post-processing shader ... Former-commit-id: 9cfdb3762b63688d1b59d65066c90355c7209c62	2019-05-09 18:57:47 +01:00
Joshua Barretto	c48a82e78d	Adjusted sun and added F16 render target ... Former-commit-id: 5585e0038846ef34378933eeb9051714ffe2c100	2019-05-09 18:57:47 +01:00
Joshua Barretto	871767ada0	Made single-player server start on random unused port ... Former-commit-id: 95ec85b9be58d0fd348144c398004a69676eb6cd	2019-05-09 18:57:47 +01:00
Joshua Barretto	3705f9a871	Added anim_time to animations ... Former-commit-id: 44ec8108c41a3cad74b6f3c0a2df02e5166a5487	2019-05-09 18:57:47 +01:00
Joshua Barretto	2e3288cc29	Adjusted view distance and worldgen ... Former-commit-id: 01eeb0e48bcb018111c5f32b6252beb11bccd452	2019-05-09 18:57:47 +01:00
Joshua Barretto	e6a40bbda2	Added jumping and Jump animation state ... Former-commit-id: 6ae9f7e9c9fb2bc519a0ef2c1c8195376616ed4c	2019-05-09 18:57:47 +01:00
Joshua Barretto	5aa8a67800	Added jump button ... Former-commit-id: 614614fbe0a8cfc29d28010084078d4441734307	2019-05-09 18:57:47 +01:00
Forest Anderson	87fab23dc8	Merge branch 'panic-clarity' into 'master' ... Issue-83: Voxygen, main, extracting payload from PanicInfo See merge request veloren/veloren!115 Former-commit-id: 459f40cd6a676a75e5e1eb84f73b8ac94dc8ddb5	2019-05-09 17:49:43 +00:00
Vsevolod Timchenko	af4192869d	whitespaces fmt fix ... Former-commit-id: 1f9296d4f773f2da6e222a89f471f30c77b432fa	2019-05-09 20:27:07 +03:00
Imbris	3faf4855cc	Merge branch 'cursorgrab' into 'master' ... Improve cursor grab Closes #55 See merge request veloren/veloren!113 Former-commit-id: 56ade58e0a2f55f657f8b714a2216023659b161f	2019-05-09 17:02:24 +00:00
timokoesters	a58b5ceb3a	Fix bug when pressing ToggleMouse twice while grabbed ... Former-commit-id: 9e01b71577fd3dbe570b7aca1e041c32e9a01c66	2019-05-09 18:55:13 +02:00
timokoesters	e8cf815143	Force ungrab on Key::ToggleCursor ... Former-commit-id: 222f5693363662d25cb065fdc104cd079e2c395d	2019-05-09 10:55:32 +02:00
timokoesters	a86dc3ae80	Remove unused code ... Former-commit-id: 80eb4dcdea740323b510e11b6e08cd6e13709dff	2019-05-09 06:55:26 +02:00
timokoesters	2309ce599c	Move font_ids! into mod.rs ... Former-commit-id: 602ea44814a25c068e5c022cedc780e3ddc020ae	2019-05-08 22:25:15 +02:00
timokoesters	0e46b00a0c	Minor fixes ... Former-commit-id: 9c5e90e2bad24e9b5c443bfb1509b18877adf2d6	2019-05-08 22:15:58 +02:00
Vsevolod Timchenko	1cfd0de2ba	Added unpacking ... to panic messages, issue #83 Former-commit-id: 55b45773d049834a7a6cf43bbdf656cba7290f74	2019-05-08 23:01:02 +03:00
timokoesters	854271f321	Make use of image_ids! in char selection ... Former-commit-id: 98a11ae94aa299a8eb9e5e4d69cb99c7753f626b	2019-05-08 20:40:34 +02:00
timokoesters	31ab734f90	Make use of image_ids! in the main menu ... Former-commit-id: 30b040b0ff046d0ae63394a2331866a6aec6b25f	2019-05-08 20:19:57 +02:00
timokoesters	f6b27db6dd	Improve formatting ... Former-commit-id: b2167cd982c37b3716fa74d3e75d27e5cf3c65ce	2019-05-08 20:19:38 +02:00
Imbris	470e63a691	Remove or uncomment commented code ... Former-commit-id: 32ac76b649012a0a2756f796b26d48318faad11c	2019-05-07 21:59:35 -04:00
timokoesters	a15532f81a	Improve cursor grab ... Former-commit-id: c1a8b5383bf7682245e2294e5b1d62dae0beb329	2019-05-07 22:00:03 +02:00
timokoesters	b3ffc61119	Don't let widgets have mutable access to show ... Former-commit-id: 4c525c60d25bcc6551ddeabd325992fcd513619d	2019-05-07 19:50:53 +02:00
timokoesters	54cc96f0d1	Move minimap into own file ... Former-commit-id: 7c4a9b0930c899fc8e5089920c3ee5c717561a1a	2019-05-07 19:34:30 +02:00
Imbris	81c5a070c5	move conrod font out of common ... Former-commit-id: 1e7cbce00eddff6c765326671d04d9494639773e	2019-05-07 02:25:26 -04:00
Imbris	d13430d51e	revert chat clicking change (broke scrolling) ... Former-commit-id: f43f3fd97c01dc304f29fcc852ab9909e6d00620	2019-05-07 01:50:47 -04:00
Imbris	eb3d8310f8	rustfmt ... Former-commit-id: 7e2cdb284c670b5991c69b6aab042194c806171f	2019-05-07 01:40:03 -04:00
Imbris	99d6c92c8d	rebase ... Former-commit-id: d73c1bcd433fea599fb4d342918117b23324c8d2	2019-05-07 01:39:32 -04:00
Imbris	0fc6dd317f	open input box by clicking anywhere on chat ... Former-commit-id: f379c52d034b16c5390375899e551b01515cd11e	2019-05-07 01:27:24 -04:00
Imbris	5c63f398ba	replace typing field with function and cleanup ... Former-commit-id: eed8063a12ac475927e9d0eabc0aafc0598ce9ef	2019-05-07 01:27:24 -04:00
Pfauenauge	009ca0a130	small windows "relative" to opened char window ... Former-commit-id: 13d07e3bfce60cd17eaf7447a442c47353d9517e	2019-05-07 01:25:33 -04:00
timokoesters	7f709bba0c	Prepare relative small windows ... Former-commit-id: 6f1046518b49b302d69d51e0596514bf9ded7952	2019-05-07 01:25:32 -04:00
timokoesters	a36fcb4243	Fix settings to use Show ... Former-commit-id: 99c31d8c9914f4b9e6fbcc2b1f72a97a260a725b	2019-05-07 01:25:32 -04:00
Pfauenauge	6894e55a24	Bag Position ... Former-commit-id: af8435d0c078ea1caa388ff0926ef6dae22ab70b	2019-05-07 01:25:31 -04:00
Pfauenauge	b7b3c5f3cd	positioning ... Former-commit-id: d599e046d1944a41eef5423cf3bb0f17f42a246a	2019-05-07 01:25:31 -04:00
timokoesters	87e75644ec	Fix fonts ... Former-commit-id: c7929a0b540099ac67b93563d97be4b8c6639190	2019-05-07 01:25:31 -04:00
Imbris	efa2afc5c8	re-enable chat focusing ... Former-commit-id: 8cbcbba82bcb85fec11638085cff26049838fe6d	2019-05-07 01:25:30 -04:00
Imbris	7bade0360e	Move Hud's show fields to their own struct ... Former-commit-id: 8f546b2c2f40fb74e4daecc982256b441fcdd7fb	2019-05-07 01:24:12 -04:00
timokoesters	1c79d06985	Fix settings ... Former-commit-id: 694387dc670ac2c39d3fbc8915d4819b638fe431	2019-05-07 01:22:48 -04:00
Pfauenauge90	6cbd045231	positioning ... Former-commit-id: 90b626c2900e6bf4924dc290764c2860a5bade98	2019-05-07 01:22:47 -04:00
timokoesters	819e0a200f	Separate bag + buttons into own file ... Former-commit-id: 08e3b640adb85266ce7a739008fa26e1caee0ebf	2019-05-07 01:15:49 -04:00
timokoesters	abd960aa48	Move skillbar into own file ... Former-commit-id: efab633e9b5c1ffc5071a556203490780615cde6	2019-05-07 01:13:26 -04:00
timokoesters	08aa8875fd	Separate settings and small windows and convert chat ... Former-commit-id: 847b0b8cf64b9d2de10b241d37bb7e21c126d314	2019-05-07 01:12:56 -04:00
timokoesters	f695973bb2	Make fonts work, Remove style ... Former-commit-id: 53d158aff30d8c53b86deb62f7079ba06b5119ce	2019-05-07 01:08:27 -04:00
timokoesters	e8aa680aad	Move map into it's own file ... Former-commit-id: 5a1b593e3d6b00dad3e3a4d462dfd48592537f64	2019-05-07 01:00:48 -04:00
Imbris	8232ffbd33	add load_expect, change error reporting ... Former-commit-id: 6064384b14e055701f11c3a1f4931aa6eb27adda	2019-05-07 00:59:05 -04:00
Imbris	775b5e731e	integrate blank graphic, remove Graphic from impls ... Former-commit-id: 190e03fe98591e8ab29d1202cf462cf6b51ede4d	2019-05-07 00:57:42 -04:00
Imbris	2f9358f167	integrate timo's macro change ... Former-commit-id: a7657636efe4ce1db8c1714077262585e662c982	2019-05-07 00:54:35 -04:00
Imbris	33fbcd1e93	formatting tweaks ... Former-commit-id: 90d46c995737d7077a581e9767209fc338c392fa	2019-05-07 00:48:39 -04:00
Imbris	9d63253627	enable split out character window ... Former-commit-id: 9018814bd43960b9f0f5f8da03794df9c1eb803c	2019-05-07 00:48:38 -04:00
Imbris	990b42a6b0	remove poison err & Segment Asset impl, cleanup ... Former-commit-id: a2bf1ed8400da824c18ceb33a02160ecaf7d43fa	2019-05-07 00:47:22 -04:00
Imbris	1d5020634d	revamp asset system with a global singleton cache ... Former-commit-id: edfc83397ed897fcec37589261c2cfae42d6ec32	2019-05-07 00:44:44 -04:00
timokoesters	b83d45c464	Change macro to make single struct ... Former-commit-id: ed7876d49fccdc7fb11317c13b59b2b4776daef9	2019-05-07 00:33:06 -04:00
timokoesters	f028aa5a2c	Split character_window from hud/mod.rs ... Former-commit-id: 61a09a0ff322dc104d8f4a50eff654706daccde8	2019-05-07 00:33:06 -04:00
timokoesters	3f0f8b84d1	Fix asset imports ... Former-commit-id: 57e3f136aa61d4e7431f147a79e8ea29fd992328	2019-05-07 00:30:09 -04:00
timokoesters	c7dd3e96cc	Start work on image_ids! and asset loading ... Former-commit-id: 1e86e627f8ec6a146aa59558da50658beaad91c6	2019-05-07 00:28:05 -04:00
Forest Anderson	6699d7cba2	Merge branch 'backtraces_and_panics' into 'master' ... Fix panic when minimizing, show backtraces when panicking See merge request veloren/veloren!108 Former-commit-id: 161f1ffe4818cce3535be3913b9da2c476b56334	2019-05-06 14:42:45 +00:00
robojumper	209b29a870	Slightly improve render target creation code ... Former-commit-id: 7ce92cce35834b006df9dacb4b4dd3e88d603b4e	2019-05-06 14:06:07 +02:00
robojumper	821ab80c5b	Add post-process pipeline ... Former-commit-id: aed1fff25f7fd95fe040b0877011cbe57e77eba3	2019-05-06 10:22:47 +02:00
robojumper	31a8e653c4	Fix panic when minimizing, show backtraces when panicking ... Former-commit-id: 0ad401d81a2f7b4d0b766578238d2ab9259f80eb	2019-05-05 20:42:44 +02:00
robojumper	b2c2d89447	Run cargo fmt ... Former-commit-id: c038eee51ee522fc170f7dcee94c533ad2708df2	2019-05-05 17:54:08 +02:00
robojumper	647d1dcc9c	Smoother and terrain-aware camera ... Former-commit-id: 46b4e90d03792c9efb7d6b728c0d0cd60b1f5058	2019-05-05 17:44:56 +02:00
Forest Anderson	aa9c01af35	Merge branch 'master' into 'master' ... Update help window to use player's keybindings Closes #42 See merge request veloren/veloren!71 Former-commit-id: b35965946b9558a19f29610357d62982f7554588	2019-05-04 17:52:16 +00:00
Pfauenauge	48d254c7ae	esc menu buttons visuals fix ... Former-commit-id: 742857d2f7bcf19a543890bf780d9b46fbca9e0e	2019-05-03 22:25:23 +02:00
Forest	75f8a638f7	Ran clean code ... Former-commit-id: 77b012d79af3cb9e56c008df1802c89a38f3374c	2019-05-03 09:49:05 -04:00
Pfauenauge	c45494e70f	textbox visuals ... Former-commit-id: 4ae65bb009a1e461143b3dbf3f3e52344148fa7c	2019-05-03 13:48:56 +02:00
Pfauenauge	8240997f8c	New Buttons and Input Frame ... Former-commit-id: cf05992eca9e6a75cedda8c873ef268e4bbaade8	2019-05-03 13:48:55 +02:00
Pfauenauge90	b3bac9a46e	Controls Window ... Former-commit-id: 785b039f9241da2f0ba66e7e2db2a14a9b8b54c9	2019-05-03 13:48:54 +02:00
Pfauenauge	c188affb4e	rebase ... Former-commit-id: 9c50e08fc7c4e8afa06f1f995ea1aebd386764c2	2019-05-03 13:48:53 +02:00
Pfauenauge	c312a8cece	rebase ... Former-commit-id: 214203f0d1ccb4e6457395e84b01e4d41467ecdb	2019-05-03 13:48:52 +02:00
Pfauenauge	dc4ea871ea	Controls Window Contents ... Former-commit-id: f3317475e6a06c63ae0a648b29168474b9cf7544	2019-05-03 13:48:26 +02:00
Pfauenauge	02ba0d969f	Controls Window Text ... Former-commit-id: 7f33117748c84644e9f6d7833b5ff44e035e7d76	2019-05-03 13:48:25 +02:00
Pfauenauge	188e523128	rebase ... Former-commit-id: f44030800c380054af2fef4532bbe93731f128e4	2019-05-03 13:46:13 +02:00
Pfauenauge	12347ead0b	settings window ... Former-commit-id: 3cefa7cc816206fd777f4a94a9b9a1689ed9aa03	2019-05-03 13:46:12 +02:00
Pfauenauge	cbd754bd90	settings window ... Former-commit-id: a7a72ab6b1db411fcfcf3e03d1db4fce56370af3	2019-05-03 13:46:12 +02:00
Pfauenauge	1109c55671	Map Window, Settings Window ... Former-commit-id: 337f21010b8c4250a1eaa7ddfbe8d5f2ea1ac412	2019-05-03 13:46:12 +02:00
Pfauenauge	5852efd896	settings window ... Former-commit-id: 41d85bdc41507bb8c26e5cda2db3135200db7be5	2019-05-03 13:46:11 +02:00
Pfauenauge	1f369d37bf	Map Window, Settings Window ... Former-commit-id: e01861cab1a42540a8b92db46debf95ede3978aa	2019-05-03 13:46:11 +02:00
Pfauenauge	632ecabef9	Map Window, Settings Window ... Former-commit-id: a94f57941d95cc271a5642e54af7e6ddf373cd18	2019-05-03 13:40:48 +02:00
Yeedo	b7ba7f0795	Use shorter help text format, compact stuff into one format!() ... Former-commit-id: 345bef9a2f0714986e4ba6fb24b0bc150023a12e	2019-05-01 23:15:43 +01:00
Yeedo	f1e268986b	cargo fmt, also remove a stray <<<<HEAD thing ... Former-commit-id: 2be13ebd752d8f90fb22358597878dc8dd8df1ef	2019-04-29 22:23:31 +01:00
Yeedo	164feaa616	fix merge conflicts ... Former-commit-id: 72614e5d57607a2095161857df45ce746e8c1b06	2019-04-29 22:13:14 +01:00
Forest Anderson	993388e56a	Ran fmt on codebase ... Former-commit-id: 7fecffa1dc66fffba4f07d45fb80960dc5178f4f	2019-04-29 20:37:19 +00:00
Monty Marz	c7b61d5626	New Settings Window and Map Window ... Former-commit-id: ca6d1c937193cb29afb2dd484c596b79c947f36e	2019-04-29 19:04:52 +00:00
Forest Anderson	3c45d3c996	Merge branch 'ao-artifact-fix' into 'master' ... Fix ambient occlusion artifact See merge request veloren/veloren!89 Former-commit-id: b529f9df722d8b174b0c8e5ce9ef2d32965d7294	2019-04-29 17:00:56 +00:00
Erocs	c68f33babe	Add VOXYGEN_LOG env variable to allow detailed terminal logging. ... Former-commit-id: 01c29a65311dbd6a4739be5aca9865d4ac0872d9	2019-04-29 16:56:38 +00:00
robojumper	cf88e9a5b1	Line endings are hard ... Former-commit-id: 3a0e48b7571ff706feeff4e089fb9c5d63f6ac7a	2019-04-29 17:41:12 +02:00
robojumper	0bd84b58ec	Fix occlusion artifact ... Former-commit-id: 23be3f1173706076802809576e3455833e64b4e4	2019-04-29 17:39:35 +02:00
Forest Anderson	c95bee9838	Merge branch '12-terrain-ao' into 'master' ... Add terrain and figure ambient occlusion Closes #12 See merge request veloren/veloren!84 Former-commit-id: 943648d9ca3399e07a275946487d3431ba3832de	2019-04-29 13:14:36 +00:00
robojumper	7091557b82	Rename mod ao to vol ... Former-commit-id: ef126e03761b18151594780777fa27e94efe24d7	2019-04-28 23:35:47 +02:00
robojumper	021c6eeda1	Generalize meshing and AO code over terrain, figure ... Former-commit-id: f0a91173ec5a0a9c683e6d1c222cb74e858625b7	2019-04-28 19:12:45 +02:00
robojumper	32509d2fb1	Add terrain ambient occlusion ... Former-commit-id: de73dcb09f68bcad5dc7431c30849e16f68c5ab7	2019-04-28 17:10:09 +02:00
Pfauenauge	3773653072	Closable minimap ... Former-commit-id: bc92efc783adb780c11c507bd4084e09494a7e32	2019-04-28 15:56:40 +02:00
Yeedo	0dbdb185d4	Redo settings -> help text, add supplement_events to Window. ... Former-commit-id: 2f341c1de302f5600436a3ded1c69af7c9b2c329	2019-04-28 14:19:08 +01:00
Yeedo	c032e60d12	Tiny fix to prevent settings from permanently being marked as changed ... Former-commit-id: c12d760a22926eebc2661be1db4609546286c89a	2019-04-28 14:19:08 +01:00
Yeedo	dc5ec137e9	Update help window to use player's keybindings (fix #42) ... Former-commit-id: b5bc8a8801fd4633ec94ea53a8973bcb891a4fd6	2019-04-28 14:19:08 +01:00
Yeedo	ad1fc20cfe	Redo settings -> help text, add supplement_events to Window. ... Former-commit-id: 5b29776d3f37fbf87842bc61c8d287fe8e66b691	2019-04-28 14:19:08 +01:00
Yeedo	00e92e5ea2	Tiny fix to prevent settings from permanently being marked as changed ... Former-commit-id: 99927ee1ca6c1cabb5268353690ec88425b7ae3d	2019-04-28 14:19:08 +01:00
Yeedo	e1fc901b5f	Update help window to use player's keybindings (fix #42) ... Former-commit-id: c79b4184b279b2e6fbaac8e0b7c641741d8eb51e	2019-04-28 14:19:08 +01:00
Yeedo	44f8e834fc	Redo settings -> help text, add supplement_events to Window. ... Former-commit-id: a0e023c1cce1677cd1178490df9c569b774db6b6	2019-04-28 14:19:08 +01:00
Yeedo	48747dd9a9	Tiny fix to prevent settings from permanently being marked as changed ... Former-commit-id: ce120495a91ce0306bcb010923cd340fc70b87db	2019-04-28 14:19:08 +01:00
Yeedo	488132f63b	Update help window to use player's keybindings (fix #42) ... Former-commit-id: b1d374e83ab134a094b664ada8f35916e4734602	2019-04-28 14:19:08 +01:00
Yeedo	be9a399269	Redo settings -> help text, add supplement_events to Window. ... Former-commit-id: 1e679a6fc3300b6269672650564405c031b151ae	2019-04-28 14:19:08 +01:00
Yeedo	7593d4e821	Tiny fix to prevent settings from permanently being marked as changed ... Former-commit-id: 665a8851526c1386e497064e2b0f3f8689db60d8	2019-04-28 14:19:08 +01:00
Yeedo	50c6518d89	Update help window to use player's keybindings (fix #42) ... Former-commit-id: 5f35a153f05b48ae8c21ae9735080c5c7392e2dc	2019-04-28 14:19:08 +01:00
Pfauenauge90	0afbba3303	FPS display moved, changes to windows ... Former-commit-id: 141d250e29273f59edf661eff7fc7ebd88754435	2019-04-28 13:18:00 +02:00
Pfauenauge90	33515bd04c	removed test_assets in voxygen ... Former-commit-id: 6f2a995cf6905066e41d4224016b3d63dfbcacca	2019-04-28 13:18:00 +02:00
timokoesters	a4d7d0d488	Implement StartSingleplayerState ... Former-commit-id: 982246096fe20c33631c1df3ce172c60b4f49bfe	2019-04-27 22:57:55 +02:00
Joshua Barretto	b72c6b7185	Merge branch 'master' into 'master' ... bag visuals fix See merge request veloren/veloren!75 Former-commit-id: 30b26e73c0d43ef4f0c3d55154547e5d010a33a7	2019-04-25 21:59:55 +00:00
Pfauenauge	d7be49def1	Minimap changes, grass colour adjusted ... Former-commit-id: 9dd743eb6277c76c0b596592bc8bec4a875038b5	2019-04-25 23:43:32 +02:00
timokoesters	fb0b0f682a	Fix duplicated code ... Former-commit-id: 3096669413032d1bdb43cb349c333948e497b538	2019-04-25 22:59:11 +02:00
Pfauenauge	bf8bb9180b	bag visuals fix ... Former-commit-id: e73f822883badd76d823c69984675a76e9bbbf1e	2019-04-25 22:33:14 +02:00
Joshua Barretto	f1b63732af	Merge branch 'master' into 'master' ... Terrain Closes #5 See merge request veloren/veloren!66 Former-commit-id: 01d1eb1e0aaae62d0c2a53390fd847db524d217e	2019-04-25 19:35:35 +00:00
Forest Anderson	cabb06717b	Merge branch 'show-mouse-esc' into 'master' ... Show mouse on Esc, hide when pressing again Closes #28 See merge request veloren/veloren!61 Former-commit-id: 37d5792a563f4cce2f2c9f13d3d46cf098caf27f	2019-04-25 18:27:08 +00:00
Joshua Barretto	f136a63f69	Adjusted terrain loading and meshing performance ... Former-commit-id: b55800b559289bf925d56096f29c0cfbc22439d2	2019-04-25 17:52:11 +01:00
Joshua Barretto	0b0c71592c	Fixed orientation issue ... Former-commit-id: 9fdeadb4c9a9ff55cbdeccbbf97ac32b4e9f4226	2019-04-25 17:52:11 +01:00
Joshua Barretto	9105bf0811	Added better terrain collisions ... Former-commit-id: 38de44654d8050260a19a1da6c40c0f701602f13	2019-04-25 17:52:11 +01:00
Joshua Barretto	f210de09df	Added raycasting (needs testing) and basic character terrain collision ... Former-commit-id: be6bfacfd28e777a64d8157fce129f8072e20b38	2019-04-25 17:52:11 +01:00
Joshua Barretto	61afb98869	Foobar ... Former-commit-id: adac9eea1bd685a8eee275e5a05a74c287762e22	2019-04-25 17:52:11 +01:00
Joshua Barretto	f9f434a1c2	Started work on worldgen ... Former-commit-id: 277a4b2a0a5a393c590a710aebaf62e5cce2ad1d	2019-04-25 17:52:11 +01:00
Louis Pearson	b0ebbd5631	Use the directory defined by the OS to store configuration files ... Former-commit-id: 7735a27f088a8bd543bf812f1299500844140d4f	2019-04-25 10:24:00 -06:00
Joshua Barretto	7e1ef46e4d	Merge branch 'pfauenauge-fix' into 'master' ... Update UI (Pfauenauge) See merge request veloren/veloren!68 Former-commit-id: 43d549dbb8882937df929f618325163d22c919a4	2019-04-25 12:25:30 +00:00
Joshua Barretto	dc86b4d14e	Removed old commented logging code ... Former-commit-id: 9b20f7b7a979de3377f1da84d46e23ddd0ef6c11	2019-04-25 13:08:47 +01:00
Joshua Barretto	abaab5787b	Made message output smaller ... Former-commit-id: 21eee7126baf3f85468dc54c5e31cbb4deda9667	2019-04-25 13:08:46 +01:00
Joshua Barretto	03051248b9	Added user-friendly error output for Voxygen ... Former-commit-id: 55952f32019e826863849f07a71695de3e0c4c3c	2019-04-25 13:08:46 +01:00
Joshua Barretto	d04db4f6dc	Merge branch 'master' into 'master' ... velocity tilt, run adjustments See merge request veloren/veloren!69 Former-commit-id: 90a449e76431bb11bf748b887876c0e88db9e566	2019-04-25 12:08:01 +00:00
Louis Pearson	2a6a0a2a3e	Fix default server loading ... Former-commit-id: 2273a32327c5268e4f6d5cce97bd58792a385c71	2019-04-25 02:45:01 -06:00
Louis Pearson	feb0610448	Ran rustfmt on ui.rs ... Former-commit-id: 7ee721023ce69de122993b9c94b0bd3fa739e154	2019-04-25 02:35:08 -06:00
Louis Pearson	d7e9caf5de	Adjust server list UI ... Former-commit-id: 61587cbd540c71bc9c264a744b89b8d88ec7ac15	2019-04-25 02:35:08 -06:00
Louis Pearson	dadbfb9d85	Add clickable server buttons ... Former-commit-id: d56b65b83db590991a2a42a95caa7b41a216052c	2019-04-25 02:35:08 -06:00
Louis Pearson	d7c80d0afc	Add basic UI to view saved servers ... Former-commit-id: 85cc946ac3684aaba64a03997790ef5ab06dbbd7	2019-04-25 02:35:08 -06:00
Louis Pearson	15c2cdb2ef	Add networksettings and integrate with main menu ui ... Former-commit-id: f04532e03f8262b9751ae4a68259637f7de0344c	2019-04-25 02:35:08 -06:00
timokoesters	e36ca0bc59	Fix unnecessary if ... Former-commit-id: 303b140a06045a7eb3406402d5e30480571a713d	2019-04-25 10:27:18 +02:00
jshipsey	c0a8a677b7	simplified scaling code ... Former-commit-id: 9e35a57ea812f1446958daac2ccd4c3492d19347	2019-04-24 23:33:36 -04:00
jshipsey	0a34bfab9b	run animation incremental tweaks ... Former-commit-id: fa43d89890e22da665dc29606baed46e23f8eb6e	2019-04-24 23:32:35 -04:00
jshipsey	bc5074a2b8	velocity tilt ... Former-commit-id: 362232bff35784828ee8766e77dadc4e83bf3753	2019-04-24 23:31:18 -04:00
jshipsey	56a8a247cc	simplified scaling code ... Former-commit-id: 2a1c8450f002862f67873c375674413902e138ef	2019-04-24 23:30:06 -04:00
jshipsey	9c15fa08a8	run animation incremental tweaks ... Former-commit-id: 3abad8762a7a2daaf96c955cf89bcf5713ae7318	2019-04-24 23:28:51 -04:00
jshipsey	9510edd148	velocity tilt ... Former-commit-id: 34443765d993ec5036d2b3e08e7dff5a68193de6	2019-04-24 23:26:22 -04:00
jshipsey	97603120a2	simplified scaling code ... Former-commit-id: 3f85bf6aef1f3931570fafb8b2aa5b0dc26f8fad	2019-04-24 23:25:05 -04:00
jshipsey	4d0660affb	run animation incremental tweaks ... Former-commit-id: c80f014baf3b9ddb73bb01cf6fd83272d890ab55	2019-04-24 23:25:05 -04:00
jshipsey	df39bcb2dc	velocity tilt ... Former-commit-id: 7373827734c9a65813537d7a1cb49b400c7d6fb8	2019-04-24 23:25:05 -04:00
timokoesters	a981d57379	Fix formatting ... Former-commit-id: 5fd593a918f22d02b2c5be246c81ef1e8042ad69	2019-04-24 22:33:34 +02:00
timokoesters	8314fc9439	Update UI ... Former-commit-id: 644483e15f2d4db6ab2400ffe4fb202729769217	2019-04-24 21:55:22 +02:00
Forest Anderson	f85e3546cf	Merge branch 'fps_counter' into 'master' ... Add debug window, window toggle, fps counter See merge request veloren/veloren!63 Former-commit-id: 38e5d85a0db9a01c877f975f91526cd2dbe1c1fb	2019-04-23 17:57:49 +00:00
sxv20_	0127cae5d0	remove TODO comment ... Former-commit-id: cd90cd0403d03b6c8c9477a7377ad25288cc1488	2019-04-23 18:36:29 +01:00
timokoesters	701755a8e2	Add disconnect handling ... Former-commit-id: 24a9d535101f28debc0fe5a0600a32c9b744466f	2019-04-23 14:01:16 +02:00
timokoesters	7baecff1f0	Clean up figure cache models when necessary ... Former-commit-id: 7653217b2f4c02f5c179e35907fa47c3526b2a2e	2019-04-23 13:59:16 +02:00
timokoesters	3bb7de61ef	Fix .internal() ... Former-commit-id: 63207ee9bdc1fa31dcff0c5ad93c6a71857fe165	2019-04-22 23:00:25 +02:00
timokoesters	e9027c6433	Split connecting from registering ... Former-commit-id: 56c21f72bc5b53635d6fdf00c99eb34df3b448c9	2019-04-22 23:00:24 +02:00
timokoesters	ba6ead4077	More wrong messages will be punished with disconnect ... Former-commit-id: 767f3226c62d7560d26a909eed8a69b8afe11110	2019-04-22 23:00:23 +02:00
timokoesters	794b9cafad	Implement ClientStates ... Former-commit-id: f6167fd6de6fd1a3309224409cac77193be982e2	2019-04-22 23:00:22 +02:00
timokoesters	802c484a38	Make character model more variable ... Former-commit-id: 331baad40c79d846290c4617ea8e359b2786c7ef	2019-04-22 23:00:21 +02:00
sxv20_	ded36d7c8d	Add debug window, debug window toggle ... Former-commit-id: f0eee8c127dab7c6f552e00ca26632fe1798ee5d	2019-04-22 20:24:54 +01:00
sxv20_	64c97f47fc	Add prototype FPS counter to HUD ... Former-commit-id: c75778ff22ddd44d6e398a559193bc0d0c2e62fe	2019-04-22 20:24:16 +01:00
timokoesters	f8d1340199	Show mouse on Esc, hide when pressing again ... Former-commit-id: 440fd99b32b2490cb87add2e095cdd17fece0b57	2019-04-22 20:23:40 +02:00
timokoesters	91057edfac	Remove .internal and .internal_mut ... Former-commit-id: 261b656ec400f6780f2be2f5a4c331cc3b2a64a2	2019-04-22 10:24:27 +02:00
jshipsey	44374969fb	Merge branch 'master' of https://gitlab.com/jshipsey/fresh ... Former-commit-id: ba8dfe2c6b54b40b25ce2fe71d2eef8827f8a779	2019-04-20 19:39:54 -04:00
jshipsey	c492e72a99	tidying up code ... Former-commit-id: 0f77e7baf0c628969bc31e4d5fc4b42e18ab57d2	2019-04-20 19:37:09 -04:00
jshipsey	7778546b69	more rebasing ... Former-commit-id: f8671bbddd1c8aae132f1888bb76262aa5f81bcf	2019-04-20 19:34:40 -04:00
jshipsey	0e71756643	merge fix ... Former-commit-id: 38fa38de2b2985062e3260170b4f6f06d17515a1	2019-04-20 19:28:18 -04:00
jshipsey	a7f300feee	rebasing ... Former-commit-id: 1ef4423a8f839f5c72c650dd0ba4affddc0215fa	2019-04-20 19:28:18 -04:00
jshipsey	9d2040d509	tidying up code ... Former-commit-id: 43981525316728a182d41ecc107f31e2eb2583f9	2019-04-20 19:20:49 -04:00
jshipsey	6fd783e6eb	animation minor fixes ... Former-commit-id: 38d2da587d647b7f0c08994bc9fe41cc2d7ab675	2019-04-20 19:20:48 -04:00
jshipsey	0137a83dd8	animattion tweaks ... Former-commit-id: ea560ba0f06432d2d4f9d4f1906f77451a7f5ef7	2019-04-20 19:18:42 -04:00
jshipsey	78d7cfd89d	animation adjustments ... Former-commit-id: d396ddadf4293212f9f6f7142de0d8a519e127d6	2019-04-20 19:18:42 -04:00
jshipsey	33411a6004	merge fix ... Former-commit-id: 15da549d36774bb3713297d2b9f3799b1d7eb5f4	2019-04-20 19:13:38 -04:00
jshipsey	a04ddf67f6	quadruped testing ... Former-commit-id: 07f4fb4484f26dae0e8503ddec32a17f2fa312b5	2019-04-20 19:13:38 -04:00
Joshua Barretto	0e812baf7f	Merge branch 'ui_improvements' into 'master' ... Ui improvements Closes #23 See merge request veloren/veloren!54 Former-commit-id: 227b25c971c2576e5121d884a5e102307dd471c3	2019-04-20 23:06:59 +00:00
jshipsey	357a035757	Merge branch 'master' of https://gitlab.com/jshipsey/fresh ... Former-commit-id: 0b7dab49b7d7d92149b2873a8390ab699db63642	2019-04-20 18:57:09 -04:00
jshipsey	83f8759746	tidying up code ... Former-commit-id: 062930589922dc903be9e959eb06fd203945c101	2019-04-20 18:52:34 -04:00
jshipsey	30e80bdfc3	animattion tweaks ... Former-commit-id: 8e1b89a929761fee2a46aab4689a3dee72573eff	2019-04-20 18:47:46 -04:00
jshipsey	7717d12c7a	more rebasing ... Former-commit-id: c38dde30d5ced7cefad40e3f4ae4208f412bdd23	2019-04-20 18:47:15 -04:00
jshipsey	c655790c8a	merge fix ... Former-commit-id: a344856978c40e12d37dba5aaa0e0abac1dba9f4	2019-04-20 18:41:05 -04:00
jshipsey	ee4a261a28	rebasing ... Former-commit-id: 38e7f49fb503caa9ca2377ac48f8fb3a1b22301e	2019-04-20 18:37:09 -04:00
jshipsey	3d318a85e4	tidying up code ... Former-commit-id: df86599ae47b71bb744f5589da4511fa71603541	2019-04-20 18:12:45 -04:00
jshipsey	46f571f99a	animation minor fixes ... Former-commit-id: 4326db41103a0d3f87c7ad638fb38cd2f3eec71c	2019-04-20 18:08:56 -04:00
Imbris	7fa37e0c2a	update asset loading to not use env ... Former-commit-id: 1858f3e06a26502c8bb6a3237e216d551377f6c6	2019-04-20 18:02:48 -04:00
jshipsey	60fa9a7e20	animattion tweaks ... Former-commit-id: 0baf418a09bfa8ffad7a0bfe4b9f5256053454fb	2019-04-20 17:33:51 -04:00
Piotr	2800c9e9f5	make 11.0 a const ... Former-commit-id: 4602f3147b434e93256d48938b813325e74ad551	2019-04-20 20:35:45 +02:00
Imbris	d6d4155fc4	rearrange hud event handling slighlty ... Former-commit-id: 8043d6c6197112123c371258407ea886a5ae3595	2019-04-20 14:08:39 -04:00
Imbris	67584a49ce	hide chat input when not typing ... Former-commit-id: a1982ef2edf991c94cea359a2892cbf13ef8e980	2019-04-20 11:43:38 -04:00
Imbris	85dda5e505	go back to main menu when logging out ... Former-commit-id: 95956f916adb0afb47e489defa197f2b8e99b775	2019-04-20 11:34:45 -04:00
Imbris	83ed5200b0	hide entire hud when toggling interface ... Former-commit-id: 969564ecfd85df0477db4216cd8974adf2df1921	2019-04-20 11:34:45 -04:00
Imbris	2147774665	Stop sending empty messages ... Former-commit-id: 0f2ed6d0adbbf07566ae1cee1cb0c0498c0c15d8	2019-04-20 11:34:45 -04:00
Imbris	eef5dd28b5	Fix chat spacing ... Former-commit-id: 2e823a1deb51e2fc77a1662b291ed1b5d01b3e70	2019-04-20 10:46:36 -04:00
Imbris	0daa8ef3f3	fix scaling artifacts ... Former-commit-id: 7b90e7d033438a0c83e254ea7bcc791ad83808b3	2019-04-20 08:59:26 -04:00
Imbris	1143c58e37	add graphic cache clearing on resize ... Former-commit-id: 49b3a52036171fd8b66d9fae73bebb15fbf83a0b	2019-04-19 21:35:12 -04:00
jshipsey	3ff88ff478	animation adjustments ... Former-commit-id: 8720a7442a27103989eae7333b2a48265b94fd07	2019-04-19 20:20:01 -04:00
jshipsey	4d0466a618	merge fix ... Former-commit-id: b83fed02f8a49e5914c8939bb2ec5e6f76bad2a2	2019-04-19 19:42:12 -04:00
jshipsey	b4fdc472e5	merge conflict fix ... Former-commit-id: 31fca905c387211f926031012f6c025e3d82f531	2019-04-19 19:08:10 -04:00
jshipsey	b107a46b07	fixing conflict ... Former-commit-id: 4b0293ce11a5ae4ca0c8b265959fee2138941032	2019-04-19 19:05:33 -04:00
Imbris	7707636c4e	rearrange ui graphic code ... Former-commit-id: d0ea7feee59a1daf4ad93e9b9224750deb75ee45	2019-04-19 15:06:58 -04:00
Imbris	0b4e268dee	add blank graphic, ao for voxel graphics in the ui ... Former-commit-id: ceaba13fdd47707a8804886b5db2260a8cbba2f1	2019-04-19 15:06:58 -04:00
Imbris	2e69526069	initial setup for .vox rendering ... Former-commit-id: bc3d2432c41d9dc3e1f57e569f3aecb9be3fe79a	2019-04-19 15:00:13 -04:00
yeet	40c2625a4c	Fix Singleplayer ... After a certains person's MR has been merged, for some reason all traces of working Singleplayer have disappeared Former-commit-id: 4119e4609cd39bb1896c7f28d45f5c1a7ec9c129	2019-04-18 15:53:03 +02:00
Joshua Barretto	56e50f4d58	Minor fixes ... Former-commit-id: 54c2b050fd9be82916d66c872fa9ab5f5354f9dd	2019-04-18 14:21:25 +01:00
Pfauenauge90	f7af7417ce	Error Window, Alpha Version Display ... Former-commit-id: 0cdf4980eacf57db6dc275aabc26f49a0db274a6	2019-04-17 23:12:15 +02:00
Pfauenauge90	15e498c3f5	Rebase and Login Error ... Former-commit-id: 1b7736d80dde1a10ba04936c2cfe3df4d64ec57f	2019-04-17 23:11:29 +02:00
Pfauenauge90	1ea7b5031d	Help window Closing button fixed ... Former-commit-id: 75c539985527e38b13bf7aa382d3b9491ef19fed	2019-04-17 23:06:21 +02:00
Pfauenauge90	2e671899e0	Error Window, Alpha Version Display ... Former-commit-id: 59ee7e42ca522cdcdbec7b07dbee4d3249213aab	2019-04-17 23:06:21 +02:00
Pfauenauge90	a23e71a258	Rebase and Login Error ... Former-commit-id: 226fca5f37aa9c94fdd3e1a030c7de4703deba4c	2019-04-17 23:06:21 +02:00
Pfauenauge90	2c5bfaa118	Error Window ... Former-commit-id: 0f4f92c39632f8cbd1750036d19eb1cfbf39f374	2019-04-17 23:06:21 +02:00
timokoesters	ec16153164	Rename animationHistory to animation_history ... Former-commit-id: bb2c882332fa9c3fd7f2c7fbd6143cd5f85153d8	2019-04-17 22:32:36 +02:00
timokoesters	b9607ef405	Fix #21 by checking animation history ... Former-commit-id: 5272d1d7aee73fc07edeb31d9f29238d19b7d229	2019-04-17 19:39:12 +02:00
Joshua Barretto	1e4d02a5d8	Merge branch 'singleplayer' into 'master' ... Start Singleplayer server when singleplayer is selected See merge request veloren/veloren!39 Former-commit-id: ac8c9f3f52871d89847fdecc74ac58bb593e762b	2019-04-17 15:31:02 +00:00
Louis Pearson	a768971c6c	Stop singleplayer thread whenever a session is left ... Former-commit-id: 16fcf35cbc856bebc12944781c2ac1a4daab5550	2019-04-17 09:22:26 -06:00
Joshua Barretto	a87cdc1993	Changed default server address to 'server.veloren.net' ... Former-commit-id: 660083d3d7ca341428b8c3cd8d54dd3ac1f453ab	2019-04-17 16:08:25 +01:00
Louis Pearson	76adbec3bb	Add method to drop singleplayer thread ... Former-commit-id: b62a90728d4e83a005687538e134cee427491052	2019-04-17 08:57:23 -06:00
Louis Pearson	7ec6e09332	Add basic singleplayer support ... Former-commit-id: 929b05faca5d2b95a96349dfc17a62b3165289a1	2019-04-17 07:41:34 -06:00
Imbris	3658a50685	Fix most spacing issues in chat ... Former-commit-id: 90a4080123b77630888967423b030153b9f81709	2019-04-16 20:17:15 -04:00
Joshua Barretto	db527e64df	Improved camera attributes and focus ... Former-commit-id: 223f85c884c063c5cbb7d6c9f9f5c4a8c62a7ffd	2019-04-16 20:22:04 +01:00
timokoesters	8cc4399d18	Handle bone orientation and scale as well ... Former-commit-id: 80c80342ae3458b98c2520359bc0a0705b22dbc1	2019-04-16 20:55:04 +02:00
timokoesters	713b59aeff	Implement animation smoothing ... Former-commit-id: e89caca7d273934533c57c4324365a126d02e5df	2019-04-16 20:26:24 +02:00
Louis Pearson	780e034674	Add better defaults support ... Former-commit-id: fa77acae3ee2b99cbf37a8fec71ee1913e889d82	2019-04-16 11:41:39 -06:00
Louis Pearson	515039c62d	Add auto generation of settings.toml if it does not already exist ... Former-commit-id: 941b81a8faeff89096256666c56ae472d9b569d5	2019-04-16 10:06:23 -06:00
Louis Pearson	9592eb67c5	Add default keybindings ... Former-commit-id: c8886a2eb3326ba62e31ef84b93a29ee59f378b3	2019-04-16 08:57:31 -06:00
Louis Pearson	55f3f0857f	Add support for keybinding ... Former-commit-id: 1edbf3bebb8d1651a1b912cedcd3513dfb287fa1	2019-04-16 08:57:31 -06:00
Piotr	ddb32eec30	Animation States ... Former-commit-id: 769f09dc44143b5e54623ea819db2d6149429184	2019-04-16 14:29:44 +00:00
Joshua Barretto	a41b642570	Merge branch 'master' into 'master' ... Solve physics fighting problem See merge request veloren/veloren!27 Former-commit-id: 010af4fb0f31b854dd1f8c42f6a65711cc9d84cd	2019-04-15 16:43:41 +00:00
Imbris	571e319a62	make zooming always work if cursor is grabbed ... Former-commit-id: e07bb0746fa117f045d62919a4ca55a8eb0c6cf7	2019-04-14 20:53:42 -04:00
Imbris	e755afce91	simplify chat keybaord capture ... Former-commit-id: 3c5c5c241fe0c0d97059c7b87c0c08104eb5c5fe	2019-04-14 20:45:54 -04:00
Imbris	b7439b9107	ignore tx.send() result ... Former-commit-id: 2d4b2d258f8fd3b030bb7f1e9596ccb6750d50ff	2019-04-14 20:23:26 -04:00
Imbris	3812e0b58f	stop zooming when scrolling chat ... Former-commit-id: a94f26e30029ef4cff1807c2347cbd2490c4afd7	2019-04-14 20:15:12 -04:00
Joshua Barretto	c98d841890	Fixed physics sync ... Former-commit-id: 86d3af46c69f6566f4cab8d93ecf27636a9563cf	2019-04-15 00:29:28 +01:00
Imbris	e377e8ff09	Add asynchronus client creation to Voxygen ... Former-commit-id: 0c11cc8a7ddc7b425e036c2357c233e376002c6e	2019-04-14 23:28:29 +00:00
Joshua Barretto	f69ad40bd5	Fixed aspect on scene start, added more information to post errors ... Former-commit-id: 0daff37cbcad6f906962216ce923a005da6861c1	2019-04-14 16:05:51 +01:00
Joshua Barretto	51f7d85508	Ensured that Client is Send ... Former-commit-id: abadfc7d1d86110ed442cdb5a2e639c163c96e04	2019-04-14 14:23:43 +01:00
Joshua Barretto	824fb8a6c0	Fixed 1-frame animation bug ... Former-commit-id: fc591de5026e35cab1ef72ce250b19cbe2fcec0e	2019-04-14 14:23:43 +01:00
Joshua Barretto	3d9f8105e6	Started work on server-side chunks ... Former-commit-id: 84a6bd7358f67a77043c4b11c787538f073c8d28	2019-04-14 14:23:43 +01:00
Joshua Barretto	11630877e3	Moved figure rendering to a better place ... Former-commit-id: 51ca948e131c20151c97f9f8454c80c47a9154b0	2019-04-14 14:23:43 +01:00
Joshua Barretto	62b91eb01b	Integrated Sphynx ... Former-commit-id: 5d96983a385bb77a2876aa7439158252b7e2f0fc	2019-04-14 14:23:43 +01:00
Pfauenauge90	8e69464588	Charselection Help Text ... Former-commit-id: 463a3aad1c8d0b8e98f0b5464103016c401d1d32	2019-04-14 15:19:12 +02:00
Pfauenauge90	6b32d2bcb6	Updated race descriptions ... Former-commit-id: 2384a6f01a27000d39ba9e399468e1d7897b6b1f	2019-04-14 15:19:12 +02:00
Pfauenauge90	51047236a0	chat changes ... Former-commit-id: c2a5ae0d34e1e93d8f6feb4a9e5cf69045db7275	2019-04-14 15:19:12 +02:00
Pfauenauge90	bc420e41d6	help window, chat padding, font colours ... Former-commit-id: 8d42f8e05cd11f669e4e56873e31a8530272b3b2	2019-04-14 15:19:11 +02:00
Pfauenauge90	a45e9e708c	Help window, chat padding, font colours ... Former-commit-id: 18643504fd8e94ed991c137e9ea91dfa094686c7	2019-04-14 15:17:38 +02:00
Pfauenauge90	822901b08b	Chat padding, Font Colours to white, Help Window ... Former-commit-id: d36a878971f92fbf16eb44d3102b4328832e6563	2019-04-14 15:15:42 +02:00
Imbris	2e14f7d559	update colors to match gamma scaling ... Former-commit-id: 461b5cf751d329a219250bc8090b016f54f3ec96	2019-04-14 15:12:29 +02:00
Imbris	07a4cb268e	new bones, update asset repo ... Former-commit-id: 4dbed55af4a9532051025a797349e77bd937dff2	2019-04-14 15:05:43 +02:00
Imbris	fb83c836a1	make to_server() blocking, post fixes & cleanup, use server address ... Former-commit-id: 7debc790e158a996ed58271d3307214e42b850bd	2019-04-14 15:04:44 +02:00
Imbris	5e576f048e	use modified version of conrod ... Former-commit-id: 6a4697d02e18732dbf9ad679bac761c5a73457fa	2019-04-13 10:52:48 -04:00
Imbris	5404cc548a	remove hidden chat scrollbar ... Former-commit-id: fc534a2d71bbdbf2989b9772c7d5a64aa44f1ed9	2019-04-13 10:52:48 -04:00
Marcel Märtens	251cccffe5	add simple interface to get assets from various locations ... Former-commit-id: 2ee6c4ef811e935eb8684a2cd827a97b8ad0be7a	2019-04-13 03:40:59 +02:00
Yeedo	b88dc1bbde	Updated mouse wheel zooming to use WindowEvent ... Former-commit-id: 700fa66382f3a8e0fd738a8ce14fb44bc211b5fe	2019-04-11 23:12:42 +01:00
Pfauenauge90	3f2a938735	Key Command Changes, Char Window ... Former-commit-id: 16c94f35da889ea418e7dc32043e6ebd25f2664b	2019-04-09 18:30:13 +02:00
Pfauenauge	4607ad612d	Minor changes to font sizes ... Former-commit-id: d998532c9b858cea5704b307b8bc6ef0ef3c75d7	2019-04-07 00:05:56 +02:00
Pfauenauge	8ecb849970	Char Window, Mana, Health, Exp-Bar ... Former-commit-id: 546d29aae7441232892c7b7438708e93fb440128	2019-04-06 00:36:04 +02:00
Pfauenauge90	c1af42522d	char window additions ... Former-commit-id: 63dfbd68594fc7ecb6e9caf610c9c5165c9e88d4	2019-04-04 19:35:33 +02:00
Pfauenauge90	6ebff7ce2c	Merged with UI-Input ... Former-commit-id: f18e92dcac87c3b2806065078c70527ffd805876	2019-04-04 16:45:57 +02:00
Pfauenauge90	6d6c585808	char window ... Former-commit-id: e3a6e5aadf20f60e6db237d63382cd55cd8211b9	2019-04-04 15:51:36 +02:00
Pfauenauge90	b29343490f	disabled chat arrows ... Former-commit-id: 5a5ea8e7101c16ae780af1fb9b3e6e4ba59a98b4	2019-04-02 16:25:14 +02:00
Pfauenauge90	a4f96b4642	Inventory ... Former-commit-id: 01df86c3a652e4a36d37edfdcc90dc350c1e5b04	2019-04-02 06:54:27 +02:00
Pfauenauge90	8378663cca	Added controls to open menus ... Former-commit-id: cfa167aef56e12def40a083effe37d1b0216c00f	2019-04-02 03:05:18 +02:00
Pfauenauge90	87a41a30a7	Bag Additions ... Former-commit-id: 62e02ad0d67916b8ee12674e564931e92c08ee95	2019-04-02 01:26:42 +02:00
Pfauenauge90	0ce80ec9ad	Inventory Window ... Former-commit-id: 4f8c6fbef1dd4afea587ece7187a17648ff3e301	2019-04-01 22:31:29 +02:00
Imbris	ca454d0c8b	make chat arrow only appear when scrolled up and enable it ... Former-commit-id: 72bf830acea7fa273d90b996ce7bcf88f215d1bf	2019-03-29 22:59:31 -04:00
Imbris	820967838d	enable chat with enter while cursor is captured ... Former-commit-id: a6b54d6325135462e04c2cec1703f45641c389f2	2019-03-29 22:15:27 -04:00
Pfauenauge	702e8321b1	Added chat arrow ... Former-commit-id: 387bf73af19e23678a9048ab3870665c88ff47b9	2019-03-30 01:11:10 +01:00
Pfauenauge	51e41ade07	Filepath fixes ... Former-commit-id: b3134806904d8fb0b7fb1ee4dc05ea96af1474e8	2019-03-29 22:36:15 +01:00
Pfauenauge	99e364dc54	Asset Path Changes ... Former-commit-id: 8d31707d0e5c6db8328e0a389296f4f1a7f7cd69	2019-03-29 21:08:14 +01:00
Imbris	cf9780e1ec	remove title screen ... Former-commit-id: 53b269b28ac38290c50bcf38c266534b673dacd2	2019-03-29 03:34:33 -04:00
Pfauenauge90	07f7e89ca7	removed assets from folder, added race desc ... Former-commit-id: fd11261bfbf3e5986775dc6b818fced9df6dd09b	2019-03-28 23:07:10 -04:00
Pfauenauge90	60df735e3b	accessories tab ... Former-commit-id: 542362e98e908c9ec7c563d7fdcd43c4b8f922fd	2019-03-28 23:03:39 -04:00
Imbris	93897f904a	fix bug with ui using old win size when switching to previous playstate ... Former-commit-id: b6c166882c978806af65f70496626fad33081975	2019-03-28 00:42:04 -04:00
Imbris	bee273fc9e	replace mmap button bools with an enum ... Former-commit-id: e7c7e17b3473d250e2fd23f6a75f3012297c7bd5	2019-03-28 00:00:51 -04:00
Imbris	589110c2f5	modify chat visually, replace whitney with opensans, add to charcreation ... Former-commit-id: 50ec03271ae5e9e7995144fd2d0701f62a68e5f7	2019-03-27 22:25:08 -04:00
Imbris	f753a64018	fix inconsistent text cursor height ... Former-commit-id: da08c7ef8679a6f4626bf5fec0ec66ab5da9cad0	2019-03-24 22:15:29 -04:00