11593 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Imbris	f6b805db77	Merge branch 'isse/map-marker-fixes' into 'master' ... Map marker fixes See merge request veloren/veloren!3262	2022-03-07 12:16:04 +00:00
Isidor Nielsen	a5ab36e6b5	Map marker fixes	2022-03-07 12:16:04 +00:00
Marcel	9fe45ddb89	Merge branch 'christof/icetea_quickfix' into 'master' ... hotfix for sunflow ice tea costing 16x the amount of its ingredients See merge request veloren/veloren!3258	2022-03-05 14:22:29 +00:00
Christof Petig	c3d6b8c250	crafting factor was wrongly used as well …	2022-03-05 13:18:09 +01:00
Christof Petig	d02018f893	hotfix for sunflow ice tea costing 16x the amount of its ingredients ... also makes price debugging output more readable	2022-03-05 13:07:55 +01:00
Marcel	5b13719cd8	Merge branch 'christof/shredded_economy2' into 'master' ... Economy redesign: Cleaner file structure (no code change) See merge request veloren/veloren!3256	2022-03-05 09:19:27 +00:00
Christof Petig	546afa86ae	Economy redesign: Cleaner file structure (no code change)	2022-03-05 09:19:26 +00:00
Dr. Dystopia	1810998641	Remove redundant 'pos' variable	2022-03-05 09:54:01 +01:00
Dr. Dystopia	1cb7a083e7	Remove redundant if-statement	2022-03-05 09:53:28 +01:00
Samuel Keiffer	4e116e46b9	Merge branch 'DaforLynx/music-fix' into 'master' ... fix to soundtrack.ron See merge request veloren/veloren!3253	2022-03-04 19:02:04 +00:00
DaforLynx	32434ec840	Sorry Rarnage	2022-03-04 10:36:03 -08:00
Samuel Keiffer	3a359800d9	Merge branch 'sam/vertical-melee' into 'master' ... More sensible vertical limit to what melee attacks can hit See merge request veloren/veloren!3252	2022-03-04 03:59:38 +00:00
Sam	bc7c088a12	More sensible vertical limit to what melee attacks can hit	2022-03-03 20:03:32 -05:00
Marcel	d4c98e8775	Merge branch 'xMAC94x/linux-aarch64' into 'master' ... add linux-aarch64 on master builds to be consistent See merge request veloren/veloren!3250	2022-03-03 16:37:53 +00:00
Marcel Märtens	32de827e61	add linux-aarch64 on master builds to be consistent	2022-03-03 10:33:19 +01:00
Samuel Keiffer	31062c3761	Merge branch 'sam/weapon-trails' into 'master' ... Weapon trails See merge request veloren/veloren!3143	2022-03-03 06:53:40 +00:00
Sam	89bf529a5e	Addressed review comments	2022-03-03 01:12:40 -05:00
Sam	7ac6be27f0	Changelog	2022-03-03 01:12:00 -05:00
Sam	f5e0cb0045	Addressed review comments	2022-03-03 01:11:18 -05:00
Sam	0a0fffd5ed	Addressed review comments	2022-03-03 01:11:17 -05:00
Sam	5a60562eee	Addressed review comments	2022-03-03 01:11:16 -05:00
Sam	ce70c512e2	Arrow trails	2022-03-03 01:11:15 -05:00
Sam	48c97cd829	Glider trails	2022-03-03 01:11:13 -05:00
Sam	eacd43be16	Moved weapon offset functions up a level. Should allow gliders and arrows to be handled better.	2022-03-03 01:11:12 -05:00
jshipsey	6ba8af5434	anim additions	2022-03-03 01:11:11 -05:00
Sam	f3c5c2b5e3	Pointy trails	2022-03-03 01:11:10 -05:00
Monty Marz	855733bdcb	tiny tweak	2022-03-03 01:11:09 -05:00
Sam	b3a19ebc00	Weapon trails now works with dual wielding	2022-03-03 01:11:08 -05:00
Sam	a967daa2f5	Trails now controlled and enabled from animation files.	2022-03-03 01:11:07 -05:00
Sam	fc1a9f3c61	Trail thinning is now smooth	2022-03-03 01:11:06 -05:00
Sam	87434c472c	Trails shrinks over time	2022-03-03 01:11:05 -05:00
Sam	ab4c5dac87	Reset vertices for trails in trail manager.	2022-03-03 01:11:04 -05:00
Sam	bee16001ed	Don't upload weapon trails to GPUs for entities that have only zero quds.	2022-03-03 01:11:03 -05:00
Sam	cfbb3a5bca	Changed to a single dynamic model	2022-03-03 01:11:02 -05:00
Sam	0542e46e7d	Lighting works now hackily	2022-03-03 01:11:01 -05:00
Monty Marz	82def16969	visuals	2022-03-03 01:11:00 -05:00
Sam	c6dc96b795	Settings button to turn off weapon trails.	2022-03-03 01:10:59 -05:00
Sam	f4abe4f275	More tweaks	2022-03-03 01:10:58 -05:00
Sam	1f2ede656e	Fixed tests	2022-03-03 01:10:57 -05:00
Sam	b558331b32	Finishing touches	2022-03-03 01:10:55 -05:00
Sam	d23dd6c9e9	Fixed a few errors	2022-03-03 01:10:54 -05:00
Sam	5018a9f476	Game now runs, still doesn't work	2022-03-03 01:10:53 -05:00
Sam	33419c7b4c	Trails are now hackily created.	2022-03-03 01:10:51 -05:00
Sam	05f53a5316	Changed to one dynamic model per entity.	2022-03-03 01:10:50 -05:00
Sam	d9028ec978	Dynamic model now used for trail.	2022-03-03 01:10:49 -05:00
Sam	0794f980fe	Mostly snaked through another rendering pipeline	2022-03-03 01:10:47 -05:00
Justin Shipsey	b8bb77a62c	Merge branch 'christof/shredded_economy' into 'master' ... Diversify price calculation for items by using multiple categories per item. See merge request veloren/veloren!3248	2022-03-03 02:32:34 +00:00
Christof Petig	f347b9de11	Diversify price calculation for items by using multiple categories per item.	2022-03-03 02:32:34 +00:00
Joshua Barretto	dbc969251c	Merge branch 'isse/rock' into 'master' ... Better rocks See merge request veloren/veloren!3247	2022-03-02 16:28:05 +00:00
Isidor Nielsen	bd8a7a0506	Better rocks	2022-03-02 16:28:04 +00:00