13483 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Joshua Barretto	de1c961141	Fixed apple sprite offset	2023-03-01 12:09:41 +00:00
Joshua Barretto	0d0b7a8889	Got rid of the worst of the cull popping	2023-03-01 12:09:41 +00:00
Joshua Barretto	7fa654ae4c	Clippy fixes	2023-03-01 12:09:40 +00:00
Joshua Barretto	124c7e1496	Switch to camera position for culling	2023-03-01 12:09:40 +00:00
Joshua Barretto	661b587c9f	Added basic culling of underground terrain and sprites	2023-03-01 12:09:40 +00:00
Marcel	589fddab4e	Merge branch 'Thegaming_Life/replace_chunk_size_with_constant_in_swarm' into 'master' ... Changed the chunk size to constant See merge request veloren/veloren!3805	2023-02-28 10:00:54 +00:00
Thegaming Life	acbb7ccba9	Changed the chunk size to constant	2023-02-28 10:00:53 +00:00
Yusuf Bera Ertan	576b183e20	build(nix): update flake.nix	2023-02-25 08:54:38 +03:00
Samuel Keiffer	01da8b6a82	Merge branch 'tursus_werewolf_anim&spawn_loot_tweaks' into 'master' ... spawn and loot tweaks, tursus and werewolf anims See merge request veloren/veloren!3790	2023-02-22 01:32:05 +00:00
flo	98e93d1a1c	spawn and loot tweaks, tursus and werewolf anims	2023-02-22 01:32:05 +00:00
Isse	475bc5c6ff	Merge branch 'tormod/proximity-spec' into 'master' ... Make castles appear close to towns See merge request veloren/veloren!3801	2023-02-21 16:58:43 +00:00
Tormod Gjeitnes Hellen	7164391c40	Refactor the site enemy functions to return iterators.	2023-02-21 17:14:04 +01:00
Tormod Gjeitnes Hellen	5e506a02ef	Change warning level for failing to find site placement to debug.	2023-02-21 17:03:23 +01:00
Tormod Gjeitnes Hellen	0fbe6a67f2	Make castles appear close to towns.	2023-02-21 17:03:22 +01:00
Tormod Gjeitnes Hellen	a0dd527a1d	Refactor proximity checking to be more flexible.	2023-02-21 16:58:54 +01:00
Isse	9b6dd6198b	Merge branch 'tormod/castles-avoid-trees' into 'master' ... Make castles avoid trees. See merge request veloren/veloren!3799	2023-02-21 13:05:16 +00:00
Tormod G. Hellen	90b945e18b	Make castles avoid trees.	2023-02-20 23:24:03 +01:00
Marcel	63c8baffe1	Merge branch 'tygyh/Update-swedish-translations' into 'master' ... Remove unused 'hud-chat-mod' entry See merge request veloren/veloren!3793	2023-02-17 10:04:09 +00:00
Marcel	d4274402c1	Merge branch 'frost_gigas_revived_2' into 'master' ... frost_gigas See merge request veloren/veloren!3769	2023-02-15 00:10:38 +00:00
flo	bf81ffc029	frost_gigas	2023-02-15 00:10:37 +00:00
Christof Petig	968e4b721c	Merge branch 'floppy-bird_medium_2' into 'master' ... bird_medium_2 See merge request veloren/veloren!3706	2023-02-14 23:17:20 +00:00
flo	0531b40fae	bird_medium_2	2023-02-14 23:17:20 +00:00
Samuel Keiffer	5ca04365d5	Merge branch 'catb0t/climb_no_min_energy' into 'master' ... Don't require 10 energy for climbing See merge request veloren/veloren!3798	2023-02-14 03:21:49 +00:00
Cat Stevens	e19a497989	Don't require 10 energy for climbing ... The infinite climb bug should be fixed by !3792 (Refactor energy and poise regen), so we can safely remove the need for the character to have at least 10 energy to climb. The minimum energy needed to start climbing is now 1 energy. This was suggested by James M#8698.	2023-02-13 21:23:25 -05:00
Marcel	fb5d25d268	Merge branch 'walpo/update_license_file' into 'master' ... Update LICENSE See merge request veloren/veloren!3796	2023-02-13 11:12:20 +00:00
walpo	d6b9a6149c	Update LICENSE	2023-02-13 11:12:20 +00:00
Marcel	6b12da92af	Merge branch 'restart-watchtower' into 'master' ... docker-compose.yml: ensure watchtower restarts too See merge request veloren/veloren!3795	2023-02-11 19:48:40 +00:00
Scott Bronson	ca9455c37c	docker-compose.yml: ensure watchtower restarts too	2023-02-09 19:41:59 +00:00
tygyh	85d01a990c	Remove unused 'hud-chat-mod' entry	2023-02-08 20:58:43 +01:00
Marcel	ea15cdcfe3	Merge branch 'james/sitting-stamina-regen' into 'master' ... Refactor energy and poise regen See merge request veloren/veloren!3792	2023-02-07 18:02:27 +00:00
James Melkonian	21a2a4ac46	Refactor energy and poise regen	2023-02-07 18:02:26 +00:00
Marcel	aa005caff5	Merge branch 'james/fix-sword-sfx' into 'master' ... Fix sword sfx See merge request veloren/veloren!3791	2023-02-07 16:57:22 +00:00
James Melkonian	87f5a3345d	Fix sword sfx	2023-02-07 16:57:22 +00:00
Marcel	5fb74ea1d2	Merge branch 'nerf-nonpotion-drinks' into 'master' ... Nerf non-potion drinks. See merge request veloren/veloren!3788	2023-02-03 18:31:32 +00:00
Imbris	0c54d1b798	Merge branch 'imbris/small-fix423' into 'master' ... Fix cursor not hiding when closing bag while both the bag and crafting window are shown See merge request veloren/veloren!3789	2023-02-03 15:06:54 +00:00
Imbris	b9a6742ee6	Fix cursor not hiding when closing bag while both the bag and crafting window are displayed by delaying the want_grab calculation to after the crafting window is hidden	2023-02-03 00:26:49 -05:00
Avi Weinstock	707e189034	Nerf non-potion drinks.	2023-02-01 20:39:29 -05:00
Marcel	2153196294	Merge branch 'misc_creatures' into 'master' ... misc_creatures See merge request veloren/veloren!3783	2023-02-01 10:41:01 +00:00
Marcel	76b6da55f6	Merge branch 'MadirexRus/russian-translation-update' into 'master' ... Madirex rus/russian translation update See merge request veloren/veloren!3782	2023-02-01 10:40:58 +00:00
MadirexRus	f0f2aac93b	Madirex rus/russian translation update	2023-02-01 10:40:58 +00:00
Marcel	4beb732630	Merge branch 'update-pt_BR' into 'master' ... Update pt br - 2021-01-30 See merge request veloren/veloren!3785	2023-01-31 22:32:41 +00:00
flo666	e63ab8338e	don't spawn tursus	2023-01-31 20:47:56 +01:00
flo666	d219cdd97c	spawns & hitboxes	2023-01-31 20:34:41 +01:00
flo666	9c09000256	- change bristlemane to bristleback ... - axebeak tweaks	2023-01-31 20:34:41 +01:00
flo666	e109f5c377	axebeak, tursus	2023-01-31 20:34:40 +01:00
flo666	75bfbff2c3	bristlemane	2023-01-31 20:34:40 +01:00
flo666	271b80b832	seal	2023-01-31 20:34:40 +01:00
Imbris	f6f018d6dc	Merge branch 'capucho/rendering-fixes' into 'master' ... Fix depth textures being bound as float textures See merge request veloren/veloren!3787	2023-01-31 17:53:37 +00:00
Isse	0b9f518287	Merge branch 'fix_possess_crash' into 'master' ... fix_possess_crash See merge request veloren/veloren!3786	2023-01-31 17:18:52 +00:00
flo	4de4de758b	fix_possess_crash	2023-01-31 17:18:52 +00:00