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

Cleanup up possession code and add TODOs for issues to fix. Remove

SyncFrom debug_assertions hack.

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

Limit possesse to regions which possessor is subscribed to.

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

Stop using Character presence kind when possessing so that persistence doesn't get messed up.

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

Handle removing/inserting SyncFrom::ClientEntity components properly during possession.

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

Properly handle cleanup of old entity controller during possession on both the client and server sides

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

Merge branch 'bwerf/fix_minimap_marker' into 'master'

Minimap draw order fix

See merge request veloren/veloren!3244

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

Minimap draw order fix

Minimap location marker and player indicator are no longer drawn on top of the main map if they ...

4dae579acad68657652ae37c9e6d6907eda727d7 authored almost 3 years ago by Karl Werf <[email protected]>

Dereference 'tgt_pos' variables

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

Replace 'tgt_data' parameter with 'tgt_pos' parameter

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

Merge branch 'unvariant/center_item_drops' into 'master'

Center item drops

See merge request veloren/veloren!3232

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

removed extra fields from item_drop_manifest.ron

added TODO about applying non-random rotations in load.rs

329051c6df4c2abcacefe859c6c815b49af092a8 authored almost 3 years ago by ninefox <[email protected]>

Merge branch 'imbris/experimental-low-glow' into 'master'

Add experimental shader option that lowers glow strength for lights near the camera

See merge r...

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

Merge branch 'imbris/small-fix' into 'master'

Small fix

See merge request veloren/veloren!3239

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

Small fix

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

Add experimental shader option that lowers glow strength for lights near the camera

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

Extract 'dist_to_pos' variable

75322ddfc06081e6cee9e83be7c47589838e306d authored almost 3 years ago by Dr. Dystopia <[email protected]>

Extract 'dist_to_pos_xy' variable

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

Merge branch 'floppy-fix_SeaCrocodiles_spawning_in_lakes' into 'master'

fix SeaCrocodiles spawning in lakes

See merge request veloren/veloren!3236

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

Extract 'spacing' variable

019d619cf667e120d775092956ca5cc36252918f authored almost 3 years ago by Dr. Dystopia <[email protected]>

Extract 'target_position' clojure

15bea268237b334201f6cabbece47deee237c8e1 authored almost 3 years ago by Dr. Dystopia <[email protected]>

Extract 'pos' variable

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

Update 'path_toward_target' doc comment

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

Extract 'distance_to_target' variable

4aebe19d946ceaf128ae9ed039c4caa1311f405b authored almost 3 years ago by Dr. Dystopia <[email protected]>

Replace flag parameters with 'Path' enum

0dad86e1ca984236be0b9a6c2eb3567d89b6339b authored almost 3 years ago by Dr. Dystopia <[email protected]>

fix SeaCrocodiles spawning in lakes

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

Applied review suggestions

5aa98b7b3ec5739bcb53e853087fb5b1164d61b9 authored almost 3 years ago by ninefox <[email protected]>

add code to center item drops

reduce size of coins

61913402a21b634e60111aed1ac89512b5a186e6 authored almost 3 years ago by ninefox <[email protected]>

Merge branch 'sam/slash-nerf' into 'master'

Nerf to Slashing Damage

See merge request veloren/veloren!3230

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

Nerf

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

Merge branch 'better-town-placement' into 'master'

Better town placement

See merge request veloren/veloren!3208

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

Prevent castles being assailable from above.

5df1ee6382f43e3566871b7565ff7efa07145101 authored almost 3 years ago by Tormod G. Hellen <[email protected]>

Prevent close settlements.

b6b67d367a223ddb3ed2197f940e605d292ffec4 authored almost 3 years ago by Tormod G. Hellen <[email protected]>

Prevent trees being placed in barren regions.

609b26ce201a6f770c1dfe75c2ded01821480d17 authored almost 3 years ago by Tormod G. Hellen <[email protected]>

Refactor for clarity.

This code was a bit hard to read. The name ought to make it easier.

339d6f2a3baa59975a4729182988eaa262e26670 authored almost 3 years ago by Tormod G. Hellen <[email protected]>

Add more water checks.

Not sure if necessary or just paranoia.

1ae93ee00ee97b8e2f00d92b1f93c7b0094d2221 authored almost 3 years ago by Tormod G. Hellen <[email protected]>

Ensure towns are placed only in viable locations.

22a75332f823be15c5dfe9bf43e061d277c90496 authored almost 3 years ago by Tormod G. Hellen <[email protected]>

Determine town suitability using log function.

acce8aefa43100a7ebef37c47a0c0381ccd0829f authored almost 3 years ago by Tormod G. Hellen <[email protected]>

Prevent things being close that shouldn't.

a2d24521ee70b962a6f1ccbc472024a7ff832873 authored almost 3 years ago by Tormod G. Hellen <[email protected]>

Merge branch 'ubruntu/pet-campfireheal' into 'master'

Campfire heals pets when owner sits

See merge request veloren/veloren!3229

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

Campfire heals pets when owner sits

6d795b6ecda5b76fad985c54f22ce6b603e1211d authored almost 3 years ago by ubruntu <[email protected]>

Merge branch 'test-server_fix' into 'master'

Fix test-server

See merge request veloren/veloren!3227

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

remove blank line

b0122a6b4642e0562bfb93223fb9cd3b2485378c authored almost 3 years ago by Inojelis <[email protected]>

Fix imports

9bdb7198f52d1b2cae7764fdc3d44ef402ccbb9d authored almost 3 years ago by Inojelis <[email protected]>

Fix run config

