gitlab.com/veloren/veloren commits | Ecosyste.ms: OpenCollective

Add stub implementation in RtSim

79e5a209605aadc00b79aa9e91f52b0ad61c0e5a authored almost 3 years ago by juliancoffee <[email protected]>

Smol RtSim refactor

- Remove traveler branch from adhoc_loadout
- Rename RtSimEntityKind::Random to RtSimEntityKind:...

ffac9f1b9cb6aa11c5dd2e787155687c8ebefad4 authored almost 3 years ago by juliancoffee <[email protected]>

Merge branch 'crow/town-song' into 'master'

added night town song (Warmth of the Hearth)

See merge request veloren/veloren!3184

d713083dfe5bd4f675d74a16e37ca3394c789723 authored almost 3 years ago by Joshua Barretto <[email protected]>

added night town song

969f74422341448e6eabfc5f6f7a57c246e90232 authored almost 3 years ago by Crow <[email protected]>

Merge branch 'protheory8/change-gameserver-addr-to-be-an-array-of-tuples' into 'master'

Remove gameserver_address setting and add protocols_and_addresses setting

See merge request vel...

6ea205fcc012a678061d4acd1ceef2f05b2a08cf authored almost 3 years ago by Marcel <[email protected]>

- add generate_gnarling and generate_town in namegen.rs

- enable generate_town for site2 towns in site2/mod.rs

422be1b451147030119172e0bb8bb3bc235e7ed4 authored almost 3 years ago by floppy <[email protected]>

clean up socket2 networkwork code to do more on the socket2 before convertig it.

97a58f0e146b5a56937a7fedc1fcccdfc56535e6 authored almost 3 years ago by Marcel Märtens <[email protected]>

Remove quic_files server setting

(cherry picked from commit 38339d90ceb87008bbb0ce31ad4e28350213a401)

714873725281eedcfcea81122036a062b87077e5 authored almost 3 years ago by protheory8 <[email protected]>

deactivate tests in CI, as they have often no IPv6 configured and would fail in that case

2528afafdde9c9d14feb7f2630d04a1f0999d7af authored almost 3 years ago by Marcel Märtens <[email protected]>

In case of IPv6 and NON Windows make sure to not listen on dualstack,

for that we need to create a socket2 socket and set_only_v6 to true.
We need to privude set_nonbl...

dcfde616d02eb0417acac75fcef5fa43524bf372 authored almost 3 years ago by Marcel Märtens <[email protected]>

adjust tracing and remove unused coding

7ba45fa7e5f380b5915964b0203b91a0b83f4e4d authored almost 3 years ago by Marcel Märtens <[email protected]>

Add a test for the new gameserver IPv6 IPv4 behavior

e9bee485ae74ed17468abad6a91f2fa8ff1dc61d authored almost 3 years ago by Marcel Märtens <[email protected]>

Remove gameserver_address setting and add protocols_and_addresses setting

(cherry picked from commit a5e4575ad349aacb1f41a7e93e3d5ff9eeafc6ae)

89580eba8c6549ca9ef8082021ae1ec075bec03a authored almost 3 years ago by protheory8 <[email protected]>

tweak generate_danari in namegen.rs

bd862b3dd1da1919cbfde8e73a5efa106735a600 authored almost 3 years ago by floppy <[email protected]>

Merge branch 'chara_selection' into 'master'

New icons in diary general combat section

See merge request veloren/veloren!3176

d785e97ae1897d7bac4c746ecc0967c89c7d7a7d authored almost 3 years ago by Marcel <[email protected]>

New icons in diary general combat section

d26906724c406db593dc536317c8d48f050d9e45 authored almost 3 years ago by Zughy <[email protected]>

-adjust size-threshold for Jungle to fix Jungles not being named.

-set size-threshold for anticipated Swamp sizes

33dae9b3b1e749b41476ed98ab9f178bd2b4afb6 authored almost 3 years ago by floppy <[email protected]>

-adjust size-threshold for Jungle to fix Jungles not being named.

