Samuel Keiffer
|
6c7c0eefae
|
Merge branch 'gnarlings' into 'master'
Gnarlings
See merge request veloren/veloren!3194
|
2022-02-15 00:22:37 +00: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 |
|
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 |
|
Jonathan Berglin
|
dfb8d37a38
|
Update swedish translations
|
2022-02-13 20:39:54 +00:00 |
|
Imbris
|
ddcee8448b
|
Merge branch 'persist_debug_checkbox' into 'master'
Persist interface debug checkbox across sessions
See merge request veloren/veloren!3147
|
2022-02-13 19:43:51 +00:00 |
|
UncomfySilence
|
a0d43cb21d
|
further balance changes
|
2022-02-13 10:35:19 +01:00 |
|
Sam
|
2e6610314c
|
Balance tweaks
|
2022-02-13 00:39:46 -05:00 |
|
Sam
|
c77270b799
|
Addressed feedback
|
2022-02-12 20:52:01 -05:00 |
|
Sam
|
49e8803ee0
|
Fixed tests
|
2022-02-12 17:22:08 -05:00 |
|
James Melkonian
|
8da1ae578f
|
Simplify tunnel entity spawning
|
2022-02-12 14:21:22 -08:00 |
|
James Melkonian
|
8a02a943f4
|
Document tunnel generation
|
2022-02-12 13:57:44 -08:00 |
|
Monty Marz
|
c7ce2b773c
|
new icons
|
2022-02-12 22:46:34 +01:00 |
|
Marcel
|
8c2f251220
|
Merge branch 'crow/new-dungeon-song' into 'master'
Added Dungeon Song
See merge request veloren/veloren!3197
|
2022-02-12 12:38:11 +00:00 |
|
Crow (Austin Bowers)
|
78ec15981d
|
Added Dungeon Song
|
2022-02-12 12:38:10 +00:00 |
|
Joshua Barretto
|
44d16ce441
|
Merge branch 'site2/path_color' into 'master'
Change Path colors
See merge request veloren/veloren!3192
|
2022-02-11 17:05:10 +00:00 |
|
InfRandomness
|
090ac9030c
|
Change Path colors
|
2022-02-11 17:05:10 +00:00 |
|
Ben Wallis
|
6d309c2fd9
|
* Added macos-aarch64 builds to gitlab CI config
* Disabled incremental compilation for macos builds
* Removed cache for macos builds
* Renamed release-nightly-tmp-fix-airshipper to release-scheduled
* Renamed build-nightly to build-scheduled
|
2022-02-11 11:18:36 +00:00 |
|
jshipsey
|
2eee43865f
|
chieftain anims
|
2022-02-11 02:18:48 -05:00 |
|
Sam
|
4991f7ecea
|
Gnarlign site tweaks and chieftain buff
|
2022-02-11 01:23:09 -05:00 |
|
Sam
|
377906dfa0
|
Ground shockwave particle tweaks.
|
2022-02-10 22:40:26 -05:00 |
|
James Melkonian
|
95ea7a47e0
|
Gnarling cavern entrance stump
|
2022-02-10 19:35:30 -08:00 |
|
Sam
|
cab87658a3
|
Placement tweaks
|
2022-02-10 14:58:39 -05:00 |
|
James Melkonian
|
07d19bf03c
|
Gnarling cavern tweaks
|
2022-02-10 14:58:38 -05:00 |
|
Sam
|
86a00e75bb
|
Tweaked fire particles
|
2022-02-10 14:58:37 -05:00 |
|
Sam
|
bf7e84c6ae
|
Initial particle work
|
2022-02-10 14:58:37 -05:00 |
|
jshipsey
|
5eea73f793
|
root walls, minor tweaks
|
2022-02-10 14:58:36 -05:00 |
|
Sam
|
0031aa6f5f
|
Chieftain AI and attacks
|
2022-02-10 14:58:35 -05:00 |
|
jshipsey
|
3a35dcc77f
|
brick texture colors
|
2022-02-10 14:58:34 -05:00 |
|
jshipsey
|
0c788997a4
|
anims
|
2022-02-10 14:58:34 -05:00 |
|
James Melkonian
|
14080da693
|
Fix rebase
|
2022-02-10 14:58:33 -05:00 |
|
Sam
|
fcb0f8d8f0
|
Wood golem attacks and ai
|
2022-02-10 14:58:32 -05:00 |
|
Sam
|
e044bf5091
|
Mandragora attacks and ai
|
2022-02-10 14:58:32 -05:00 |
|
Sam
|
f1801560fa
|
Deadwood ai
|
2022-02-10 14:58:31 -05:00 |
|
jshipsey
|
cb48dd0a75
|
adjust chieftain hut, start alter
|
2022-02-10 14:58:30 -05:00 |
|
Sam
|
82c976919e
|
Darts are now darts.
|
2022-02-10 14:58:29 -05:00 |
|