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,033 Commits 151 Branches 18 Tags
Commit Graph

3246 Commits

Author SHA1 Message Date
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
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
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
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
Sam
e794758dad Csv export entity drops tool now has ability to export all entities at once. 2021-10-07 20:28:18 -04:00
Treeco
7fefaaaf7b Added mottled bark to birch 2021-10-06 02:26:43 +01:00
Samuel Keiffer
10cadcd014 Merge branch 'sam/wiki-loot' into 'master' 
Created csv export tool to get all item drops from an entity

See merge request veloren/veloren!2892
 2021-10-05 15:45:22 +00:00
Sam
8785ecfdeb Now outputs item names instead of item asset paths. 2021-10-04 21:46:19 -04:00
ubruntu
e80079ed99 Interactable campfires 2021-10-05 00:55:29 +00:00
Joshua Barretto
6af866ce50 Rebalanced boat speed 2021-10-05 00:02:03 +01:00
Joshua Barretto
28459ae27d Fixed sail boat thrust, removed dead water code, added comments 2021-10-05 00:02:03 +01:00
Joshua Barretto
631d8c6603 Cleaned up shrub implementation 2021-10-05 00:02:03 +01:00
Joshua Barretto
24a3ed683d Improved river and lake banks 2021-10-05 00:02:03 +01:00
Joshua Barretto
bdd04e221b Better lake entrances and distance 2021-10-05 00:02:03 +01:00
Joshua Barretto
b3fbba6df2 Fixed oceans 2021-10-05 00:02:03 +01:00
Joshua Barretto
4e427a5b9f Improved river/lake rendering 2021-10-05 00:02:03 +01:00
Joshua Barretto
59c8ee3c70 Added sail boat 2021-10-05 00:02:03 +01:00
Imbris
dee4f787b9 Improve the warning message when USERDATA_STRATEGY was not set during compilation and the binary was moved outside the workspace/crate that it was compiled from, show a warning when an invalid VELOREN_USERDATA_STRATEGY is used, and also actually make sure warnings from userdata selection are logged in voxygen (since the userdata folder needs to be selected to set up logging we have to rerun the selection after logging is set up so that any warnings will be logged). 2021-10-04 12:23:42 -04:00
Sam
35cb46738d Created csv export tool to get all item drops from an entity 2021-10-02 12:08:40 -04:00
Benoît du Garreau
dda54e6ee2 Update assets_manager to 0.6.0 2021-10-01 21:13:01 +02:00
Samuel Keiffer
984ea6008d Merge branch 'sam/loot' into 'master' 
Refactored loot table selection on entity death

See merge request veloren/veloren!2879
 2021-10-01 07:06:10 +00:00
Sylvain Migaud
0cb5551ce2 Place date at the begining of the log file name 2021-09-30 06:09:30 +00:00
juliancoffee
e5d6fd2887 Cleaning 2021-09-27 23:21:57 +03:00
juliancoffee
7df22ceaec Make ItemDrop component with Item again 2021-09-27 20:36:18 +03:00
juliancoffee
b423faa32c Fix csv tools for loot tables 2021-09-27 15:09:22 +03:00
juliancoffee
e9e63997e8 Adress review 
- Mention failed loot specifier during getting item from lottery
 2021-09-27 15:09:22 +03:00
juliancoffee
98382ea012 Make Rtsim entity config work 2021-09-27 15:09:22 +03:00
juliancoffee
8f84e00e7e Hardened Loot handling part two 
+ clippy advices
+ use LootSpec::Nothing for basic_summon explicitly
 2021-09-27 15:09:22 +03:00
juliancoffee
b53643e12a Hardened loot table handling 
- Rename LootSpec::None to LootSpec::Nothing to not confuse with Option
- Warn on invalid item paths in loot tables
 2021-09-27 15:09:22 +03:00
Sam
06f3e04034 Changed ItemDrop to use LootSpec 2021-09-27 15:09:22 +03:00
Marcel
64a8e3c5df Merge branch 'xMAC94x/update-toolchain' into 'master' 
update toolchain to `nightly-2021-09-24`

See merge request veloren/veloren!2862
 2021-09-26 19:25:02 +00:00
Samuel Keiffer
d7a89bf944 Merge branch 'sam/cr-weights' into 'master' 
Changed weights of cr calculation and exp from cr formula.

See merge request veloren/veloren!2875
 2021-09-26 18:21:56 +00:00
Sam
14cdb2b803 Changed weights of cr calculation and exp from cr formula. 2021-09-25 21:52:20 -04:00
Sam
d0c78c3d63 Made poise a float at interface of module. 2021-09-25 14:07:47 -04:00
Marcel Märtens
96bd27db62 apply some clippy fixes that comes with the new toolchain version 2021-09-24 23:18:18 +02:00
Marcel Märtens
8c0c86b192 update toolchain to nightly-2021-09-24 2021-09-24 23:18:07 +02:00
Sam
961782851f Changed energy to internally use an integer with a high resolution, and externally to use a float. 2021-09-23 14:11:09 -04:00