13308d009db1ef63fd22c09c89d49e5d44bf2fd5 authored almost 3 years ago by Inojelis <[email protected]>

Fix run config

cdd01655c1298eeb992be7128134c470935a58e6 authored almost 3 years ago by Inojelis <[email protected]>

Fix generate_chunk to also accept Calendar

3e5a220980245c040c092ad67d451efba5d457c0 authored almost 3 years ago by Inojelis <[email protected]>

Merge branch 'isse/workshop-fixes' into 'master'

Workshop fixes

See merge request veloren/veloren!3226

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

break when there are no stations

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

Workshop fixes

258b3c7535a773f0c1e1e95ed5c9670cdd4a35c6 authored almost 3 years ago by IsseW <[email protected]>

Merge branch 'enable_custom_names_for_lakes' into 'master'

enable custom naming bricks for lake biomes

See merge request veloren/veloren!3210

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

Merge branch 'isse/move-marker-changelog' into 'master'

Move changelog

See merge request veloren/veloren!3225

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

Move changelog

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

Merge branch 'spanish_translation' into 'master'

apply changes from MR!2904

See merge request veloren/veloren!3224

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

Merge branch 'zesterer/enable-site2-towns' into 'master'

Enabled site2 towns by default

See merge request veloren/veloren!3206

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

Shared and persistent waypoints

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

Merge branch 'isse/shared-waypoints' into 'master'

Shared and persistent waypoints

See merge request veloren/veloren!3162

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

Merge branch 'imbris/small-fixes' into 'master'

Small bits of code cleanup

See merge request veloren/veloren!3222

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

Merge branch 'imbris/screenshot-mapping' into 'master'

Fix race in screenshot logic

See merge request veloren/veloren!3221

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

apply changes from MR!2904

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

Remove TODO, UidAllocator needed on client to map uid -> entities

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

Remove unwrap in handling of the DeleteServer message in the main menu ui

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

Small cleanup in server-cli/src/main.rs

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

Properly wait to request buffer mapping until after the command to copy the screenshot texture to the buffer has been submitted.

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

Merge branch 'xMAC94x/release-numbers' into 'master'

Change the version number to 0.12

See merge request veloren/veloren!3219

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

Change the version number to 0.12

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

Merge branch 'treeco/remove-settings-button' into 'master'

Removed dead settings button from main menu

See merge request veloren/veloren!3218

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

Removed dead settings button from main menu

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

Merge branch 'xvar/fix-macos-builds' into 'master'

Fixed artifact paths for mac builds

See merge request veloren/veloren!3217

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

Fixed artifact paths for mac builds

bbe8f9db8bbb94d7433a826953aadbad5447c384 authored almost 3 years ago by Ben Wallis <[email protected]>

Fix airship command by splitting out ships

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

Merge branch 'james/fix-boat-drag' into 'master'

Fix airship command by splitting out ships

See merge request veloren/veloren!3216

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

Merge branch 'zesterer/release-map' into 'master'

Added location system, switched to release map

See merge request veloren/veloren!3213

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

Merge branch 'pfau/new_bg' into 'master'

New login-screen bg image

See merge request veloren/veloren!3214

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

New login-screen bg image

9ca1693ef815fa5ab98600e990f26f67721f896c authored almost 3 years ago by Monty Marz <[email protected]>

List locations on empty command

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

Added location system, switched to release map

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

Merge branch 'slipped/spearbug' into 'master'

fix spear bug

See merge request veloren/veloren!3212

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

fix

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

Minor inventory ux improvements

67f2d05d3c07a71f5e684311d2a2c2f6325bed55 authored almost 3 years ago by Isidor Nielsen <[email protected]>

Merge branch 'isse/minor-ux-improvements' into 'master'

Minor inventory ux improvements

Closes #1436

See merge request veloren/veloren!3157

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

Merge branch 'xMAC94x/update_cache_image' into 'master'

update cache image for ci

See merge request veloren/veloren!3203

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

Merge branch 'shouvik/prevent_empty_trades' into 'master'

Fixes #1452 - Prevents empty trades

Closes #1452

See merge request veloren/veloren!3202

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

Fixes #1452 - Prevents empty trades

d72f43190b62ea5e789b5db4216c8eed0ff4f5b9 authored almost 3 years ago by ShouvikGhosh2048 <[email protected]>

Merge branch 'slipped/waterbug' into 'master'

fix wallrun water issue

See merge request veloren/veloren!3209

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

enable custom naming bricks for lake biomes

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

fix

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

Fix ember z fighting, remove ember sway

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

Enabled site2 towns by default

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

Merge branch 'fix_airshipper' into 'master'

undo stage renaming

See merge request veloren/veloren!3205

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

undo stage renaming

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

Fix NPC humanoids not rolling when on fire

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

Merge branch 'james/stop-drop-and-roll' into 'master'

Fix NPC humanoids not rolling when on fire

See merge request veloren/veloren!3204

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

Merge branch 'gnarlings' into 'master'

Gnarlings

See merge request veloren/veloren!3194

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

update cache image for ci, rename linux to linux-x86_64

todo: adjust airshipper before merging this

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

Clippy fixes

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

Automatically fill top-level unions as separate fills.

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

small UI fixes, new haste buff icon

900fff7ba9196c48662fe037e19db683d52c3381 authored almost 3 years ago by Monty Marz <[email protected]>

Merge branch 'xvar/add-mac-m1-ci-job' into 'master'

Added CI support for MacOS M1 builds

See merge request veloren/veloren!3186

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

Removed unions in gnarling site to make chunkgen more performant

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

Fixed CI

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