Samuel Keiffer
ef858ef72b
Merge branch 'crabman/buff-stacking' into 'master'
...
Re-enable buff stacking for short buffs
See merge request veloren/veloren!4181
2023-11-12 16:56:10 +00:00
Maxicarlos08
7382f70f1e
Re-enable buff stacking for short buffs
2023-11-12 17:17:20 +01:00
Samuel Keiffer
d7b07ee250
Merge branch 'sam/beam-collision-fix' into 'master'
...
Fix beam collision
See merge request veloren/veloren!4178
2023-11-11 21:13:43 +00:00
Sam
e37f085114
Changed terrain check to use beam position instead of entity position.
2023-11-11 15:17:59 -05:00
Isse
2703f4031d
Merge branch 'terrain-frag-hotfix' into 'master'
...
Put ice_reflections under REFLECTION_MODE_HIGH
See merge request veloren/veloren!4177
2023-11-10 12:39:19 +00:00
Isse
db1480b564
put ice_reflections under REFLECTION_MODE_HIGH
2023-11-10 12:53:09 +01:00
Christof Petig
424006e000
Merge branch 'site_rock_circle' into 'master'
...
site_rock_circle
See merge request veloren/veloren!4175
2023-11-10 00:31:04 +00:00
flo
9d52110a49
site_rock_circle
2023-11-10 00:31:03 +00:00
Christof Petig
0ddd40336a
Merge branch 'zesterer/worldgen' into 'master'
...
Various worldgen improvements
See merge request veloren/veloren!4152
2023-11-10 00:15:29 +00:00
Joshua Barretto
1cf811b366
Merge branch 'master' into 'master'
...
Fixed French Translation
See merge request veloren/veloren!4172
2023-11-09 19:41:06 +00:00
Sorann753
a63debe1b7
Fixed French Translation
2023-11-09 19:41:05 +00:00
Joshua Barretto
5418f49ecb
Fixed broken savannah pit altitude
2023-11-08 23:19:02 +01:00
Joshua Barretto
84e59c52fb
Made portal fizz better convey access
2023-11-08 23:19:02 +01:00
Joshua Barretto
23e239275c
Better mesa basement
2023-11-08 23:19:02 +01:00
Joshua Barretto
83dc22dfbf
Made ice reflective
2023-11-08 23:19:00 +01:00
Joshua Barretto
05863eb1ef
Better mesa layer colours
2023-11-08 23:17:34 +01:00
Joshua Barretto
48ebe004c0
Added mesa generation
2023-11-08 23:17:34 +01:00
Christof Petig
d193e03a03
Merge branch 'christof/kits_in_plugins' into 'master'
...
support adding kits, presets and resource experience by plugins
See merge request veloren/veloren!4173
2023-11-07 23:06:17 +00:00
Christof Petig
e7e4c20445
fix test and code quality
2023-11-07 22:54:19 +01:00
Christof Petig
2fbdf42360
support adding kits, presets and resource experience by plugins
2023-11-07 20:24:13 +01:00
Samuel Keiffer
08171b378c
Merge branch 'crabman/disable-buff-stacking' into 'master'
...
Disable selfbuff stacking
See merge request veloren/veloren!4163
2023-11-05 19:18:12 +00:00
flo
bae450146b
Merge branch 'uniior/starter-glider' into 'master'
...
Starter glider.
See merge request veloren/veloren!4160
2023-11-04 22:09:00 +00:00
Uniior
1d8a23c30e
Starter glider.
2023-11-04 22:09:00 +00:00
flo
949e9cde66
Merge branch 'jungle_ruin_chest_and_npc_fix' into 'master'
...
jungle_ruin_chest_and_npc_fix
See merge request veloren/veloren!4166
2023-11-04 21:12:16 +00:00
flo
a39dda80b4
jungle_ruin_chest_and_npc_fix
2023-11-04 21:12:15 +00:00
maxicarlos08
17094ad569
remove_previous -> enforced_limit
2023-11-03 07:51:54 +01:00
Isse
03bb1fbc3c
Merge branch 'isse/snow-glitter' into 'master'
...
SnowGlitter experimental shader
See merge request veloren/veloren!4164
2023-11-02 15:04:19 +00:00
Isse
7a8e363df1
better way to show glitter
2023-11-02 15:22:32 +01:00
Isse
664fe61b83
Add to changelog
2023-11-02 12:55:45 +01:00
Isse
48d95e7699
SnowGlitter experimental shader
2023-11-02 12:53:34 +01:00
maxicarlos08
601056ecbd
Add new SelfBuff buff category
2023-11-02 07:44:30 +01:00
maxicarlos08
d3f4b854fc
Disable selfbuff stacking
2023-11-01 21:50:50 +01:00
flo
3332401ac4
Merge branch 'npc_spawn_fixes' into 'master'
...
npc_spawn_fixes
See merge request veloren/veloren!4161
2023-11-01 18:39:24 +00:00
flo
e88d61eb44
npc_spawn_fixes
2023-11-01 18:39:24 +00:00
Christof Petig
375bb5be00
Merge branch 'christof/items_in_plugins2' into 'master'
...
Support recipes and item images from plugins
See merge request veloren/veloren!4149
2023-10-31 21:51:41 +00:00
Marcel
c9b3a8546b
Merge branch 'xMAC94x/more_ci_info' into 'master'
...
try to fix the gittag error
See merge request veloren/veloren!4158
2023-10-27 14:41:18 +00:00
Marcel Märtens
a100ee15a3
the error seems to be persistent, e.g. https://gitlab.com/veloren/veloren/-/jobs/5378935781#L208
...
The object does not seem to exist in the respective hash:
```
Checking out d690f256
2023-10-27 00:53:05 +02:00
Christof Petig
4ba80c0e73
fix voxygen compilation without plugins, part 2
2023-10-25 00:05:35 +02:00
Christof Petig
c354fe1b1d
conditionally turn off more code (fixes unit test)
2023-10-25 00:05:35 +02:00
Christof Petig
e114c8b6f3
remove unneeded concatenate implementation
2023-10-25 00:05:35 +02:00
Christof Petig
7c4057d7d8
simplify, how can you not love clippy
2023-10-25 00:05:35 +02:00
Christof Petig
f73f52605f
Support recipes and item images from plugins
2023-10-25 00:05:35 +02:00
Christof Petig
d690f25615
Merge branch 'christof/no_plugin_hotfix' into 'master'
...
fix compilation of voxygen without plugins
See merge request veloren/veloren!4156
2023-10-24 21:59:25 +00:00
Dominik Broński
8ff825e8d9
Merge branch 'crabman/remove-halloween-dullahans' into 'master'
...
Remove halloween dullahans
See merge request veloren/veloren!4157
2023-10-24 17:12:19 +00:00
Maxicarlos08
5f547d62d3
Remove halloween dullahans
2023-10-24 18:34:02 +02:00
Isse
1562de246c
Merge branch 'isse/fix-lod-reflections' into 'master'
...
Fix LoD reflections for nvidea + vulkan
See merge request veloren/veloren!4155
2023-10-23 19:48:30 +00:00
Isse
f98e4331a1
Fix LoD reflections for nvidea + vulkan
2023-10-23 19:48:30 +00:00
Christof Petig
fc81d6ecd5
fix compilation of voxygen without plugins
2023-10-23 21:47:26 +02:00
Joshua Barretto
dfd63bf23b
Merge branch 'zesterer/tethering' into 'master'
...
Allow entities to be tethered to one-another
See merge request veloren/veloren!3953
2023-10-21 14:35:15 +00:00
Joshua Barretto
22b537a4e5
Fixed CI and incorrect vel
2023-10-21 14:58:13 +01:00