b85a384d38a17ea4e69d5faea5a01dce17328ac3 authored almost 3 years ago by floppy <[email protected]>

-add more biome specific namegen functions

-introduce random choice between engl and custom naming
-add namegen section for site/theme based...

b5dfe74d41ef5c030c3110c47fe1673e2d546eaa authored almost 3 years ago by floppy <[email protected]>

Merge branch 'james/airships-not-ships' into 'master'

Restrict RtSim ships to airships

See merge request veloren/veloren!3179

b0667f2664a939c52ffe545e15ef7dbf0ce4d212 authored almost 3 years ago by Joshua Barretto <[email protected]>

Restrict RtSim ships to airships

f21e0f31fbe4c5e652beb86ac9b16c493212031d authored almost 3 years ago by James Melkonian <[email protected]>

Merge branch 'christof/econfix' into 'master'

Small economy cleanup

See merge request veloren/veloren!3164

19c764dde6fdad1dfceadb0ac6cb5b5a4fd39c80 authored almost 3 years ago by Dominik Broński <[email protected]>

Merge branch 'crafting_stations_in_site2_towns' into 'master'

add crafting stations to workshop in site2 towns

See merge request veloren/veloren!3174

ac13d074435071cc1367bcdd3879d7d108611ba7 authored almost 3 years ago by Joshua Barretto <[email protected]>

use const CARDINALS to generate spawn positions for crafting_stations.

74bf89077f0739cda13b9032d2f87d873d72f4f8 authored almost 3 years ago by floppy <[email protected]>

Merge branch 'juliancoffee/fix_husks' into 'master'

Add weapons to Husk loadout

See merge request veloren/veloren!3177

924dd2993cebc2ac9ac9224aa93e1a2d72f0fd3a authored almost 3 years ago by Samuel Keiffer <[email protected]>

Add weapons to Husk loadout

0682bfbe148b15fa6ab052f4d1ce01cb4033ee3b authored almost 3 years ago by juliancoffee <[email protected]>

- randomize distribution of crafting_stations to static positions

595e6ee0768de6ddf2064d501f2704197a0c9e4f authored almost 3 years ago by floppy <[email protected]>

Merge branch 'command_access' into 'master'

Removal of /home

See merge request veloren/veloren!3171

afda04e1eb38ee343ce781e645834717fdaf99b0 authored almost 3 years ago by Marcel <[email protected]>

Removal of /home

fdfd2c99ff2d707ff5c219480be06b51334a4379 authored almost 3 years ago by Youssef Fahmy <[email protected]>

Merge branch 'infrandomness/site2/add_giant_trees' into 'master'

Implement giant trees in site2

See merge request veloren/veloren!3136

f6510dfab0c9bc64d394301bd041633a8906df4e authored almost 3 years ago by Justin Shipsey <[email protected]>

Implement giant trees in site2

54b69e37a5d2f2c9ad70dc4c69cb67f743dc3a91 authored almost 3 years ago by InfRandomness <[email protected]>

- add crafting stations to workshop in site2 towns

- TODO: connect Painter rng when implemented

ddc35d8b7d6f2893f96029a644fbed3e3f59610f authored almost 3 years ago by floppy <[email protected]>

Merge branch 'imbris/srgb-dither' into 'master'

Dither in nonlinear srgb space and dithering related experimental shader options

See merge requ...

18f6077321257c35c11820d22eea4bbbf73256a8 authored almost 3 years ago by Imbris <[email protected]>

Merge branch 'james/site2-util' into 'master'

More CSG primitives

See merge request veloren/veloren!3154

0ceef00b40f810cf5683bf653ba328767cb0c802 authored almost 3 years ago by Joshua Barretto <[email protected]>

Add doc comments to PrimitiveRef methods

2aab277d0b36322db89ab6f122dde2ead283a485 authored almost 3 years ago by James Melkonian <[email protected]>

Merge branch 'determanistic-naming' into 'master'

Fix biome naming

See merge request veloren/veloren!3173

fb7433a5cfd8fcf587d465352a449f0103a6b821 authored almost 3 years ago by Joshua Barretto <[email protected]>

