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,058 Commits 151 Branches 18 Tags 2.1 GiB
045621993a
Commit Graph

10058 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Yanovski
045621993a Merge branch 'imbris/opt-character-behavior' into 'master' 
NaNs!!!

See merge request veloren/veloren!2930
 2021-10-15 17:46:23 +00:00
Imbris
f61d742d29 Fix NaNs 2021-10-15 13:17:13 -04:00
Imbris
76ad9f8f88 Merge branch 'imbris/opt-character-behavior' into 'master' 
Add test for Ori::angle_between

See merge request veloren/veloren!2927
 2021-10-15 16:51:37 +00:00
Samuel Keiffer
f2d921c6b8 Merge branch 'MHK/Tiny_fixe_in_settlement_generation' into 'master' 
Deleting extra grasses on the air

See merge request veloren/veloren!2928
 2021-10-15 16:40:26 +00:00
Imbris
e67c688c11 Add test for Ori::angle_between 2021-10-15 12:02:53 -04:00
Joshua Yanovski
a8fada63bc Merge branch 'imbris/opt-character-behavior' into 'master' 
Optimize parts of the character behavior system

See merge request veloren/veloren!2924
 2021-10-15 15:55:04 +00:00
MohammadHasanKargar
c82b3859e0 Deleting extra grasses on the air 2021-10-15 19:09:36 +03:30
Imbris
c412a96d6a Fix issue with angle between going over PI and remove faulty test (angle between Quaternions isn't equivalent to the angle between Dir vectors since Quaternions involve rolling as well) 2021-10-15 03:20:40 -04:00
Imbris
aa1ffa9f61 Remove timings and commented code (separate from the previous commit so we can keep these notes in the git history), add potentially better version of the straight up/down case for to_horizontal as a comment for testing in the future, remove fine grained spans 2021-10-15 01:38:56 -04:00
Imbris
b0bd8cdb45 Improve Ori impl of From<Dir> and Ori::to_horizontal by avoiding acos/asin calls by constructing the quaternions in a more direct fashion 2021-10-15 01:23:00 -04:00
Imbris
252b5af96f Add alias for running the server with tracy with the releasedebuginfo profile, this is potentially useful for some of Tracy's source view features 2021-10-15 01:23:00 -04:00
Imbris
457ed6ac64 Remove per entity VecDeque's of events from character StateUpdate and instead pass in external Vecs that can be pushed to (saves significant time not allocating for VecDeque::new) 2021-10-15 01:23:00 -04:00
Imbris
43e743c2bc Rewrite Ori::to_horizontal to reduce redundant normalization and directly calculate the needed yaw instead of using the more general Ori::from(dir), fix bugs in Ori::from(dir) and optimize the up/down case, add tests for Ori::to_horizontal and Ori::angle_between 2021-10-15 01:23:00 -04:00
Imbris
d515b42eac Improve efficiency of states::utils::handle_orientation by reducing the conversions between Ori/Dir less frequent and optimizing the conversion of Dir -> Ori, also added a method to compute the angle between two Ori so that they don't need to be converted to Dir 2021-10-15 01:23:00 -04:00
Imbris
d0cc636402 Add more profiling outputs to the .gitignore 2021-10-15 01:23:00 -04:00
Joshua Barretto
df64cc9494 Merge branch 'kaedr/pretty_printing_error_messages' into 'master' 
Kaedr/pretty printing error messages

See merge request veloren/veloren!2923
 2021-10-14 18:37:52 +00:00
Henry Corse
e01ce2dcf4 Kaedr/pretty printing error messages 2021-10-14 18:37:51 +00:00
Samuel Keiffer
67616d2db0 Merge branch 'sam/cultist-shift' into 'master' 
Squashed tiers a little

See merge request veloren/veloren!2922
 2021-10-13 17:47:24 +00:00
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
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
Joshua Barretto
4be50b8c56 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