320 Commits

Author	SHA1	Message	Date
timokoesters	d5db1f6ca0	Add dash ability to sword M2	2020-03-16 16:34:53 +01:00
timokoesters	81591fcaf7	Make npcs attack again	2020-03-16 14:27:52 +01:00
timokoesters	1279f70184	Add shield item	2020-03-16 13:40:14 +01:00
timokoesters	87acc01d48	Readd ranged and debug boost. Add bouncing while running in first person	2020-03-16 12:32:57 +01:00
timokoesters	1f78344d6f	Move equipment from loadout into body	2020-03-15 19:44:47 +01:00
Pfauenauge90	bf1c46d596	item images	2020-03-15 16:42:09 +01:00
Pfauenauge90	913393963a	plate armour	2020-03-15 16:42:09 +01:00
Joshua Barretto	e20feeeb0c	Added armour items and equipping of armour	2020-03-15 16:42:09 +01:00
Pfauenauge90	e80750bc53	plate chest armour	2020-03-15 15:53:51 +01:00
Pfauenauge90	5a962771d9	assassin armour	2020-03-15 15:53:51 +01:00
timokoesters	aa963b7686	Merge remote-tracking branch 'origin/master' into clientstates	2020-03-15 15:27:06 +01:00
timokoesters	447617dc69	Make durations and damage depend on weapon type	2020-03-15 14:34:17 +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
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	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
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
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
timokoesters	70027da9aa	feat: hitting enemies with basic_attack gives energy	2020-03-10 18:54:59 +01:00
Imbris	a04c1b1d1d	Add uid to Player component ... fix: world examples	2020-03-08 22:58:38 +01:00
Adam Whitehurst	5f8751e2d3	Begin implementing triple attack	2020-03-08 12:37:17 -07:00
Adam Whitehurst	f769c74bf4	Add charging back	2020-03-08 10:04:26 -07:00
Adam Whitehurst	49c7143144	Clean up warnings	2020-03-07 13:03:10 -08:00
Adam Whitehurst	54a7112ad9	resolve conflicts merging master -> clientstates	2020-03-07 12:49:48 -08:00
Adam Whitehurst	096d3b691e	Merge master	2020-03-07 12:49:15 -08:00
Adam Whitehurst	c678ca9540	Re-add blocking	2020-03-07 11:55:15 -08:00
jshipsey	d4332c3138	eagle adjustments	2020-03-07 13:26:46 -05:00
Adam Whitehurst	b1d1299fe6	Clean up character states	2020-03-07 10:15:02 -08:00
S Handley	b0ca85069b	Piggyback on the InventoryUpdate events and attach some additional event info so that we can detect why the inventory update was triggered, and emit an associated sfx event that matches it.	2020-03-04 10:09:48 +00:00
timokoesters	4cc998f92b	fix: non-humanoid npcs can attack again	2020-02-24 22:20:50 +01:00
timokoesters	d0439fdd84	Merge remote-tracking branch 'origin/master' into clientstates	2020-02-24 21:34:17 +01:00
timokoesters	ac611f4618	fix: sync characterstates, better energy management	2020-02-24 20:57:33 +01:00
timokoesters	31f3aae75c	fix: make climbing cost stamina	2020-02-24 19:18:06 +01:00
timokoesters	2fa902270e	fix: block	2020-02-24 18:10:42 +01:00
timokoesters	1f4065ae32	fix: attacking	2020-02-24 14:32:12 +01:00
Monty Marz	2180040f70	Orc hairstyles, several tiny UI fixes, fixed beard warnings	2020-02-20 10:32:03 +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	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 Märtens	8f5e409ac4	update toolchain to	2020-02-09 22:58:01 +01:00
Imbris	fb7edd2404	Make nametag positioning slightly better	2020-02-06 17:10:52 -05:00
timokoesters	0bc07a0835	Merge remote-tracking branch 'origin/master' into clientstates	2020-02-03 22:02:32 +01:00
timokoesters	aa52c6fd4f	fix: jumping and attacking	2020-02-03 17:03:52 +01:00
Marcel Märtens	dae31ae5b6	apply new rustfmt - touching alot of files	2020-02-01 21:39:39 +01:00