Use DHashMap

0f7f0ace93471160efabc08621ebabb56a3e21c8 authored almost 3 years ago by IsseW <[email protected]>

More CSG primitives

b41f86ab9995734306c87db281ca400fdf4de48b authored almost 3 years ago by James Melkonian <[email protected]>

Add cubic bezier curve function

04bdcf292412de8099654f245453312b7b3e2f4b authored almost 3 years ago by James Melkonian <[email protected]>

Bezier curve prisms

b445bd494e104194f20641037bb83cddeb5ba540 authored almost 3 years ago by James Melkonian <[email protected]>

Use DHashSet

0ba4a3a409f6577de966f02cacf6d6d5c2e0fda2 authored almost 3 years ago by IsseW <[email protected]>

clippy is right,

but I don't want to rearrange print_sorted (test). so reduce overall strictness

42faef9ab0be12846965e3cc290402328f76123f authored almost 3 years ago by Christof Petig <[email protected]>

juliancoffee prefers this style

080444fc8bd153efab0569d6c2679518a9d56bce authored almost 3 years ago by Christof Petig <[email protected]>

more stable sorting

f4f1b5c77bc45100b2853190a9f308294e4cbc2e authored almost 3 years ago by Christof Petig <[email protected]>

fix multiple calls of init

dc92d0ab12f934bf6413e84c70ae7069d64a862a authored almost 3 years ago by Christof Petig <[email protected]>

create a nice csv table for comparison

d8edd70837d1113eba147a1e31816a2bbc3fd11b authored almost 3 years ago by Christof Petig <[email protected]>

clean up double rescaling

47aba3e4cd461cbfef8ecb6c925df1813eb8f2ee authored almost 3 years ago by Christof Petig <[email protected]>

fix some test cases

12fedef98ff6c03b1ab1b219ac89628209129402 authored almost 3 years ago by Christof Petig <[email protected]>

separate amount from probability

6b9180bba65161fd7a75eba03867b9199636d399 authored almost 3 years ago by Christof Petig <[email protected]>

fix code quality

8230323a765730b6a7644278ca9c30f8800eb70b authored almost 3 years ago by Christof Petig <[email protected]>

Add test cases

45ba21796cfb92f7c024efd94b30de8914a65cb5 authored almost 3 years ago by juliancoffee <[email protected]>

cargo fmt

66c431ba86ea2b91abb0e05eed6c549f132f8c56 authored almost 3 years ago by Christof Petig <[email protected]>

load loot table only once, add utility function and test cases

8228437b22436810c36e8cf03950b076b0a28355 authored almost 3 years ago by Christof Petig <[email protected]>

normalize loot tables before combining them, take current values for a start

a98b9ad0490347af883f35567f4d20390b1c9e16 authored almost 3 years ago by Christof Petig <[email protected]>

Merge branch 'slipped/bipeds' into 'master'

Slipped/bipeds

See merge request veloren/veloren!3163

612f084831930a39acfcb6421e2e143d997c985b authored almost 3 years ago by Justin Shipsey <[email protected]>

Merge branch 'imbris/fix-shoot-ori' into 'master'

Use ori as fallback for look_dir so that other entities will turn properly

See merge request ve...

201a7485c29e3be577c7387fe08caca31fe51647 authored almost 3 years ago by Imbris <[email protected]>

Use ori as fallback for look_dir so that other entities will turn properly when shooting (controller component is not synced)

2325ac3d785cc9afdf769550c0065549e95d19cf authored almost 3 years ago by Imbris <[email protected]>

Merge branch 'sam/particle-fix' into 'master'

Fixed lifesteal particles

See merge request veloren/veloren!3169

a37d221f6b51c0145aacb250244fa8b516356c46 authored almost 3 years ago by Samuel Keiffer <[email protected]>

Extend green

097d6cf07c2a6ce10e97a37b28c2a665e87009bf authored almost 3 years ago by Sam <[email protected]>

More tweaking

0c44a7d1abbc7a140c35a6cb0f89ddec05b76720 authored almost 3 years ago by Sam <[email protected]>

