51 Commits

Author	SHA1	Message	Date
timokoesters	449ae22730	Add inventory stacking	2020-03-19 14:32:17 +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
timokoesters	f32eb1db75	fix dash attack angles, arrow damage and readd possession stick impl	2020-03-17 14:15:39 +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
Joshua Barretto	e20feeeb0c	Added armour items and equipping of armour	2020-03-15 16:42:09 +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	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	096d3b691e	Merge master	2020-03-07 12:49:15 -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	0bc07a0835	Merge remote-tracking branch 'origin/master' into clientstates	2020-02-03 22:02:32 +01:00
Marcel Märtens	dae31ae5b6	apply new rustfmt - touching alot of files	2020-02-01 21:39:39 +01:00
Joshua Barretto	faa86226c7	Collars	2020-01-29 12:01:28 +00:00
Monty Marz	981b55837a	fix typo in en.ron, fixed unfinished weapons dropping from chests	2020-01-26 22:57:06 +00:00
Adam Whitehurst	5bba0a96fc	Fix refs	2020-01-05 15:21:37 -08:00
Adam Whitehurst	542f06eef4	Add new() to states	2020-01-05 15:17:22 -08:00
AdamWhitehurst	9c6ce9babd	Begin implementing combat actions	2019-12-29 15:47:42 -08:00
Adam Whitehurst	92d99af53c	feat: weapon-type dependent wield and attack durations ... also some controller.rs cleanup	2019-12-03 06:30:08 +00:00
Monty Marz	c38447a264	assets update ... map image human male hairstyles elf male hairstyle potion item cheese item removed admin items from inventory	2019-11-09 13:42:42 +00:00
timokoesters	3ceb3a9d6d	refactor: small adjustments	2019-10-25 09:47:28 +02:00
timokoesters	a6faffca4e	feat: asset glob loading, random weapons in chests	2019-10-24 23:55:25 +02:00
timokoesters	0a1e12c9ad	improvement: make debug items of type ItemKind::Tool ... This way all items that can be held in a hand are tools	2019-10-24 23:55:24 +02:00
timokoesters	20248a4818	feat: store items as RON files ... When a new item is created, a ron file will be used as a template	2019-10-24 23:47:26 +02:00
Monty Marz	3e0ac48bd8	Multiple Assets and UI fixes and additions	2019-10-23 19:40:45 +00:00
Monty Marz	fdfab6a807	refactor: create_projectile doesn't take a light ... It returns a builder so the caller can just do it	2019-10-17 20:59:36 +00:00
heydabop	522ab2cd98	fixes #324 - changes possible modulo range from 0-29 to 1-29 to prevent mod by 0	2019-10-13 21:39:37 -05:00
Monty Marz	d82ec6715a	Item icons, chests and more	2019-10-09 19:28:05 +00:00
Joshua Barretto	a2758b091c	Added flower and grass items	2019-09-26 00:15:07 +01:00
Joshua Barretto	e22fe81a2f	Added velorite	2019-09-26 00:15:07 +01:00
Joshua Barretto	f57c2ec453	Made consumable items have an effect, better damage animation	2019-09-26 00:15:07 +01:00
Joshua Barretto	a961a267f1	Added apple and mushroom collection	2019-09-26 00:15:07 +01:00
timokoesters	5d02d32ec6	Make inventory::get return a reference	2019-08-30 22:42:43 +02:00
timokoesters	082ccd7c46	Avoid right-ward shift	2019-08-30 22:32:47 +02:00
timokoesters	512d2d9a8e	Rename Teleport to Boost	2019-08-29 19:44:30 +02:00
timokoesters	6e1c78e5d5	Add debug mode item giving speed boost in look_dir on click	2019-08-29 19:44:28 +02:00
timokoesters	155605841b	Use comp::Stats to store Equipment, make char weapon selection work	2019-08-29 19:44:28 +02:00
timokoesters	869535e5a2	Rename tool strength/damage to power	2019-08-26 20:05:13 +02:00
Joshua Barretto	331b6c8b3a	Altered Item structure	2019-08-01 09:12:00 +01:00
Joshua Barretto	995090d2d4	Added item drops	2019-08-01 09:12:00 +01:00
Joshua Barretto	31f8794c39	Started work on inventory manipulation	2019-08-01 09:09:26 +01:00
Acrimon	03253d3cc0	Switch everything to IDVStorage (No tuning yet.)	2019-07-31 11:40:58 +02:00