3250 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Forest Anderson	5bad014ae2	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	8e93bd7413	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	f73b5b2fcb	Update max hp and refill health when a player uses the set_level command.	2020-02-23 09:08:30 +09:00
Julian	7bc719e33f	UpdatedSoundFX ... New souunds for Sword_in and Sword_out.	2020-02-22 20:26:49 +01:00
Justin Shipsey	13cbef7865	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	9ab2833056	Add weapon wield/unwield sfx support	2020-02-21 02:56:54 +00:00
Monty Marz	2afdebbe47	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	2180040f70	Orc hairstyles, several tiny UI fixes, fixed beard warnings	2020-02-20 10:32:03 +00:00
Songtronix	2d0b5d514a	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	035d74f502	Move ServerEvents into own module	2020-02-18 20:51:10 +01:00
Monty Marz	4b3d61f41d	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	18f46a6f83	Fix Fonts	2020-02-17 16:22:49 +00:00
Imbris	633abcb058	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	abe47d8621	Gamma setting now works	2020-02-17 00:46:31 +00:00
Treeco	aaf1de9f9b	Added gamma setting, not hooked up yet	2020-02-16 20:32:17 +00:00
Forest Anderson	30ec2755fe	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	1ca026f56d	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	31449db578	Add a new name (to force the repo to update this file)	2020-02-16 15:11:34 +00:00
Rémy PHELIPOT	98c37d0b28	[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	26f670e5c3	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	90680d5490	Fix healthbar background alignment	2020-02-16 10:58:44 +00:00
Imbris	a08fc287ae	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	b739623579	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	f79b26d043	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	b481d3c747	Try tarpaulin 4 times before failing	2020-02-15 20:57:52 +00:00
Songtronix	3c1121261a	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	a89003cbfa	resolve #481 - add /set_level command	2020-02-14 22:11:41 +01:00
Marvin Altemeier	bfdfd87d89	change order of /give_exp arguments	2020-02-14 22:11:20 +01:00
Marvin Altemeier	787e5a6e49	fix #460 - /give_exp targeting wrong player	2020-02-14 22:11:20 +01:00
Imbris	6424ca7947	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	8a9d4012fa	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	636bf7d343	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	c427f2298e	Energy now does not regen when climbing,gliding,and swimming	2020-02-13 18:46:01 -06:00
Marcel	1c6460f0ef	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	b997f746e7	Angelonfira/test action macosx build	2020-02-14 00:19:06 +00:00
Acrimon	62602368d8	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	3343f8e5c0	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	bfd2f345b1	Update common/src/sys/movement.rs	2020-02-13 08:19:36 +00:00
Ben Simpson	0cd8150e98	Update common/src/sys/movement.rs	2020-02-13 08:13:36 +00:00
Ben Simpson	a49482503d	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	1aa98dbb62	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
Adam Whitehurst	d383abf950	Re add combat	2020-02-11 07:42:17 -08:00
Marcel	56c4b50a27	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	8f5e409ac4	update toolchain to	2020-02-09 22:58:01 +01:00
Marcel	9f0307b926	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	90bcd87007	Reactivate Failure is allowed for benchmark and coverity	2020-02-09 20:01:44 +01:00
Songtronix	d53d7f4649	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
Songtronix	b8e12811bf	fix(version): more robust version detection ... Fixes #350	2020-02-09 18:11:40 +01:00
Imbris	a62eb1b17b	Merge branch 'imbris/fixes' into 'master' ... Fix a few things See merge request veloren/veloren!785	2020-02-06 22:41:14 +00:00
Imbris	fb7edd2404	Make nametag positioning slightly better	2020-02-06 17:10:52 -05:00