Merge branch 'treeco/realign-workshop' into 'master'

Realign workshops

See merge request veloren/veloren!3168

1b9488186e4e029de0f99d536f4159b3910958db authored almost 3 years ago by Joshua Barretto <[email protected]>

Fixed lifesteal particles

bfa9c1ce3a01b27898ae83b74fc204cd5fc887f8 authored almost 3 years ago by Sam <[email protected]>

Merge branch 'aweinstock/resolve-clippy-lints' into 'master'

Globally allow more clippy lints and reconfigure complexity to be less verbose

See merge reques...

72e270368dd16efc9ea9d6ba5e32d7449d473e6e authored almost 3 years ago by Marcel <[email protected]>

Realign workshops

ba7251c7e359ccdbc276f7d786560af6939a7d83 authored almost 3 years ago by Treeco <[email protected]>

Merge branch 'james/guard-menacing' into 'master'

Fix guards menacing instead of defending villagers

See merge request veloren/veloren!3166

a41a7663563a6259bf7f7607b525609cba04fa7d authored almost 3 years ago by Marcel <[email protected]>

Fix guards menacing instead of defending villagers

44865d99ff665cac28b9d38a882a460b6245db50 authored almost 3 years ago by James Melkonian <[email protected]>

Merge branch 'tygyh/Simplify-parameters' into 'master'

Tygyh/simplify parameters

See merge request veloren/veloren!3053

12f00696bad7a6d4a212eceb948ee8a011ba8fd1 authored almost 3 years ago by Marcel <[email protected]>

stricten some rules and fix some clippy warnings

201a5ac2c707878ccde55e22414c563fefb75073 authored almost 3 years ago by Marcel Märtens <[email protected]>

Decrease too-many-arguments-threshold and type-complexity-threshold.

f3f08936d87c00c469a897bcc6fd216fdfa6e06c authored almost 3 years ago by Avi Weinstock <[email protected]>

Globally allow the clippy lints `{new_without_default, many_single_char_names, identity_op, type_complexity, too_many_arguments}`.

5f8957d8ef62ded2d4796c6d845375368e2dee31 authored almost 3 years ago by Avi Weinstock <[email protected]>

Create 'ColliderData' struct and implement it in 'resolve_e2e_collision' function

7b5d9508b6f987ba3470ff8eeeb35c5eee40cdb5 authored almost 3 years ago by Dr. Dystopia <[email protected]>

Merge branch 'fix-ghost-item' into 'master'

Fix ghost item when trade gets declined

Closes #1429

See merge request veloren/veloren!3117

21cad1227294b78b23e8c7567a8bd523c0750f6b authored almost 3 years ago by Imbris <[email protected]>

myrmidon fix

7cac4b4001b08bf1f1d19d383d753a55f2749ec5 authored almost 3 years ago by jshipsey <[email protected]>

weapon tweaks

7827797106b73cedbf95cb8a4897cf6f42f3e974 authored almost 3 years ago by jshipsey <[email protected]>

Merge branch 'swilliams/entity-drops-csv-names' into 'master'

Changed entity drops csv export to export names instead of asset paths

See merge request velore...

3120a64be27722fce0e91913bc120083c0fa826f authored almost 3 years ago by Marcel <[email protected]>

Changed entity drops csv export to export names instead of asset paths

21fd2964073c0204c21fb1ea6a700df65af9bb2f authored almost 3 years ago by Scott Williams <[email protected]>

Dither in nonlinear srgb space and add a few dithering related things to the experimental shader options

89edd1878791a77256e170a79c7cf9ecc9f649d8 authored almost 3 years ago by Imbris <[email protected]>

Merge branch 'isse/repeat-primitive' into 'master'

Repeat CSG primitive and float line segment

See merge request veloren/veloren!3158

fe532cf536e8db18e6d8aaf36f3cb66d887cf722 authored almost 3 years ago by Samuel Keiffer <[email protected]>

Repeat CSG primitive and float line segment

6f99e70ccaee37a4c3e01e97febc07fa7f685007 authored almost 3 years ago by Isidor Nielsen <[email protected]>

