Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,206 Commits 151 Branches 18 Tags 2.1 GiB
a5e64af199
Commit Graph

10206 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Joshua Barretto
6ed434d98a Nicer lake borders 2021-10-10 13:41:57 +01:00
Joshua Barretto
2ba40b53bb Added ability to toggle world features 2021-10-10 13:41:57 +01:00
Joshua Barretto
aebe4b8a6d Added radial pattern to shrooms 2021-10-10 13:41:57 +01:00
Joshua Barretto
9aa8dae23d Added noise to blocks 2021-10-10 13:41:57 +01:00
Joshua Barretto
2f5833a004 Better vines and lighting 2021-10-10 13:41:57 +01:00
Joshua Barretto
d4106146b3 Prevented shrooms spawning in water 2021-10-10 13:41:57 +01:00
Joshua Barretto
8441d416e3 Better grass and lily distribution 2021-10-10 13:41:57 +01:00
Joshua Barretto
4ca4e0c16a Added new cavern sprites to caverns 2021-10-10 13:41:57 +01:00
Joshua Barretto
330c970833 Better moss 2021-10-10 13:41:57 +01:00
Monty Marz
265db2ba7f cavern sprites 2021-10-10 13:41:56 +01:00
Joshua Barretto
930cbb1647 More mushroom sprites 2021-10-10 13:41:56 +01:00
Joshua Barretto
39b2674945 Added vines 2021-10-10 13:41:56 +01:00
Joshua Barretto
91df91c3df Added mushroom inner bevel 2021-10-10 13:41:56 +01:00
Joshua Barretto
b12494d72b More cavern details 2021-10-10 13:41:56 +01:00
Joshua Barretto
584504907a Better cave water 2021-10-10 13:41:56 +01:00
Joshua Barretto
57e641c67a Silly GI for water in caves 2021-10-10 13:41:56 +01:00
Joshua Barretto
7453368595 Performance improvements for terrain watcher 2021-10-10 13:41:56 +01:00
Joshua Barretto
6e76fddc44 Added caverns, fixed chunk load performance issue 2021-10-10 13:41:56 +01:00
Joshua Barretto
d831e16008 Fixed clouds and fluids underground 2021-10-10 13:41:56 +01: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