13627 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Joshua Barretto	6fe102b86d	Fixed cyclops loot table	2023-05-04 19:57:18 +01:00
Joshua Barretto	f000347cac	Make NPCs respond to each other	2023-05-04 11:53:01 +01:00
Joshua Barretto	a5b1e41d8b	Make NPC interaction go via rtsim	2023-05-04 11:23:46 +01:00
Joshua Barretto	2ff0118df0	More rtsim monsters	2023-05-04 10:13:02 +01:00
Joshua Barretto	6fbd007cea	Non-humanoid rtsim respawning, made monsters wander	2023-05-01 21:48:33 +01:00
Joshua Barretto	0f92f38967	Started adding wandering rtsim monsters	2023-05-01 18:29:32 +01:00
Joshua Barretto	ba8984e1a7	Made NPC sentiment slightly more forgiving	2023-05-01 12:16:40 +01:00
Justin Shipsey	7643147dc2	Merge branch 'DaforLynx/music-update' into 'master' ... Small music update See merge request veloren/veloren!3903	2023-04-29 05:34:28 +00:00
DaforLynx	7bf6df5ec1	Small music update	2023-04-29 05:34:28 +00:00
Marcel	0b9181ef56	Merge branch 'Terraaaagd/update-es_LA' into 'master' ... Terraaaagd/update Spanish Latino translation See merge request veloren/veloren!3878	2023-04-27 21:16:11 +00:00
Marcel	142202449e	Merge branch 'xMAC94x/update_deps' into 'master' ... update deps which no longer work in the future of rust See merge request veloren/veloren!3902	2023-04-27 20:06:33 +00:00
Marcel	88b26e8db8	Merge branch 'tygyh/Update-swedish-translations' into 'master' ... Update swedish translations See merge request veloren/veloren!3858	2023-04-27 19:38:28 +00:00
Jonathan Berglin	d5a8829cfd	Update swedish translations	2023-04-27 19:38:28 +00:00
Marcel Märtens	f58feb0c23	update deps which no longer work in the future of rust	2023-04-27 21:11:45 +02:00
Marcel	53746e5a2c	Merge branch 'AMAIOLAMO/update-zh_CN' into 'master' ... Amaiolamo/update zh_CN translation See merge request veloren/veloren!3880	2023-04-27 10:24:30 +00:00
Marcel	bd2e211cbd	Merge branch 'walpo/update_es_es_translation' into 'master' ... Update the Spanish (Castilian) translation See merge request veloren/veloren!3896	2023-04-25 17:26:27 +00:00
walpo	ba70f72fb7	Update the Spanish (Castilian) translation	2023-04-25 17:26:27 +00:00
Isse	f5f6edca5c	Merge branch 'isse/fix-no-exp-no-drop' into 'master' ... Fix items not dropping when no exp is given. See merge request veloren/veloren!3899	2023-04-25 15:58:24 +00:00
Isse	3d3a6eab2b	Fix items not dropping when no exp is given.	2023-04-25 11:33:44 +02:00
Isse	4d79c89a0c	Merge branch 'floppy_multiloot' into 'master' ... Add multiloot See merge request veloren/veloren!3839	2023-04-23 19:17:40 +00:00
Isse	ab4076518f	Add multiloot	2023-04-23 19:17:39 +00:00
Imbris	1a287e4e89	Merge branch 'imbris/docs-index' into 'master' ... Generate index page for documentation using unstable flag See merge request veloren/veloren!3895	2023-04-23 17:35:28 +00:00
Imbris	fa7b6a1746	Merge branch 'imbris/3883-todo' into 'master' ... Apply TODO from !3883 and a few other refactors See merge request veloren/veloren!3893	2023-04-23 00:28:17 +00:00
Joshua Yanovski	2c4cbf1404	Merge branch 'pegasus4903/fix_french_errors' into 'master' ... Fix french errors See merge request veloren/veloren!3894	2023-04-22 19:17:05 +00:00
pegasus4903	534454cf05	Fix french errors	2023-04-22 19:17:05 +00:00
Imbris	8da8b56308	Generate index page for documentation using unstable flag	2023-04-22 14:16:34 -04:00
Imbris	362bd129c2	Merge branch 'ubruntu/mount_overhead_tweak' into 'master' ... Hide display name of mount while mounted (at full hp) See merge request veloren/veloren!3892	2023-04-22 18:13:14 +00:00
ubruntu	b53bfd4246	Hide display name of mount while mounted (at full hp)	2023-04-22 18:13:13 +00:00
Imbris	cd02b3a172	Apply TODO from !3883 and refactor to avoid collect in Inventory::damage_items, also reduce to iterating over the hashmap once when culling the recently unequipped items list	2023-04-22 11:37:52 -04:00
Samuel Keiffer	4b6c5f57e3	Merge branch 'sam/track-unequipped-items' into 'master' ... Recently unequipped items are now tracked and durability loss on death is applied to them See merge request veloren/veloren!3883	2023-04-19 23:23:04 +00:00
Sam	4f991190d3	Removed 3rd to_owned call	2023-04-19 18:43:43 -04:00
Sam	e819cd2309	Updated hashbrown, removed some to_owned calls in handling recently unequipped items	2023-04-19 18:43:40 -04:00
Sam	63bf8f3ac7	Responded to review comments and fixed tests	2023-04-19 18:34:17 -04:00
Sam	7fdfc0e71b	Addressed review	2023-04-19 18:34:17 -04:00
Sam	d0a902d918	Being attacked now cancels all active trades.	2023-04-19 18:34:16 -04:00
Sam	c1a64e1d69	Recently unequipped items are now tracked and durability loss on death is applied to them	2023-04-19 18:34:16 -04:00
Isse	77785faeec	Merge branch 'isse/shader-fixes' into 'master' ... Two small shader fixes See merge request veloren/veloren!3889	2023-04-19 21:37:03 +00:00
Isse	1494d93fc8	fix cloud tearing	2023-04-19 22:46:35 +02:00
Isse	1442dd29f1	fix NaN issue in apply_point_glow_light	2023-04-19 21:14:19 +02:00
Isse	4b831f884e	reduce the offset of clouds on the horizon	2023-04-19 21:01:30 +02:00
Imbris	9ad83a695c	Merge branch 'imbris/update-tracy-0.15.2' into 'master' ... Update `tracy-client` to `0.15.2` See merge request veloren/veloren!3871	2023-04-19 02:39:40 +00:00
Imbris	f525be9b3b	Update tracy-client to 0.15.2, also use tracy_client through the ... re-export of `profiling` to make keeping the versions in-sync much less tedious (and have `cargo update` not break this).	2023-04-18 21:28:15 -04:00
CxRedix	9a47ef63a6	Ability.ftl translation finished	2023-04-18 15:41:57 +08:00
CxRedix	1768be43d6	added the missing Guillotine ability translation	2023-04-18 14:58:02 +08:00
Christof Petig	025713e2c0	Merge branch 'christof/fix_orichalcum_drop' into 'master' ... introduce optional model indices for drop items as well (fixing orichalcum armor drops) See merge request veloren/veloren!3884	2023-04-17 07:07:40 +00:00
Christof Petig	870a0098d6	add changelog	2023-04-16 23:00:36 +02:00
Christof Petig	4c1c84030f	introduce optional model indices for drop items as well (fixing orichalcum armor drops)	2023-04-16 22:56:04 +02:00
Isse	510d72048e	Merge branch 'rtsim-like-enemy-killer' into 'master' ... rtsim: positive sentiment gain for killing enemies See merge request veloren/veloren!3882	2023-04-16 17:16:51 +00:00
Isse	e9cbd4487b	Merge branch 'rtsim-cmds' into 'master' ... Add more info to the /rtsim_{npc,info} commands See merge request veloren/veloren!3881	2023-04-16 17:16:48 +00:00
Julian Tölle	865b50fff2	rtsim: positive sentiment gain for killing enemies ... As per the age old saying: "the enemy of my enemy is my friend". NPCs will start liking the killer of their enemy more.	2023-04-16 18:08:09 +02:00