3563 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
timokoesters	4e281e22b7	Merge branch 'clientstates' of gitlab.com:veloren/veloren into clientstates	2020-03-15 15:43:52 +01:00
timokoesters	aa963b7686	Merge remote-tracking branch 'origin/master' into clientstates	2020-03-15 15:27:06 +01:00
AdamWhitehurst	6078b9a468	Merge branch 'clientstates' of https://gitlab.com/veloren/veloren into clientstates	2020-03-15 08:24:40 -06:00
timokoesters	447617dc69	Make durations and damage depend on weapon type	2020-03-15 14:34:17 +01:00
AdamWhitehurst	7520798567	Damage increase, remove lines	2020-03-15 07:26:42 -06:00
AdamWhitehurst	52059d83d3	add knockback localevent	2020-03-15 07:20:42 -06:00
Songtronix	b9639f2454	Merge branch 'songtronix/remove-runtime-dep' into 'master' ... fix: do not depend on hash file during runtime See merge request veloren/veloren!849	2020-03-15 08:34:15 +00:00
Songtronix	e72f0c6d12	fix: do not depend on hash file during runtime	2020-03-15 09:02:56 +01:00
timokoesters	598a4c6cbb	Add loadout struct for info on weapon configurations	2020-03-14 22:33:20 +01:00
AdamWhitehurst	7dfe00b674	Finish state struct data refactor	2020-03-14 15:17:27 -06:00
AdamWhitehurst	ee706fa32a	Tweaking timed_combo	2020-03-14 13:04:04 -06:00
AdamWhitehurst	6fc94c22ba	Update timed combo, add CharacerBehavior trait	2020-03-14 12:50:07 -06:00
timokoesters	fe19698d52	Make abilities depend on weapon	2020-03-14 16:40:29 +01:00
Joshua Yanovski	f8926a5737	Merge remote-tracking branch 'origin/master' into sharp/map-colors	2020-03-13 13:32:42 +01:00
Adam Whitehurst	ac1c279a9b	Begin TripleStrike Logic	2020-03-12 08:22:42 -07:00
Adam Whitehurst	00e4ad61f7	add ToolData::get_primary_abilities()	2020-03-12 07:47:27 -07:00
Adam Whitehurst	68dd8c578f	Add some ability costs	2020-03-12 07:36:02 -07:00
Adam Whitehurst	990ea5c5a2	Add triple_strike behavior to cs behavior sys	2020-03-12 07:34:24 -07:00
Adam Whitehurst	772f7ff92d	Remove can_transition and begin triple_strike	2020-03-12 07:33:19 -07:00
Adam Whitehurst	3cb288bc8c	Add TripleStrike	2020-03-12 07:25:06 -07:00
Adam Whitehurst	a64bf1ac60	TripleAttack -> TimedCombo ... (it wasnt the right logic for the tiple attack)	2020-03-12 05:16:40 -07:00
Shane Handley	4e5d200b70	Fix: Make the dropped item collection range match the world item range limit.	2020-03-12 11:54:23 +09:00
Marcel	875ae6cedd	Merge branch 'shandley/inventory-full-handling' into 'master' ... Feedback when collecting an item while inventory is full Closes #459 See merge request veloren/veloren!847	2020-03-11 10:31:00 +00:00
S Handley	bc692c0101	Add audio and chat message feedback when the player attempts to collect something while thier inventory is full.	2020-03-11 10:30:59 +00:00
Acrimon	ab56829385	Merge branch 'shandley/collect-block-mousedown-only' into 'master' ... Check for the mousedown state before trying to collect an item via secondary mouse click. See merge request veloren/veloren!846	2020-03-11 08:07:34 +00:00
Shane Handley	434dd96cd6	Check for the mousedown state before trying to collect an item via secondary mouse click.	2020-03-11 15:39:46 +09:00
Marcel	9c56d25cfa	Merge branch 'mckol/update-ci' into 'master' ... Made the CI fail if Cargo.lock would be changed by cargo build Closes #110 See merge request veloren/veloren!845	2020-03-11 00:05:34 +00:00
Imbris	a4eaeb1da6	Merge branch 'imbris/se-latency' into 'master' ... Rearrange some operations in the server tick to reduce clientside latency of ServerEvent mediated effects See merge request veloren/veloren!840	2020-03-10 23:21:57 +00:00
Mckol	e4a1e4d078	Made the CI fail if Cargo.lock isn't up-to-date	2020-03-10 23:32:33 +01:00
Acrimon	406767ae31	Merge branch 'capucho/voxygen-logout-timeout' into 'master' ... FIX #513 logout timeout See merge request veloren/veloren!837	2020-03-10 22:12:29 +00:00
Marcel	77d2c2a253	temp allow failure in macos	2020-03-10 22:03:29 +00:00
Capucho	b14582d196	removed merge artifact	2020-03-10 21:09:38 +00:00
Capucho	339965f6ad	Merge branch 'capucho/voxygen-logout-timeout' of gitlab.com:veloren/veloren into capucho/voxygen-logout-timeout ... Fixed conflicts	2020-03-10 21:06:08 +00:00
Capucho	a9580a81bc	Rebased on master and moved logout message to events	2020-03-10 21:04:13 +00:00
Mckol	c3f1afdf2b	Merge branch 'controller' into 'master' ... Controller support Closes #20 See merge request veloren/veloren!750	2020-03-10 21:00:13 +00:00
Mckol	8838682f0b	Added Controller support	2020-03-10 21:00:13 +00:00
Acrimon	e75aff7bb7	Merge branch 'shandley/pickup-player-relative' into 'master' ... Constrain item pickup range See merge request veloren/veloren!843	2020-03-10 20:50:04 +00:00
S Handley	b2312a0487	Check that a targeted collectible is within a certain pickup range of the character before highlighting it	2020-03-10 20:50:04 +00:00
Capucho	16e4214a52	Switch states instead of popping	2020-03-10 20:34:50 +00:00
Capucho	5fe9521233	Fix the spam on disconnect	2020-03-10 20:34:50 +00:00
Capucho	9d805a745e	Proper fix to the logout timeout problem using Disconnect ACK	2020-03-10 20:34:50 +00:00
Capucho	d8ba63ffdc	Janky fix of the logout timeout problem	2020-03-10 20:34:50 +00:00
timokoesters	a3fc3c3122	exit basic_attack when no weapon is equipped	2020-03-10 20:40:54 +01:00
timokoesters	841a2bbd6d	clean up old states, lower gravity	2020-03-10 19:12:16 +01:00
timokoesters	0ce451a8b1	fix: deny gliding/jumping/rolling under water	2020-03-10 19:00:49 +01:00
timokoesters	70027da9aa	feat: hitting enemies with basic_attack gives energy	2020-03-10 18:54:59 +01:00
timokoesters	c88c4687f3	fix: stop switching quickly between climbing and idle at low energy	2020-03-10 17:33:36 +01:00
Imbris	14f0b018fd	Add metric for new connection handling time, move StateExt to its own module	2020-03-09 22:39:12 -04:00
Imbris	7132ef4136	Rearrange some operations in the server tick to reduce clientside latency of ServerEvent mediated effects	2020-03-09 22:31:24 -04:00
Imbris	5598fe7166	Merge branch 'songtronix/fix-517' into 'master' ... fix #517 Closes #517 See merge request veloren/veloren!842	2020-03-09 23:25:04 +00:00