Sam
42bb4bee15
Minotaur and cultist dungeons now offer roughly equiovalent loot.
...
Minotaur now drops tier 5 weapons and armor instead of tier 4
Mindflayer now drops cultist weapons and armor instead of tier 5
Melee legendaries moved to minotaur
Mindflayer now lonly drops ranged legendaries
2021-10-13 12:24:10 -04:00
Samuel Keiffer
4b3b2f2079
Merge branch 'sam/small-fix' into 'master'
...
Small block fix
See merge request veloren/veloren!2921
2021-10-13 14:30:12 +00:00
Sam
1e3b0dcd16
Fix block energy cost being multiplied by 10 and also slightly reduce it.
2021-10-13 10:02:28 -04:00
Marcel
430ee87620
Merge branch 'Limofeus/russian_translation_updates' into 'master'
...
Limofeus/russian translation updates
See merge request veloren/veloren!2920
2021-10-12 17:15:49 +00:00
Limofeus
df1aab877b
Upd #2 - removed mixed up tabs and spaces
2021-10-12 19:18:11 +03:00
Joshua Barretto
afc14bb220
Merge branch 'devrique/catalan-language-corrections' into 'master'
...
i18n: Revised catalan (Catalonia) translation
See merge request veloren/veloren!2918
2021-10-12 14:23:17 +00:00
GLawrence29
e1ea1193c2
i18n: Revised catalan (Catalonia) translation
2021-10-12 15:16:25 +02:00
Limofeus
a2d0911355
Upd #1 - Skills, Settings labels, Tools and Credits translations added
2021-10-12 16:09:55 +03:00
Joshua Barretto
4bae3a4b62
Merge branch 'make-merchants-send-trade-on-iteraction' into 'master'
...
Make merchants send the player a trade request when interacted with
Closes #1368
See merge request veloren/veloren!2914
2021-10-11 16:45:18 +00:00
Imbris
4b2842da2f
Merge branch 'imbris/opt-phys-2.0' into 'master'
...
Make terrain physics faster with internal iteration
See merge request veloren/veloren!2915
2021-10-11 14:52:46 +00:00
Joshua Barretto
6d7f15b5da
Merge branch 'juliancoffee/fix_rtsim_names' into 'master'
...
Fix Traveller names
See merge request veloren/veloren!2916
2021-10-11 12:33:33 +00:00
juliancoffee
b5d9e4e4a9
Fix Traveller names
...
- Previously RtSim were created with automatic name for body generated
from EntityConfig, not from RtSim body. Now RtSim body is set for
EntityConfig.
2021-10-11 15:06:43 +03:00
Samuel Keiffer
05b85a00e2
Merge branch 'sam/wiki-all-entities' into 'master'
...
Csv export entity drops tool now has ability to export all entities at once.
See merge request veloren/veloren!2910
2021-10-10 16:56:46 +00:00
Sam
fc787d150e
Now stores a column for entity path to more easily allow searching for what drops a particular item in the future
...
Fixed excel perceiving certain csv entries as a date
2021-10-10 12:37:16 -04:00
Marcel
a4cf875a54
Merge branch 'isse/crafted-from-item' into 'master'
...
use "input:____" for searching by recipe input
See merge request veloren/veloren!2893
2021-10-10 15:44:44 +00:00
Isidor Nielsen
f0864a7b0a
use "input:____" for searching by recipe input
2021-10-10 15:44:43 +00:00
Marcel
94439a4240
Merge branch 'jtriantafylos/background_fps' into 'master'
...
Fixes #1350 - Allow players to cap the game FPS when unfocused
Closes #1350
See merge request veloren/veloren!2890
2021-10-10 15:33:38 +00:00
James Triantafylos
99776a6ebd
Fixes #1350 - Allow players to cap the game FPS when unfocused
2021-10-10 15:33:31 +00:00
Joshua Barretto
e660aafed3
Nicer lake borders
2021-10-10 13:41:57 +01:00
Joshua Barretto
1473029204
Added ability to toggle world features
2021-10-10 13:41:57 +01:00
Joshua Barretto
bee922156e
Added radial pattern to shrooms
2021-10-10 13:41:57 +01:00
Joshua Barretto
d09f1e1c4a
Added noise to blocks
2021-10-10 13:41:57 +01:00
Joshua Barretto
086097cd56
Better vines and lighting
2021-10-10 13:41:57 +01:00
Joshua Barretto
a5309e1036
Prevented shrooms spawning in water
2021-10-10 13:41:57 +01:00
Joshua Barretto
2ce88ac398
Better grass and lily distribution
2021-10-10 13:41:57 +01:00
Joshua Barretto
353ccc5bce
Added new cavern sprites to caverns
2021-10-10 13:41:57 +01:00
Joshua Barretto
7768a22f7f
Better moss
2021-10-10 13:41:57 +01:00
Monty Marz
14ed73ec12
cavern sprites
2021-10-10 13:41:56 +01:00
Joshua Barretto
b22029f87c
More mushroom sprites
2021-10-10 13:41:56 +01:00
Joshua Barretto
d785ecc102
Added vines
2021-10-10 13:41:56 +01:00
Joshua Barretto
46118acef3
Added mushroom inner bevel
2021-10-10 13:41:56 +01:00
Joshua Barretto
bfc55d7b17
More cavern details
2021-10-10 13:41:56 +01:00
Joshua Barretto
ed40e92801
Better cave water
2021-10-10 13:41:56 +01:00
Joshua Barretto
f9c635c928
Silly GI for water in caves
2021-10-10 13:41:56 +01:00
Joshua Barretto
5c0026f4a7
Performance improvements for terrain watcher
2021-10-10 13:41:56 +01:00
Joshua Barretto
1cfad833c7
Added caverns, fixed chunk load performance issue
2021-10-10 13:41:56 +01:00
Joshua Barretto
0f2afbec8f
Fixed clouds and fluids underground
2021-10-10 13:41:56 +01:00
Imbris
4f6eb286e6
Remove dead commented code, updated changelog, commented profiling spans
...
(but left in for easy reuse later), fix clippy complaint
2021-10-10 03:09:03 -04:00
Imbris
57922d9802
Rearrange iteration pattern so that x is in the inner loop in the default for_each_in (no or little perf change)
2021-10-10 02:42:07 -04:00
Imbris
11c8cf19d1
Switch to for loops in default for_each_in (small perf increase), add inline to sprite methods (no perf change)
2021-10-10 02:42:07 -04:00
Imbris
5777486f5c
Remove custom for_each_in from Chonk
2021-10-10 02:42:07 -04:00
Imbris
f65399eb00
Make LiquidKind::merge as inlineable, remove always from TerrainGrid::for_each_in inline annotation
2021-10-10 02:42:07 -04:00
Imbris
2350c08e91
Try marking VolGrid2d::for_each_in and friends as inlineable
2021-10-10 02:42:07 -04:00
Imbris
3a4c45f045
Try marking Chonk::for_each_in and related functions as inlineable
2021-10-10 02:42:07 -04:00
Imbris
7f6ba90f59
simplify water/walls check code, interally iterate in chonks (but not
...
chunks)
2021-10-10 02:42:06 -04:00
Imbris
e7b92789f9
Refactor some of the terrain collision code, failed pre-emptive liquid check experiment
2021-10-10 02:42:06 -04:00
Imbris
8987f6128e
Do iteration check for snapping after checking the other conditions
2021-10-10 02:42:06 -04:00
Imbris
798e02b9e5
Convert water/walls check to the new iteration function
2021-10-10 02:42:06 -04:00
Imbris
59bd5b4acd
Initial iterator optimization by using internal iteration at the vol_grid level, water/walls not switched over yet
2021-10-10 02:42:06 -04:00
antoniomuso
761ae8f69d
Make merchants send the player a trade request when interacted with
2021-10-09 21:14:01 +02:00
