Imbris
|
adec5905bd
|
Properly wait to request buffer mapping until after the command to copy the screenshot texture to the buffer has been submitted.
|
2022-02-19 19:05:04 -05:00 |
|
Marcel
|
b5bac97c2e
|
Merge branch 'xMAC94x/release-numbers' into 'master'
Change the version number to 0.12
See merge request veloren/veloren!3219
|
2022-02-18 23:41:06 +00:00 |
|
Marcel Märtens
|
802b9e7914
|
Change the version number to 0.12
|
2022-02-18 22:36:53 +01:00 |
|
Marcel
|
caf46a3f8d
|
Merge branch 'treeco/remove-settings-button' into 'master'
Removed dead settings button from main menu
See merge request veloren/veloren!3218
|
2022-02-18 16:36:42 +00:00 |
|
Treeco
|
fdd7237dfc
|
Removed dead settings button from main menu
|
2022-02-18 16:11:30 +00:00 |
|
Marcel
|
4fd794579d
|
Merge branch 'xvar/fix-macos-builds' into 'master'
Fixed artifact paths for mac builds
See merge request veloren/veloren!3217
|
2022-02-18 14:30:22 +00:00 |
|
Ben Wallis
|
bbe8f9db8b
|
Fixed artifact paths for mac builds
|
2022-02-18 14:10:11 +00:00 |
|
Marcel
|
917f3e5016
|
Merge branch 'james/fix-boat-drag' into 'master'
Fix airship command by splitting out ships
See merge request veloren/veloren!3216
|
2022-02-18 08:34:14 +00:00 |
|
James Melkonian
|
7f21cbf4bc
|
Fix airship command by splitting out ships
|
2022-02-18 08:34:14 +00:00 |
|
Marcel
|
d463b67ef4
|
Merge branch 'zesterer/release-map' into 'master'
Added location system, switched to release map
See merge request veloren/veloren!3213
|
2022-02-17 16:31:01 +00:00 |
|
Marcel
|
b8cb7c783d
|
Merge branch 'pfau/new_bg' into 'master'
New login-screen bg image
See merge request veloren/veloren!3214
|
2022-02-17 16:08:37 +00:00 |
|
Monty Marz
|
9ca1693ef8
|
New login-screen bg image
|
2022-02-17 16:08:37 +00:00 |
|
Joshua Barretto
|
34871c9355
|
List locations on empty command
|
2022-02-17 16:01:18 +00:00 |
|
Joshua Barretto
|
b786570470
|
Added location system, switched to release map
|
2022-02-17 14:51:59 +00:00 |
|
Marcel
|
0b16205e70
|
Merge branch 'slipped/spearbug' into 'master'
fix spear bug
See merge request veloren/veloren!3212
|
2022-02-17 08:11:05 +00:00 |
|
jshipsey
|
e569ee24c3
|
fix
|
2022-02-17 00:58:25 -05:00 |
|
Imbris
|
bdb10c4e14
|
Merge branch 'isse/minor-ux-improvements' into 'master'
Minor inventory ux improvements
Closes #1436
See merge request veloren/veloren!3157
|
2022-02-16 21:48:03 +00:00 |
|
Isidor Nielsen
|
67f2d05d3c
|
Minor inventory ux improvements
|
2022-02-16 21:48:03 +00:00 |
|
Marcel
|
5c18bd2b77
|
Merge branch 'xMAC94x/update_cache_image' into 'master'
update cache image for ci
See merge request veloren/veloren!3203
|
2022-02-16 21:41:29 +00:00 |
|
Marcel
|
b09698b8ac
|
Merge branch 'shouvik/prevent_empty_trades' into 'master'
Fixes #1452 - Prevents empty trades
Closes #1452
See merge request veloren/veloren!3202
|
2022-02-16 21:41:26 +00:00 |
|
ShouvikGhosh2048
|
d72f43190b
|
Fixes #1452 - Prevents empty trades
|
2022-02-16 21:41:26 +00:00 |
|
Marcel
|
96023b2221
|
Merge branch 'slipped/waterbug' into 'master'
fix wallrun water issue
See merge request veloren/veloren!3209
|
2022-02-16 21:21:06 +00:00 |
|
floppy
|
0d3a0cd1b8
|
enable custom naming bricks for lake biomes
|
2022-02-16 20:30:52 +01:00 |
|
jshipsey
|
bf84cc75c2
|
fix
|
2022-02-16 06:13:01 -05:00 |
|
Treeco
|
90fbadbd03
|
Fix ember z fighting, remove ember sway
|
2022-02-15 23:05:20 +00:00 |
|
Joshua Barretto
|
00b003a23c
|
Enabled site2 towns by default
|
2022-02-15 19:01:43 +00:00 |
|
Marcel
|
e762a0b390
|
Merge branch 'fix_airshipper' into 'master'
undo stage renaming
See merge request veloren/veloren!3205
|
2022-02-15 08:42:51 +00:00 |
|
Marcel Märtens
|
5972c3ee1e
|
undo stage renaming
|
2022-02-15 09:41:49 +01:00 |
|
Marcel
|
56048fff13
|
Merge branch 'james/stop-drop-and-roll' into 'master'
Fix NPC humanoids not rolling when on fire
See merge request veloren/veloren!3204
|
2022-02-15 08:28:37 +00:00 |
|
James Melkonian
|
c906c9e2dc
|
Fix NPC humanoids not rolling when on fire
|
2022-02-15 08:28:37 +00:00 |
|
Samuel Keiffer
|
6c7c0eefae
|
Merge branch 'gnarlings' into 'master'
Gnarlings
See merge request veloren/veloren!3194
|
2022-02-15 00:22:37 +00:00 |
|
Marcel Märtens
|
9787f0be1e
|
update cache image for ci, rename linux to linux-x86_64
todo: adjust airshipper before merging this
|
2022-02-15 01:01:20 +01:00 |
|
Sam
|
f30e879cf5
|
Clippy fixes
|
2022-02-14 17:23:15 -05:00 |
|
Avi Weinstock
|
70b7e1ef92
|
Automatically fill top-level unions as separate fills.
|
2022-02-14 14:28:00 -05:00 |
|
Monty Marz
|
900fff7ba9
|
small UI fixes, new haste buff icon
|
2022-02-14 19:24:59 +01:00 |
|
Marcel
|
3a65f89e81
|
Merge branch 'xvar/add-mac-m1-ci-job' into 'master'
Added CI support for MacOS M1 builds
See merge request veloren/veloren!3186
|
2022-02-14 17:57:44 +00:00 |
|
Sam
|
2bcf9b9a26
|
Removed unions in gnarling site to make chunkgen more performant
|
2022-02-14 12:40:06 -05:00 |
|
Joshua Barretto
|
6e46b4ddef
|
Fixed CI
|
2022-02-14 11:46:42 -05:00 |
|
Marcel
|
e9487afa06
|
Merge branch 'imbris/profiling-tweaks' into 'master'
Some changes to help with profiling and cleaning up in .cargo/config
See merge request veloren/veloren!3201
|
2022-02-14 08:22:59 +00:00 |
|
Avi Weinstock
|
aab552afc5
|
Iterate over partially-disjoint unions of primitive bounds, improving CSG rasterization performance in the presence of sparse/disjoint unions.
|
2022-02-13 23:48:12 -05:00 |
|
Sam
|
3373985a5f
|
Comments
|
2022-02-13 23:35:18 -05:00 |
|
Imbris
|
5df3d60e95
|
Some changes to help with profiling and cleaning up aliases in .cargo/config. Removed incremental override since incremental is no longer turned off by default in rustc. Remove -Zuntable-options from several aliases because the --profile option is now stable. Added shader-from-source feature to aliases for voxygen that turn off the default features
|
2022-02-13 22:58:24 -05:00 |
|
Sam
|
6dafacaa24
|
Addressed review comments
|
2022-02-13 21:49:46 -05:00 |
|
Imbris
|
46c35f3376
|
Merge branch 'unvariant/render_item_drops' into 'master'
Render item drops instead of placeholder textures
See merge request veloren/veloren!3175
|
2022-02-14 02:09:45 +00:00 |
|
unvariant
|
9d98cd9e58
|
Render item drops instead of placeholder textures
|
2022-02-14 02:09:45 +00:00 |
|
Marcel
|
1aed60ed19
|
Merge branch 'ibrahimbeladi/kickstart-ar-lang' into 'master'
kick start Arabic language (i18n)
See merge request veloren/veloren!2971
|
2022-02-13 23:44:52 +00:00 |
|
Ibrahim Beladi
|
17d8baa3d9
|
kick start Arabic language (i18n)
|
2022-02-13 23:44:52 +00:00 |
|
Bingen Galartza Iparragirre
|
d2da5c18be
|
Add initial Basque language translation
|
2022-02-13 22:00:53 +01:00 |
|
Avi Weinstock
|
4f962df7c8
|
Automatically use right-recursion instead of left-recursion for union/intersection of CSG primitives via measuring the depth of the trees when unioning/intersecting them.
|
2022-02-13 15:44:51 -05:00 |
|
Marcel
|
75e88c2fb8
|
Merge branch 'tygyh/Update-swedish-translations' into 'master'
Update swedish translations
See merge request veloren/veloren!3199
|
2022-02-13 20:39:55 +00:00 |
|