2127 Commits

Author	SHA1	Message	Date
ccgauche	2bb54137a0	Merge branch 'master' into 'ccgauche/plugin-player-join-event' ... # Conflicts: # CHANGELOG.md	2021-03-02 09:45:15 +00:00
Sam	06ecf398db	Item use is now goes through a control action rather than a control event.	2021-03-01 20:51:08 -05:00
Justin Shipsey	c9e8302cda	Merge branch 'armor-org' into 'master' ... armor org See merge request veloren/veloren!1835	2021-03-02 01:29:46 +00:00
Ben Wallis	026188f7e2	Merge branch 'item-stacking-and-splitting' into 'master' ... Implement stacking and splitting Closes #904 See merge request veloren/veloren!1802	2021-03-02 00:08:47 +00:00
Jesus Bracho	6b1ba22d1f	Implement stacking and splitting	2021-03-02 00:08:46 +00:00
ccgauche	32b16d71ce	Adressed all comments	2021-03-01 22:24:02 +01:00
heydabop	839f599c49	Fixes #974 - convert tool/weapon equip time to floating point seconds	2021-03-01 15:06:39 -06:00
ccgauche	cc06cbce83	Fixed comments	2021-03-01 21:29:18 +01:00
ccgauche	927b2868ec	Lots of improvement in pointer management (switched from i32 to u64) + New event implemented	2021-03-01 19:00:44 +01:00
Sam	803c7d81dc	Fix a few asset paths for armors.	2021-03-01 00:58:43 -05:00
Samuel Keiffer	c06e36fe6b	Merge branch 'sam/invulnerability-buff' into 'master' ... Invulnerability Buff Closes #965 See merge request veloren/veloren!1834	2021-03-01 05:46:46 +00:00
Sam	0ec709bf17	Migration for armor re-organization.	2021-03-01 00:42:35 -05:00
jshipsey	f4a10912b0	more asset organization	2021-02-28 22:18:43 -05:00
Samuel Keiffer	a2c19cd047	Merge branch 'aweinstock/trade-requestitem' into 'master' ... During a trade, allow requesting items from the counterparty's inventory... See merge request veloren/veloren!1829	2021-03-01 02:39:36 +00:00
Sam	884e74cab8	Added command: '/safezone'	2021-02-28 18:14:59 -05:00
Sam	e582c2bdc6	Added invulnerability debuff. Currently tied to campfire spawned with '/campfire' command.	2021-02-28 15:02:03 -05:00
Samuel Keiffer	b935962c02	Merge branch 'sam/fix-roll-combo' into 'master' ... Fixes being stuck in roll when interrupting combo melee. See merge request veloren/veloren!1831	2021-02-28 18:02:01 +00:00
Avi Weinstock	1831efd8e4	During a trade, allow requesting items from the counterparty's inventory (prequisite for NPC trading).	2021-02-28 10:13:49 -05:00
Sam	8a05ecb4aa	Fixes being stuck in roll when interrupting combo melee.	2021-02-28 08:50:33 -05:00
Sam	fbba22ac2f	Made changes to fix torvus	2021-02-27 22:42:11 -05:00
Samuel Keiffer	c4f70416eb	Merge branch 'sam/combo-comp' into 'master' ... Combo now persists as a compnent, rather than a field on a state See merge request veloren/veloren!1828	2021-02-28 02:42:40 +00:00
Joshua Barretto	604f47d884	Merge branch 'zesterer-master-patch-28400' into 'master' ... Fix jump routes not being pathed See merge request veloren/veloren!1706	2021-02-28 00:41:38 +00:00
Sam	453c4b5d16	Re-allowed for what stage you were on to persist through a roll	2021-02-27 19:24:18 -05:00
Sam	2aa332b5e2	Combo melee now checks combo	2021-02-27 18:24:28 -05:00
Joshua Barretto	dc9e16e3be	fmt	2021-02-27 23:21:01 +00:00
Sam	8003b5d570	Added combo component	2021-02-27 14:55:06 -05:00
Sam	8db54e9b53	Particle rebase fixes	2021-02-27 01:42:47 -05:00
jshipsey	8efc53fcef	feedback adjustments	2021-02-27 01:42:47 -05:00
jshipsey	4aaef35d1d	address comments	2021-02-27 01:42:47 -05:00
Snowram	cf228c7642	Adds harvester npc	2021-02-27 01:42:47 -05:00
jshipsey	b32aab5a26	visual weapon variation, adjust minotaur dash, keyframed golem quake	2021-02-27 01:42:47 -05:00
jshipsey	8f463921f8	minotaur moves, added claygolem	2021-02-27 01:42:47 -05:00
jshipsey	7feb00f7e4	balance pass 2	2021-02-27 01:42:47 -05:00
jshipsey	c44a542fab	rebase, yeti in dungeon	2021-02-27 01:42:47 -05:00
jshipsey	9fdba83b03	initial balance	2021-02-27 01:42:47 -05:00
Snowram	7d9d66709c	Adds yeti npc	2021-02-27 01:42:46 -05:00
Snowram	ba18f1fab3	Adds 3 new npcs, tusk ram new design	2021-02-27 01:42:46 -05:00
Sam	56acb6a5f0	Ice particles for Wendigo	2021-02-27 01:42:46 -05:00
jshipsey	befa6b3a21	theropod retrofit, some more moves	2021-02-27 01:42:46 -05:00
jshipsey	0ffcd62d12	some new moves, combine biped weapons into one file	2021-02-27 01:42:46 -05:00
jshipsey	ce8b4d27a2	full bipedsmall armor swaps	2021-02-27 01:42:46 -05:00
jshipsey	7e2794c234	anim tweaks, more loadout setup	2021-02-27 01:42:46 -05:00
jshipsey	f8a6a48b41	BL improvements, various fixes	2021-02-27 01:42:45 -05:00
jshipsey	6f49e0b94e	rebase	2021-02-27 01:42:45 -05:00
jshipsey	fc80fff924	new dungeon setups, new npcs, weapon specific loadouts, anims	2021-02-27 01:42:45 -05:00
jshipsey	fbaaa60513	bow	2021-02-27 01:42:45 -05:00
jshipsey	4e3bf62732	the stabs	2021-02-27 01:42:45 -05:00
unknown	aa4f68d72b	More npcs work	2021-02-27 01:42:45 -05:00
unknown	917afb3f0d	Add new quadmeds npcs with rough offsets	2021-02-27 01:42:44 -05:00
Snowram	39b76036b1	Sahagin, Adlet npcs	2021-02-27 01:42:43 -05:00