Marcel
|
1e7436954e
|
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
|
05431ef391
|
Upd #2 - removed mixed up tabs and spaces
|
2021-10-12 19:18:11 +03:00 |
|
Joshua Barretto
|
3ba38f86ab
|
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
|
49c6156028
|
i18n: Revised catalan (Catalonia) translation
|
2021-10-12 15:16:25 +02:00 |
|
Limofeus
|
38f40ac7bc
|
Upd #1 - Skills, Settings labels, Tools and Credits translations added
|
2021-10-12 16:09:55 +03:00 |
|
Joshua Barretto
|
99a83aba2b
|
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
|
2b5bc54b6a
|
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
|
d83ffac369
|
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
|
a4f882a8d6
|
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
|
68e7d37ffd
|
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
|
8791f994dc
|
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
|
06615c4fda
|
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
|
17fefc8fd3
|
use "input:____" for searching by recipe input
|
2021-10-10 15:44:43 +00:00 |
|
Marcel
|
be557a7dfc
|
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
|
88216c8e9a
|
Fixes #1350 - Allow players to cap the game FPS when unfocused
|
2021-10-10 15:33:31 +00:00 |
|
Imbris
|
f96a8a11ab
|
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
|
8837dc81d5
|
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
|
34beb11557
|
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
|
6fb2e66dc1
|
Remove custom for_each_in from Chonk
|
2021-10-10 02:42:07 -04:00 |
|
Imbris
|
fb68bb3870
|
Make LiquidKind::merge as inlineable, remove always from TerrainGrid::for_each_in inline annotation
|
2021-10-10 02:42:07 -04:00 |
|
Imbris
|
3e84bb0669
|
Try marking VolGrid2d::for_each_in and friends as inlineable
|
2021-10-10 02:42:07 -04:00 |
|
Imbris
|
81d426f7a0
|
Try marking Chonk::for_each_in and related functions as inlineable
|
2021-10-10 02:42:07 -04:00 |
|
Imbris
|
685bcb5c62
|
simplify water/walls check code, interally iterate in chonks (but not
chunks)
|
2021-10-10 02:42:06 -04:00 |
|
Imbris
|
77a1fc26bd
|
Refactor some of the terrain collision code, failed pre-emptive liquid check experiment
|
2021-10-10 02:42:06 -04:00 |
|
Imbris
|
3f3eb637c4
|
Do iteration check for snapping after checking the other conditions
|
2021-10-10 02:42:06 -04:00 |
|
Imbris
|
bfece25bba
|
Convert water/walls check to the new iteration function
|
2021-10-10 02:42:06 -04:00 |
|
Imbris
|
c22636a4b8
|
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
|
ab92c4d52f
|
Make merchants send the player a trade request when interacted with
|
2021-10-09 21:14:01 +02:00 |
|
Joshua Barretto
|
af18c2590d
|
Merge branch 'ubruntu/group-loot-notifications' into 'master'
Groups can see what each member picks up
See merge request veloren/veloren!2906
|
2021-10-09 10:50:02 +00:00 |
|
ubruntu
|
ba9923c049
|
Groups can see what each member picks up
|
2021-10-09 10:50:01 +00:00 |
|
Joshua Barretto
|
2bdb052360
|
Merge branch 'imbris/dedup-chunk-gen-attempt' into 'master'
More robustly avoid duplicate chunk generation
See merge request veloren/veloren!2912
|
2021-10-08 22:00:50 +00:00 |
|
Imbris
|
343a64e1b6
|
Merge branch 'devrique/add-catalan-catalonia' into 'master'
Add catalan (Catalonia) language translation
See merge request veloren/veloren!2894
|
2021-10-08 20:42:46 +00:00 |
|
Imbris
|
dc1495afa8
|
Merge branch 'CapsizeGlimmer/centering-cursor-error-spam' into 'master'
Prevent "Error setting/centering cursor position" message spam
See merge request veloren/veloren!2902
|
2021-10-08 20:29:25 +00:00 |
|
Imbris
|
5394ab16bb
|
Submit chunk requests to the generator within the terrain system right before receiving new chunks, so that duplicate work is not done for chunks that just finished but were not yet added to the terrain.
|
2021-10-08 16:17:31 -04:00 |
|
Enrique AM
|
0a589ec255
|
Update CHANGELOG.md
|
2021-10-08 19:37:46 +02:00 |
|
GLawrence29
|
a60c19667e
|
Add catalan (Catalonia) language translation
|
2021-10-08 19:37:46 +02:00 |
|
Imbris
|
8575661d28
|
Ensure cancelled chunks are not loaded into the terrain
|
2021-10-08 13:20:50 -04:00 |
|
Joshua Barretto
|
c531ce9fd3
|
Merge branch 'treeco/too-many-bees' into 'master'
Decrease beehive frequency on apple trees
See merge request veloren/veloren!2911
|
2021-10-08 17:18:26 +00:00 |
|
Treeco
|
40f579d5ff
|
Decrease beehive frequency on apple trees
|
2021-10-08 17:42:01 +01:00 |
|
Joshua Barretto
|
ff570f3c4c
|
Merge branch 'zesterer/exploit-patching' into 'master'
Prevented double-spawning of chunks
See merge request veloren/veloren!2908
|
2021-10-08 11:36:22 +00:00 |
|
Joshua Barretto
|
afc0fa0ffd
|
Prevented double-spawning of chunks
|
2021-10-08 12:20:46 +01:00 |
|
Sam
|
e794758dad
|
Csv export entity drops tool now has ability to export all entities at once.
|
2021-10-07 20:28:18 -04:00 |
|
Joshua Barretto
|
5fa753cf19
|
Merge branch 'zesterer/exploit-patching' into 'master'
Added minimum server-side chunk loading
See merge request veloren/veloren!2905
|
2021-10-07 13:56:16 +00:00 |
|
Joshua Barretto
|
fa767246f3
|
Added minimum server-side chunk loading
|
2021-10-07 14:23:55 +01:00 |
|
CapsizeGlimmer
|
b0eb684d31
|
Prevent "Error setting/centering cursor position" message spam
|
2021-10-06 21:25:14 +00:00 |
|
Imbris
|
fe0954cb7d
|
Merge branch 'imbirs/hud-map-tweaks' into 'master'
A few tweaks to the Hud map
See merge request veloren/veloren!2901
|
2021-10-06 20:04:39 +00:00 |
|
Imbris
|
58c690f1d2
|
Remove map drag from the settings file since it is always reset when closing the map leaving little reason to persist it
|
2021-10-06 02:13:02 -04:00 |
|
Imbris
|
2983ab60ed
|
Make map icons fade out quickly when near the edge of the map display
|
2021-10-06 01:37:11 -04:00 |
|
Treeco
|
e4c19bb2ec
|
Merge branch 'treeco/new-trees' into 'master'
More procgen trees, large map fixes
See merge request veloren/veloren!2899
|
2021-10-06 01:53:59 +00:00 |
|
Treeco
|
fa2486b3d6
|
Various map UI fixes for large worlds
changes `zoom` such that 1.0 means 1 Conrod unit = 1 chunk, rather than 1.0 meaning fully zoomed out
|
2021-10-06 02:26:58 +01:00 |
|