3166 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Justin Shipsey	b73b6ff0dd	Merge branch 'slipped/smallfixes' into 'master' ... animation housekeeping See merge request veloren/veloren!818	2020-02-25 06:47:56 +00:00
Justin Shipsey	ea8744c4a1	animation housekeeping	2020-02-25 06:47:56 +00:00
Imbris	8863353ec4	Merge branch 'shandley/small-animal-run-sfx' into 'master' ... Emit run sfx for some non-humanoids Closes #502 See merge request veloren/veloren!814	2020-02-23 01:26:51 +00:00
S Handley	aee89cc72f	Add a volume option to SfxEvents, and use this to dispatch movement sfx for quadripeds at a volume proportionate to their size.	2020-02-23 01:26:51 +00:00
Forest Anderson	ec2dbd13f3	Merge branch 'shandley/level-up-command-hp' into 'master' ... Update max hp after using the set_level command Closes #496 See merge request veloren/veloren!816	2020-02-23 00:41:51 +00:00
Justin Shipsey	f27835392f	Merge branch 'juli/sfx-sword-update' into 'master' ... UpdatedSoundFX See merge request veloren/veloren!815	2020-02-23 00:16:15 +00:00
Shane Handley	b13e6d0e3b	Update max hp and refill health when a player uses the set_level command.	2020-02-23 09:08:30 +09:00
Julian	03929561f7	UpdatedSoundFX ... New souunds for Sword_in and Sword_out.	2020-02-22 20:26:49 +01:00
Justin Shipsey	b9391d2337	Merge branch 'shandley/weapon-wield-sfx' into 'master' ... Add weapon wield/unwield sfx support Closes #486 See merge request veloren/veloren!805	2020-02-21 02:56:54 +00:00
S Handley	09a3729b5d	Add weapon wield/unwield sfx support	2020-02-21 02:56:54 +00:00
Monty Marz	2eafc95dcf	Merge branch 'pfau/hairstyles' into 'master' ... Orc hairstyles, several tiny UI fixes, fixed beard warnings See merge request veloren/veloren!808	2020-02-20 10:32:05 +00:00
Monty Marz	4fc33f6c78	Orc hairstyles, several tiny UI fixes, fixed beard warnings	2020-02-20 10:32:03 +00:00
Songtronix	d6c8068e38	Merge branch 'imarv/refactor-server-events' into 'master' ... Move ServerEvents into own module Closes #494 See merge request veloren/veloren!809	2020-02-19 18:30:53 +00:00
Marvin Altemeier	54179ba656	Move ServerEvents into own module	2020-02-18 20:51:10 +01:00
Monty Marz	6dd8dbad34	Merge branch 'pfau/fix-fonts' into 'master' ... Fix Fonts See merge request veloren/veloren!806	2020-02-17 16:22:49 +00:00
Monty Marz	4aa1af5428	Fix Fonts	2020-02-17 16:22:49 +00:00
Imbris	3e4949fb95	Merge branch 'treeco/add-gamma-setting' into 'master' ... Treeco/add gamma setting Closes #312 See merge request veloren/veloren!797	2020-02-17 02:01:06 +00:00
Treeco	952cc15b64	Gamma setting now works	2020-02-17 00:46:31 +00:00
Treeco	fd20ef1ecc	Added gamma setting, not hooked up yet	2020-02-16 20:32:17 +00:00
Forest Anderson	74efc65693	Merge branch 'ender/configurable_fonts' into 'master' ... Configurable fonts See merge request veloren/veloren!778	2020-02-16 17:27:33 +00:00
Joshua Barretto	430dc4a464	Merge branch 'zesterer-master-patch-73879' into 'master' ... Add a new name (to force the repo to update this file) See merge request veloren/veloren!804	2020-02-16 15:11:57 +00:00
Joshua Barretto	7526fd49cc	Add a new name (to force the repo to update this file)	2020-02-16 15:11:34 +00:00
Rémy PHELIPOT	355a86438c	[i18n] Configurable fonts ... - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)	2020-02-16 16:02:38 +01:00
Monty Marz	212ca91cdd	Merge branch 'pfau/fix-healthbars' into 'master' ... Fix healthbar background alignment See merge request veloren/veloren!803	2020-02-16 10:58:44 +00:00
Monty Marz	8cb963899a	Fix healthbar background alignment	2020-02-16 10:58:44 +00:00
Imbris	24fb10e423	Merge branch 'shandley/audio-channel-types' into 'master' ... Use non-spatial audio sinks for music Closes #463 See merge request veloren/veloren!794	2020-02-15 21:30:44 +00:00
S Handley	63a1bcc591	Split the audio channels into SFX and music channels. This makes the ... Music Channel for exploration music a basic Sink without spatial audio functionality, which is not required.	2020-02-15 21:30:44 +00:00
Forest Anderson	624c9b6449	Merge branch 'angelonfira/add-ci-tarpaulin-workaround' into 'master' ... Try tarpaulin 4 times before failing See merge request veloren/veloren!802	2020-02-15 20:57:53 +00:00
Forest Anderson	1ad4e79f48	Try tarpaulin 4 times before failing	2020-02-15 20:57:52 +00:00
Songtronix	e638acf4c7	Merge branch 'imarv/fix-give-exp' into 'master' ... Fix /give_exp command an introduce /set_level Closes #481 and #460 See merge request veloren/veloren!793	2020-02-15 17:45:29 +00:00
Marvin Altemeier	494dccd4fb	resolve #481 - add /set_level command	2020-02-14 22:11:41 +01:00
Marvin Altemeier	e477a095d1	change order of /give_exp arguments	2020-02-14 22:11:20 +01:00
Marvin Altemeier	5103459eec	fix #460 - /give_exp targeting wrong player	2020-02-14 22:11:20 +01:00
Imbris	b197ecaddd	Merge branch 'sharp/spawn-single-species' into 'master' ... Allow spawning individual species with /spawn. See merge request veloren/veloren!780	2020-02-14 04:44:34 +00:00
Joshua Yanovski	f4a46729e3	Allow spawning individual species with /spawn. ... To get the old behavior, you now need to refer to the internal keywords (like "bird_medium" or "quadruped_small") rather than the old friendly names (like "duck" or "pig"), as the latter generate single species now.	2020-02-14 03:12:37 +01:00
Ben Simpson	14619df6c0	Merge branch 'expandedreality/energy-regen' into 'master' ... Energy now does not regen when climbing,gliding,and swimming Closes #483 See merge request veloren/veloren!800	2020-02-14 01:15:47 +00:00
Ben Simpson	0db424e21f	Energy now does not regen when climbing,gliding,and swimming	2020-02-13 18:46:01 -06:00
Marcel	3f63a03399	Merge branch 'angelonfira/test-action-macosx-build' into 'master' ... Angelonfira/test action macosx build See merge request veloren/veloren!796	2020-02-14 00:19:06 +00:00
Forest Anderson	89d092d10c	Angelonfira/test action macosx build	2020-02-14 00:19:06 +00:00
Acrimon	8d444627fe	Merge branch '407-rolling-and-climbing-need-and-consume-energy' into 'master' ... Resolve "Rolling and climbing need and consume energy" Closes #407 See merge request veloren/veloren!795	2020-02-13 09:36:41 +00:00
Ben Simpson	e78117a86b	Update common/src/sys/controller.rs, common/src/sys/movement.rs, common/src/comp/energy.rs files	2020-02-13 08:36:29 +00:00
Ben Simpson	7b23bca08c	Update common/src/sys/movement.rs	2020-02-13 08:19:36 +00:00
Ben Simpson	ce2b1d870d	Update common/src/sys/movement.rs	2020-02-13 08:13:36 +00:00
Ben Simpson	3e67a26a3b	Update common/src/sys/controller.rs, common/src/sys/movement.rs files ... Deleted energy.rs, movement.rs files	2020-02-13 07:59:54 +00:00
Ben Simpson	3be68e1a13	Update common/src/comp/energy.rs, energy.rs, common/src/sys/controller.rs, common/src/sys/movement.rs, movement.rs files	2020-02-13 07:30:32 +00:00
Marcel	3b58087110	Merge branch 'xMAC94x/update-toolchain' into 'master' ... update toolchain to `2020-02-06` See merge request veloren/veloren!791	2020-02-09 22:06:45 +00:00
Marcel Märtens	ceb0821996	update toolchain to	2020-02-09 22:58:01 +01:00
Marcel	01df51392a	Merge branch 'reactivate-ci' into 'master' ... Reactivate Failure is allowed for benchmark and coverity See merge request veloren/veloren!790	2020-02-09 19:31:37 +00:00
Marcel Märtens	5ba185d718	Reactivate Failure is allowed for benchmark and coverity	2020-02-09 20:01:44 +01:00
Songtronix	bee93babd7	Merge branch 'songtronix/improve-version-mismatch' into 'master' ... more robust version detection Closes #350 See merge request veloren/veloren!789	2020-02-09 18:32:29 +00:00