Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,238 Commits 151 Branches 18 Tags 2.1 GiB
3e37586ba5
Commit Graph

13238 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
João Capucho
277528355b
Fix depth textures being bound as float textures 
Webgpu defines that a texture depth format can only be sampled as a
depth texture or as an "unfilterable-float", however both the clouds and
postprocess pipeline were declaring in their bind group that the depth
source was a texture with a sample type of float (filterable).

This is forbidden by the webgpu specification and should be caught by
validation, but the version of wgpu we are using doesn't have that check
(older versions have the check), so we can only assume that this is
undefined behavior.

Relevant sources:
- [Bind Group Creation](https://gpuweb.github.io/gpuweb/#bind-group-creation)
includes the rules that explicitly forbid this situation
- [Depth-stencil formats](https://gpuweb.github.io/gpuweb/#depth-formats)
defines which sample types we are allowed to use with depth textures
 2023-01-31 16:46:24 +00:00
Christof Petig
ba2f51e5e0 Merge branch 'christof/glowing_fire' into 'master' 
Lamps, embers and campfires use glowing indices for the brightest fiery colors

See merge request veloren/veloren!3784
 2023-01-30 22:03:19 +00:00
Nicolas Wildner
34c69a2c30 Updating some translations, reordering others to match order with EN language - part 2 2023-01-30 02:13:31 +00:00
Nicolas Wildner
0e212f61bf Updating some translations, reordering others to match order with EN language 2023-01-30 00:59:46 +00:00
Christof Petig
f306b6ee69 make lamps, embers and campfires use glowing indices for the brightest fiery colors 2023-01-29 18:53:18 +01:00
Marcel
c165d28e7d Merge branch 'wyvern_wings' into 'master' 
wyverns

See merge request veloren/veloren!3720
 2023-01-28 21:25:17 +00:00
flo
5e1fd02095 wyverns 2023-01-28 21:25:17 +00:00
Isse
c5ea47f868 Merge branch 'isse/mod-badge' into 'master' 
Moderator chat badge

See merge request veloren/veloren!3781
 2023-01-28 02:44:43 +00:00
Isse
aefead4a31 fmt 2023-01-28 03:10:43 +01:00
Isse
a5248bd61a Add to changelog 2023-01-28 03:10:42 +01:00
Isse
d949348661 Moderator badge 2023-01-28 03:10:24 +01:00
Isse
0543c265c8 Merge branch 'veloren-poggly/chat_cmd_suggestion_and_links' into 'master' 
[ #1286] Chat command suggestions + Fixing /help + code refactor

See merge request veloren/veloren!3699
 2023-01-28 02:06:23 +00:00
Ellen Sun
d774319cf0 cleanup and fixes + added change to CHANGELOG.md 2023-01-27 20:32:41 -05:00
Ellen Sun
74cb514094 move client commands to voxygen + add Admin to be shared with client for permissions + unit test for alphabetical server command 2023-01-27 20:31:56 -05:00
Ellen Sun
361e5204e3 added levenshtein for most similar string and words starting with what user entered + check permissions + added clientside commands to /help 2023-01-27 20:31:56 -05:00