Merge branch 'zesterer/worldgen' into 'master'

Improvements to site2

See merge request veloren/veloren!3159

d8c4284a323621ccc33966f18783ff88b8199f97 authored almost 3 years ago by Joshua Barretto <[email protected]>

Better paths in snow

15c5f2f9698cfe44077e7418bce19556ef8ec2bb authored almost 3 years ago by Joshua Barretto <[email protected]>

Better hazard checks

5b3d826396b7dc2a6137da0b78981a7be85279d7 authored almost 3 years ago by Joshua Barretto <[email protected]>

Merge branch 'fix-dungeon-collision' into 'master'

Fix dungeon collision

See merge request veloren/veloren!3131

cb45cea6a07bd5fc23677dbe658115b69d6b0dec authored almost 3 years ago by Joshua Barretto <[email protected]>

Added wall lamps

69436db64ca6794aa5a8968a290150281ab600c8 authored almost 3 years ago by Joshua Barretto <[email protected]>

Fix dungeon collision

9822abf9ba7759a97690e0887d8437cde985ea41 authored almost 3 years ago by threadexception <[email protected]>

More precise path placement

e991ff7d6d68cd12762788876bb7e6c5261e663a authored almost 3 years ago by Joshua Barretto <[email protected]>

new mobs

4fbd3027a1555494633adf05b5c60b078c353049 authored almost 3 years ago by jshipsey <[email protected]>

Merge branch 'juliancoffee/extended_loadout_config' into 'master'

Refactor loadout creation for Npc

See merge request veloren/veloren!3129

e53d1dde0925edac939e24f35a10e8ba07631489 authored almost 3 years ago by Imbris <[email protected]>

Fix doc-tests

fa724ec2e27404e9fca4964fbdc243aa9afe3827 authored almost 3 years ago by juliancoffee <[email protected]>

Fix rebase

9a2fde557c4dc5303b45736df60207c2bad92b88 authored almost 3 years ago by juliancoffee <[email protected]>

Require rng from EntityInfo::with_asset_expect

6ae25d59561cba281d767beb1cd406279022aa7b authored almost 3 years ago by juliancoffee <[email protected]>

Adress review №2

ed593cd0cbb3c80b161a1ec9311c7b884d5d6e2c authored almost 3 years ago by juliancoffee <[email protected]>

Adress review

e004fba9dad3b6dff8c85b97762782b9c883122c authored almost 3 years ago by juliancoffee <[email protected]>

Loadout Udpate: NpcData part

Actually implement creating npc with new EntitytInfo by chaning
CreateNpc.loadout to CreateNpc.i...

d5b927602a94f4a20116aa1eab44e8dfbfb20bb7 authored almost 3 years ago by juliancoffee <[email protected]>

Loadout Update: Managed Rng

Rewrite EntityInfo api to take Rng from caller.

4a4f2f8d8f37c4a4fc9f488726fada9dfbc81c57 authored almost 3 years ago by juliancoffee <[email protected]>

Loadout Update: Use

Delete guard and villager lazy_loadout and use LoadoutKind::Extended
with potions instead

5a370cb6f789e0ddb94657bd993af96838cb844d authored almost 3 years ago by juliancoffee <[email protected]>

Add entity config migration tool

765311add0ac3ece748916320163c79f5262bf1b authored almost 3 years ago by juliancoffee <[email protected]>

Loadout Update. EntityInfo part

EntityConfig changes:
+ Add LoadoutKind instead of Hands + Meta::LoadoutAsset.
+ Allows for rand...

fbe07f016a54f857a759f500e6c5669cee702d4c authored almost 3 years ago by juliancoffee <[email protected]>

Migrate EntityConfig for Loadout update

7585c8dcc10feaaa81c59b397f201e7ef2bfdd1a authored almost 3 years ago by juliancoffee <[email protected]>

remove outdated comment

e1bfa6c7e2c1c8113ac9b28e06385cc3c3c41151 authored almost 3 years ago by juliancoffee <[email protected]>