332 Commits

Author	SHA1	Message	Date
timokoesters	bb1b3ceabc	Fix syncing amount	2020-03-19 17:44:32 +01:00
timokoesters	22652cfa37	Restore old boost stick behavior	2020-03-19 17:01:58 +01:00
timokoesters	449ae22730	Add inventory stacking	2020-03-19 14:32:17 +01:00
Pfauenauge90	d863e12235	swift leather armour parts	2020-03-19 14:17:53 +01:00
Pfauenauge90	509615c15b	npc armour	2020-03-18 23:09:58 +01:00
Pfauenauge90	4d9327cef5	2 weapons	2020-03-18 21:05:20 +01:00
timokoesters	4741e41230	Add support for different models per weapon type	2020-03-17 18:28:07 +01:00
Pfauenauge90	40910b28e4	unclothed parts	2020-03-17 15:39:29 +01:00
timokoesters	19a09782a0	Add ability requirements system	2020-03-17 15:01:41 +01:00
timokoesters	f32eb1db75	fix dash attack angles, arrow damage and readd possession stick impl	2020-03-17 14:15:39 +01:00
timokoesters	b040e18246	Fix body parts not changing	2020-03-16 22:06:23 +01:00
timokoesters	b3057add42	Smaller damage and health numbers	2020-03-16 19:55:12 +01:00
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