2696 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Monty Marz	66bf56e2b3	Merge branch 'pfau/fix_bow' into 'master' ... Fix bow-shot frequency See merge request veloren/veloren!685	2019-12-12 20:13:45 +00:00
Monty Marz	3621a177ce	Fix bow-shot frequency	2019-12-12 20:13:45 +00:00
Marcel	ffa98040e0	Merge branch 'xmac94x/update-toolchain' into 'master' ... update toolchain to `nightly-2019-12-11` See merge request veloren/veloren!682	2019-12-11 14:20:21 +00:00
Marcel Märtens	7d16b7d6a2	please ci toolchain	2019-12-11 15:13:46 +01:00
Marcel Märtens	21e41ac735	update toolchain to nightly-2019-12-11	2019-12-11 14:43:22 +01:00
Imbris	901abff892	Merge branch 'cfrantz1/veloren-astar-pathfinding-no-fork' into 'master' ... Add advanced path finding to new 'Traveler' enemy using A* algorithm See merge request veloren/veloren!680	2019-12-11 05:28:45 +00:00
Forest Anderson	31382a560f	Add advanced path finding to new 'Traveler' enemy using A* algorithm	2019-12-11 05:28:45 +00:00
Imbris	90c8a46c79	Merge branch 'shandley/fix-music-volume-startup' into 'master' ... Set the music and sfx volumes during startup Closes #373 See merge request veloren/veloren!667	2019-12-10 14:02:51 +00:00
S Handley	f83c91b71c	(fix) Set the music and sfx volumes immediately after initialising the ... audio frontend. Fixes #373	2019-12-10 14:02:51 +00:00
Acrimon	b6aac685cc	Merge branch 'update-controller' into 'master' ... Update controller See merge request veloren/veloren!679	2019-12-09 14:45:10 +00:00
Adam Whitehurst	6700a03678	Update controller	2019-12-09 14:45:10 +00:00
Acrimon	9af255473e	Merge branch 'shandley/fix-glider-close-sfx' into 'master' ... Fix the glider_close sfx event See merge request veloren/veloren!678	2019-12-09 09:50:14 +00:00
S Handley	846ad2ac64	Fix the glider_close sfx event ... This was failing to trigger since we now have a MovementState::Fall, but the sfx mapper was still trying to work this out itself based on velocity. We no longer need to track velocity as a result and can use the MovementState. Also silenced warnings resulting from unused vars when running tests.	2019-12-09 09:50:14 +00:00
Songtronix	a6657a63c1	Merge branch 'shandley/footsteps-grass' into 'master' ... Update footsteps SFX Closes #374 See merge request veloren/veloren!676	2019-12-08 10:03:40 +00:00
S Handley	bcd658044f	Update footsteps SFX	2019-12-08 10:03:40 +00:00
Acrimon	47d1acfb99	Merge branch 'treeco/invert-mouse-setting' into 'master' ... Added mouse inversion setting Closes #376 See merge request veloren/veloren!677	2019-12-06 23:24:55 +00:00
Treeco	57155044fc	Added mouse inversion setting	2019-12-06 23:00:02 +00:00
Acrimon	3c259e41ec	Merge branch 'refactor-controller-movement-states' into 'master' ... Refactor controller movement states See merge request veloren/veloren!672	2019-12-03 06:30:09 +00:00
Adam Whitehurst	1acb75870c	feat: weapon-type dependent wield and attack durations ... also some controller.rs cleanup	2019-12-03 06:30:08 +00:00
Forest Anderson	24baeccc44	Merge branch 'revert-a2cfc4ba' into 'master' ... Revert "Merge branch 'angelonfira/add-asset-separation-and-compression' into 'master'" See merge request veloren/veloren!674	2019-12-01 22:26:16 +00:00
Forest Anderson	18309d3dcc	Revert "Merge branch 'angelonfira/add-asset-separation-and-compression' into 'master'" ... This reverts merge request !650	2019-12-01 22:12:26 +00:00
Forest Anderson	ef05ad2ab9	Merge branch 'angelonfira/add-asset-separation-and-compression' into 'master' ... Added audio compression job for CI See merge request veloren/veloren!650	2019-12-01 21:16:55 +00:00
Forest Anderson	18767f926e	Added audio compression job for CI	2019-12-01 21:16:55 +00:00
Marcel	a910a36833	Merge branch 'treeco/fp-view-height' into 'master' ... Made the first person camera follow race heights, plus minor zoom changes See merge request veloren/veloren!673	2019-12-01 20:56:33 +00:00
Treeco	d0147edbf2	made first person camera follow race heights, minor zoom chances	2019-12-01 19:05:28 +00:00
Marcel	556bd4c5ea	Merge branch 'inputs-enhancements' into 'master' ... Inputs enhancements See merge request veloren/veloren!671	2019-11-29 15:20:35 +00:00
Adam Whitehurst	3cc69f0e58	Inputs enhancements	2019-11-29 15:20:35 +00:00
Monty Marz	c7afbd2dd6	Merge branch 'pfau/assets' into 'master' ... Set overflow checks to 'false' for release builds in order to bandaid fix recent master error See merge request veloren/veloren!670	2019-11-28 13:32:38 +00:00
Monty Marz	c05f63d55a	Set overflow checks to 'false' for release builds in order to bandaid fix recent master error	2019-11-28 13:32:38 +00:00
Monty Marz	9866e41162	Merge branch 'pfau/assets' into 'master' ... Fix map being inverted and indicator positioning See merge request veloren/veloren!669	2019-11-26 22:39:07 +00:00
Monty Marz	9981287084	Fix map being inverted and indicator positioning	2019-11-26 22:39:07 +00:00
Marcel	c78974f0f2	Merge branch 'fixci' into 'master' ... remove option to build debug builds, because they are not needed and to reduce caches See merge request veloren/veloren!666	2019-11-25 08:59:36 +00:00
Marcel Märtens	0ab8b8095c	remove option to build debug builds, because they are not needed and to reduce caches	2019-11-25 01:10:06 +01:00
Monty Marz	0208ab80a2	Merge branch 'region-name-display-fix' into 'master' ... Region name display fix See merge request veloren/veloren!665	2019-11-24 16:45:13 +00:00
Monty Marz	c93d0dfe2d	Region name display fix	2019-11-24 16:45:13 +00:00
Songtronix	49f277b404	Merge branch 'songtronix/update-msgbox' into 'master' ... upgrade msgbox Closes #370 See merge request veloren/veloren!664	2019-11-24 13:03:38 +00:00
Songtronix	ba2e0fbbbf	upgrade(dep): msgbox ... Fix: FreeBSD compilation	2019-11-24 08:49:14 +01:00
Songtronix	77cf8eb09f	Merge branch 'shandley/sfx-system' into 'master' ... SFX events See merge request veloren/veloren!653	2019-11-23 08:26:39 +00:00
S Handley	1c607c0a0c	SFX system ... This is an event based approach to SFX sounds. There is a specific character sound event mapper which determines sfx to play based on character or NPC state, as well as emitting sfx events for non-character-triggers such as levelling up.	2019-11-23 08:26:39 +00:00
Monty Marz	2fabf10758	Merge branch 'pfau/assets' into 'master' ... Loading Screen with pulsating text, 2 new hairstyles See merge request veloren/veloren!662	2019-11-23 00:51:18 +00:00
Monty Marz	b33d5d8de4	Loading Screen with pulsating text, 2 new hairstyles	2019-11-23 00:51:18 +00:00
Joshua Barretto	5acab9c0e3	Merge branch 'songtronix/fix-logging' into 'master' ... fix logging Closes #317 and #318 See merge request veloren/veloren!589	2019-11-22 21:43:50 +00:00
Songtronix	4e76775c99	change(deps): enforce crossbeam version	2019-11-22 19:12:58 +01:00
Songtronix	ccd2edf01b	adjust logging level	2019-11-22 19:12:58 +01:00
Songtronix	eaebca7880	feat(log): add date to log file	2019-11-22 19:12:58 +01:00
Songtronix	92a69d2ca7	change(log): remove all spam from logging	2019-11-22 19:12:58 +01:00
Songtronix	ba0fbe631e	change(log): switch to fern	2019-11-22 19:12:58 +01:00
Justin Shipsey	783c6d2604	Merge branch 'telastrus/underwater-jump' into 'master' ... Jump while underwater See merge request veloren/veloren!661	2019-11-22 14:23:47 +00:00
telastrus	e24f7954f2	jump while underwater	2019-11-21 23:56:07 -05:00
Marcel	392f050137	Merge branch 'fixci' into 'master' ... Fixci See merge request veloren/veloren!660	2019-11-21 20:06:47 +00:00