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
13,840 Commits 151 Branches 18 Tags 2.1 GiB
8b835a91d0
Commit Graph

13840 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BigKhan
811061062a Change Other Players to Players 2023-05-02 13:45:19 -04:00
Imbris
d29a1ec052 Switch back to 100 attempts for each site, optimization of 
find_site_loc, and fix pre-existing bugs.

* In two spots, there were suspicious conversions between chunk positions
  / world positions that I removed. Everything, here should just be in
  chunk positions afaict!
* Optimized by skipping further checks if `in_suitable_loc` is false
  (main optimization (10x speedup for desert city site location finding
  attempts)) as well as only computing `in_suitable_loc` once (minor
  optimization).
 2023-05-02 06:12:33 -04:00
Imbris
ddf9e0eaab Address review on !3888 2023-05-01 21:01:50 -04:00
Joshua Barretto
6fbd007cea Non-humanoid rtsim respawning, made monsters wander 2023-05-01 21:48:33 +01:00
Joshua Barretto
0f92f38967 Started adding wandering rtsim monsters 2023-05-01 18:29:32 +01:00
Joshua Barretto
37f7a0331f Merge branch 'zesterer/rtsim-tweaks' into 'master' 
Made NPC sentiment slightly more forgiving

See merge request veloren/veloren!3907
 2023-05-01 12:16:28 +00:00
Joshua Barretto
ba8984e1a7 Made NPC sentiment slightly more forgiving 2023-05-01 12:16:40 +01:00
Justin Shipsey
7643147dc2 Merge branch 'DaforLynx/music-update' into 'master' 
Small music update

See merge request veloren/veloren!3903
 2023-04-29 05:34:28 +00:00
DaforLynx
7bf6df5ec1 Small music update 2023-04-29 05:34:28 +00:00
Marcel
0b9181ef56 Merge branch 'Terraaaagd/update-es_LA' into 'master' 
Terraaaagd/update Spanish Latino translation

See merge request veloren/veloren!3878
 2023-04-27 21:16:11 +00:00
Marcel
142202449e Merge branch 'xMAC94x/update_deps' into 'master' 
update deps which no longer work in the future of rust

See merge request veloren/veloren!3902
 2023-04-27 20:06:33 +00:00
Marcel
88b26e8db8 Merge branch 'tygyh/Update-swedish-translations' into 'master' 
Update swedish translations

See merge request veloren/veloren!3858
 2023-04-27 19:38:28 +00:00
Jonathan Berglin
d5a8829cfd Update swedish translations 2023-04-27 19:38:28 +00:00
Marcel Märtens
f58feb0c23 update deps which no longer work in the future of rust 2023-04-27 21:11:45 +02:00
Marcel
53746e5a2c Merge branch 'AMAIOLAMO/update-zh_CN' into 'master' 
Amaiolamo/update zh_CN translation

See merge request veloren/veloren!3880
 2023-04-27 10:24:30 +00:00
Marcel
bd2e211cbd Merge branch 'walpo/update_es_es_translation' into 'master' 
Update the Spanish (Castilian) translation

See merge request veloren/veloren!3896
 2023-04-25 17:26:27 +00:00
walpo
ba70f72fb7 Update the Spanish (Castilian) translation 2023-04-25 17:26:27 +00:00
Isse
f5f6edca5c Merge branch 'isse/fix-no-exp-no-drop' into 'master' 
Fix items not dropping when no exp is given.

See merge request veloren/veloren!3899
 2023-04-25 15:58:24 +00:00
Isse
3d3a6eab2b Fix items not dropping when no exp is given. 2023-04-25 11:33:44 +02:00
Imbris
4becb2c616 Refactor iteration over cardinals for bridges to explicitly check for the cardinal direction instead of using specific indices, performance seems roughly the same. 2023-04-25 01:10:34 -04:00
Imbris
29f0f0d83f Rename cheapest_score for clarity and add documentation to fields of NodeEntry 2023-04-24 22:43:40 -04:00
Isse
4d79c89a0c Merge branch 'floppy_multiloot' into 'master' 
Add multiloot

See merge request veloren/veloren!3839
 2023-04-23 19:17:40 +00:00
Isse
ab4076518f Add multiloot 2023-04-23 19:17:39 +00:00
Imbris
1a287e4e89 Merge branch 'imbris/docs-index' into 'master' 
Generate index page for documentation using unstable flag

