2882 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Imbris	d681e47277	Merge branch 'payload1/fix-ask-audio-device-only-when-audio-on' into 'master' ... Fix panic in case no default audio device found when audio off See merge request veloren/veloren!722	2020-01-18 18:34:17 +00:00
Gilbert Röhrbein	12ead2e33a	Fix panic in case no default audio device found when audio off	2020-01-18 19:16:23 +01:00
Monty Marz	6e303f2f5b	Merge branch 'pfau/char-creation-button' into 'master' ... create character button position change See merge request veloren/veloren!730	2020-01-18 15:42:21 +00:00
Monty Marz	6aa7913ab2	create character button position change	2020-01-18 15:42:21 +00:00
Monty Marz	17420fa905	Merge branch 'pfau/charge-icon' into 'master' ... Charge Icon and flashing skillbar See merge request veloren/veloren!726	2020-01-17 22:00:00 +00:00
Monty Marz	7e2153c537	Charge Icon and flashing skillbar	2020-01-17 22:00:00 +00:00
Acrimon	820df7ec3a	Merge branch 'acrimon/precise-color-conversion' into 'master' ... More precise color conversion See merge request veloren/veloren!721	2020-01-14 07:04:51 +00:00
Imbris	7a1b43c6f1	Branch on lower color values for more accurate speedy color conversion, add simple color conversion benchmarks	2020-01-13 23:39:22 -05:00
Acrimon	a8b22f3daf	Even better conversion impl.	2020-01-13 20:54:56 +01:00
Acrimon	26c2239e7a	Made color conversion way more accurate.	2020-01-13 16:38:10 +01:00
Timo Koesters	5012ce9bac	Merge branch 'payload1/energy-component' into 'master' ... payload1/energy component Closes #405 See merge request veloren/veloren!719	2020-01-12 21:41:34 +00:00
Gilbert Röhrbein	b9e7164b62	fixing #405 - Energy as its own component	2020-01-12 22:25:04 +01:00
Monty Marz	90c36bb9fd	Merge branch 'pfau/map-transp-hotfix' into 'master' ... Hotfix for map flickering while turning See merge request veloren/veloren!720	2020-01-12 19:01:02 +00:00
Monty Marz	a2bec3d0eb	fix ... slightly lower trigger velocity slighty more transp map image	2020-01-12 19:01:02 +00:00
Songtronix	2aa0cf0940	Merge branch 'shandley/sfx-land-on-ground' into 'master' ... Play the Run SFX when a character lands after jumping or falling See merge request veloren/veloren!717	2020-01-12 16:35:20 +00:00
S Handley	8bace0fb87	Play the Run SFX when a character lands after jumping or falling ... This is a small detail but makes a noticable difference.	2020-01-12 16:35:20 +00:00
Acrimon	c2b1350d25	Merge branch 'qutrin/ez-optimisation' into 'master' ... Improvement: Replace all '..=b' with '..b + 1' See merge request veloren/veloren!718	2020-01-12 15:05:45 +00:00
Piotr Korgól	243263fecd	Improvement: Replace all '..=b' with '..b + 1'	2020-01-12 15:46:53 +01:00
Monty Marz	0a51b12957	Merge branch 'pfau/sct-hotfix' into 'master' ... fixed number shadow for "0" damage appearing on level up See merge request veloren/veloren!716	2020-01-11 20:47:47 +00:00
Pfauenauge90	972d0c5dd7	fixed number shadow for "0" damage appearing on level up	2020-01-11 21:31:57 +01:00
Imbris	c26bb6a174	Merge branch 'yusdacra/tweaks' into 'master' ... Fixes minor issues with frustum culling See merge request veloren/veloren!712	2020-01-11 16:36:51 +00:00
Imbris	460a05c31a	Merge branch 'shandley/bugfix-stats-audio-event' into 'master' ... (fix) Remove emission of an audio event from stats sys See merge request veloren/veloren!714	2020-01-11 04:49:43 +00:00
Shane Handley	1c9094af4f	Remove emission of an audio event from stats sys ... This was accidentally left in by me during some testing of server emission of SFX events to all clients. There was no effect on gameplay since we dont emit a sound for this event yet, but it should not be here. The audio event is correctly handled elsewhere by each client.	2020-01-11 13:08:33 +09:00
Songtronix	2c12fb5a21	Merge branch 'songtronix/improve-discord' into 'master' ... remove discord rich presence See merge request veloren/veloren!695	2020-01-10 16:15:27 +00:00
Songtronix	e4fe286f34	remove: discord rich presence	2020-01-10 17:01:50 +01:00
Monty Marz	59df649fe6	Merge branch 'pfau/assets' into 'master' ... Scrolling Combat Text (SCT) See merge request veloren/veloren!711	2020-01-10 00:33:38 +00:00
Monty Marz	178ad9479a	Scrolling Combat Text (SCT)	2020-01-10 00:33:38 +00:00
Yusuf Bera Ertan	e3828a07b4	Fix lpindex not being updated for culled objects, and don't ... recalculate frustum for every entity	2020-01-09 22:22:06 +03:00
Acrimon	f2ac3a5a49	Merge branch 'yusdacra/tweaks' into 'master' ... Improvements to frustum culling and some changes Closes #210 See merge request veloren/veloren!708	2020-01-08 17:43:40 +00:00
Yusuf Bera Ertan	44d9e7c590	Cargo fmt	2020-01-08 20:09:54 +03:00
Acrimon	b831786cf5	Merge branch 'shandley/no-npc-spawn-underwater' into 'master' ... Prevent NPCs from spawning underwater See merge request veloren/veloren!709	2020-01-08 12:48:00 +00:00
S Handley	4fcd9e2e0f	Prevent NPCs from spawnign underwater ... This should be set until there are underwater NPC types.	2020-01-08 12:48:00 +00:00
Yusuf Bera Ertan	a6b979104e	Replace radio list with drop down selector for AA mode setting	2020-01-07 20:37:55 +03:00
Yusuf Bera Ertan	f5bdc4d697	Use treeculler crate	2020-01-07 19:40:06 +03:00
Yusuf Bera Ertan	5338281323	Fix figure visible value not updating	2020-01-07 18:46:37 +03:00
Yusuf Bera Ertan	cc61925486	Use temporal coherence for figure frustum culling, don't process figures if they are not in view frustum	2020-01-07 18:46:22 +03:00
Yusuf Bera Ertan	820b4ea7fc	Use temporal coherence for chunk frustum culling	2020-01-07 18:46:09 +03:00
Yusuf Bera Ertan	cb1b6c4c29	Improve frustum culling by using AABBs, add related debug information	2020-01-07 18:44:33 +03:00
Yusuf Bera Ertan	81eaaae398	Reimplement #210	2020-01-07 18:40:45 +03:00
Imbris	4b0edec8ba	Merge branch 'piercelbrooks/mac_msgbox_panic_hook_crash_fix' into 'master' ... fix #426: Use new dispatch dependency to ensure proper thread routing of msgbox NSAlert calls ( correct MR workflow ) Closes #426 See merge request veloren/veloren!706	2020-01-07 05:45:43 +00:00
Pierce Brooks	71fd686a39	fix #426: Use new dispatch dependency to ensure proper thread routing of msgbox NSAlert calls ( correct MR workflow )	2020-01-07 05:45:43 +00:00
Monty Marz	bb5011399e	Merge branch 'pfau/fix-trees' into 'master' ... Save the trees! See merge request veloren/veloren!707	2020-01-06 14:21:04 +00:00
Pfauenauge90	82db12611c	fixed the trees being cut off	2020-01-06 15:07:08 +01:00
Imbris	3c9e84bc0c	Merge branch 'imbris/char-screen-transition' into 'master' ... Fix issues regarding going back to the character selection screen Closes #386 See merge request veloren/veloren!700	2020-01-02 19:40:21 +00:00
Joshua Barretto	3d497001a2	Merge branch 'zesterer/better-rollin' into 'master' ... Made rolling less slippy, added tilt See merge request veloren/veloren!699	2020-01-02 18:35:27 +00:00
Imbris	49a7d96de7	Fix typos, don't insert Controller if it doesn't already exist in the ... mount system so that Controller components are not added to entities client side	2020-01-02 05:34:27 -05:00
Imbris	a3464b0dbc	Merge branch 'shandley/character-exp-sfx' into 'master' ... Update SFX structure to add experience / levelling SFX See merge request veloren/veloren!693	2020-01-01 02:55:48 +00:00
S Handley	205c617c04	Refactor and Rename for clarity ... Implements a potential structure for splitting the SFX event mapping into smaller individual files for maintainability. - Remove inventory events for now: For a later commit. - No longer panic when there is a failure parsing the sfx file: log the error and not play sfx.	2020-01-01 02:55:48 +00:00
Imbris	93c0f5e0ef	Fix issue where controller events aren't processed while mounted. Fix non humanoids being able to climb and glide.	2019-12-31 16:41:45 -05:00
Imbris	a77512a714	Fix formatting, Update CHANGELOG, turn overflow checks on for dev ... profile	2019-12-31 16:38:13 -05:00