See merge request veloren/veloren!3895
 2023-04-23 17:35:28 +00:00
Imbris
fa7b6a1746 Merge branch 'imbris/3883-todo' into 'master' 
Apply TODO from !3883 and a few other refactors

See merge request veloren/veloren!3893
 2023-04-23 00:28:17 +00:00
Joshua Yanovski
2c4cbf1404 Merge branch 'pegasus4903/fix_french_errors' into 'master' 
Fix french errors

See merge request veloren/veloren!3894
 2023-04-22 19:17:05 +00:00
pegasus4903
534454cf05 Fix french errors 2023-04-22 19:17:05 +00:00
Imbris
8da8b56308 Generate index page for documentation using unstable flag 2023-04-22 14:16:34 -04:00
Imbris
362bd129c2 Merge branch 'ubruntu/mount_overhead_tweak' into 'master' 
Hide display name of mount while mounted (at full hp)

See merge request veloren/veloren!3892
 2023-04-22 18:13:14 +00:00
ubruntu
b53bfd4246 Hide display name of mount while mounted (at full hp) 2023-04-22 18:13:13 +00:00
Imbris
cd02b3a172 Apply TODO from !3883 and refactor to avoid collect in Inventory::damage_items, also reduce to iterating over the hashmap once when culling the recently unequipped items list 2023-04-22 11:37:52 -04:00
Imbris
87f042eb45 Lower max attempts for site placement to 15 from 100, to save time in the case of sites that can't easily be placed 2023-04-22 00:13:51 -04:00
Imbris
d18100c87a Add a max cost parameter to the astar algorithm so that it will terminate as exausted if this limit is reached. This is used to optimize site pathfinding by exiting early from finding a novel path if we know it won't be used. 2023-04-21 23:16:24 -04:00
Imbris
ed94c1c1b6 Fix existing bug with all site route costs be computed as 0 2023-04-20 22:22:21 -04:00
Imbris
c0db1310be Fix bug 2023-04-20 21:53:59 -04:00
Imbris
c82e6cfc77 Cleanup, fmt, appease clippy 2023-04-20 21:53:59 -04:00
Imbris
c6f5e8dac2 Add more profiling spans to Server startup related things in order to 
visualize where time is being spent. Make `Lod::from_world` use the same
rayon pool as other things during the server startup. Move parallel
iteration up out of structure_gen.par_iter in order to slightly optimize
Lod::from_world (saves a few hundred milliseconds on my machine)
 2023-04-20 21:53:59 -04:00
Imbris
92a42ced18 Apply experimental astar2 changes to the original impl 2023-04-20 21:53:59 -04:00
Imbris
d1ca47da41 Remove astar node clustering related code 2023-04-20 21:53:59 -04:00
Imbris
81885fe8e5 Additional optimizations (such as avoiding calling find_path when we know we won't use the result or that it will fail), cleanup of excess notes and commented code, probably other misc optimizations 2023-04-20 21:53:59 -04:00
Imbris
1f5ebbd100 mess (server startup time related experimentation, in particular with 
pathfinding between sites)
 2023-04-20 21:53:59 -04:00
Imbris
ed4643e80b Add profiling spans for Server::new and World::generate 2023-04-20 21:53:59 -04:00
Samuel Keiffer
4b6c5f57e3 Merge branch 'sam/track-unequipped-items' into 'master' 
Recently unequipped items are now tracked and durability loss on death is applied to them

See merge request veloren/veloren!3883
 2023-04-19 23:23:04 +00:00
Sam
4f991190d3 Removed 3rd to_owned call 2023-04-19 18:43:43 -04:00
Sam
e819cd2309 Updated hashbrown, removed some to_owned calls in handling recently unequipped items 2023-04-19 18:43:40 -04:00
Sam
63bf8f3ac7 Responded to review comments and fixed tests 2023-04-19 18:34:17 -04:00
Sam
7fdfc0e71b Addressed review 2023-04-19 18:34:17 -04:00
Sam
d0a902d918 Being attacked now cancels all active trades. 2023-04-19 18:34:16 -04:00
Sam
c1a64e1d69 Recently unequipped items are now tracked and durability loss on death is applied to them 2023-04-19 18:34:16 -04:00
Isse
77785faeec Merge branch 'isse/shader-fixes' into 'master' 
Two small shader fixes

See merge request veloren/veloren!3889
 2023-04-19 21:37:03 +00:00