Imbris
|
c24e017808
|
Merge branch 'imbris/alias-improvements' into 'master'
Adjust tracy server aliases to have a better default and be more consistent...
See merge request veloren/veloren!3422
|
2022-06-04 15:36:25 +00:00 |
|
Imbris
|
a2ac582e82
|
Adjust tracy server aliases to have a better default and be more consistent with the other alias naming
|
2022-06-04 11:26:13 -04:00 |
|
Justin Shipsey
|
ec2b78c533
|
Merge branch 'christof/smoke_variations' into 'master'
Smoke variations
See merge request veloren/veloren!3348
|
2022-06-02 05:21:50 +00:00 |
|
Christof Petig
|
589ceb6d38
|
avoid one allocation, spotted by imbris
|
2022-06-01 22:47:53 +02:00 |
|
Christof Petig
|
3cc88f9b1d
|
move temp and humidity out of array, introduce different smoke types
|
2022-06-01 22:14:23 +02:00 |
|
Christof Petig
|
bf3eef6e1a
|
remove dead use
|
2022-06-01 22:14:23 +02:00 |
|
Christof Petig
|
c35edf0680
|
Add changelog
|
2022-06-01 22:14:20 +02:00 |
|
Christof Petig
|
dd28dc81be
|
humidity + clean up
|
2022-06-01 22:13:35 +02:00 |
|
Christof Petig
|
92ab095480
|
test and fix temperature handling
|
2022-06-01 22:13:35 +02:00 |
|
Christof Petig
|
59d876a654
|
pass humidity to meta, move smoke cycle to separate file
|
2022-06-01 22:13:34 +02:00 |
|
Christof Petig
|
f12f79439f
|
fix negative values for RGB and vary dryness and strength according to biome
|
2022-06-01 22:13:34 +02:00 |
|
Christof Petig
|
827006e7e0
|
vary color, strength based on position, color on biome
|
2022-06-01 22:13:34 +02:00 |
|
Christof Petig
|
6ddedecc05
|
introduce smoke strength and color
|
2022-06-01 22:13:34 +02:00 |
|
Marcel
|
da51e38961
|
Merge branch 'kretka/upd_ru_trans' into 'master'
Update ru_RU
See merge request veloren/veloren!3418
|
2022-05-31 19:12:12 +00:00 |
|
Vlad
|
90d3157656
|
Update ru_RU
|
2022-05-31 18:21:34 +00:00 |
|
Ben Wallis
|
d389f4e29b
|
Merge branch 'xvar/fix-agent-loot-pickup' into 'master'
Fixed animals picking up non-owned non-consumable loot
See merge request veloren/veloren!3417
|
2022-05-31 15:30:57 +00:00 |
|
Ben Wallis
|
d71f2ff682
|
Fixed animals picking up non-owned non-consumable loot
|
2022-05-31 15:57:58 +01:00 |
|
Marcel
|
a3f6b79420
|
Merge branch 'xvar/fix-loot-drop-crash' into 'master'
Added temporary fix to prevent loot drops causing a server crash
See merge request veloren/veloren!3416
|
2022-05-31 13:06:35 +00:00 |
|
Ben Wallis
|
ec1427d669
|
Added temporary fix to prevent loot drops causing a server crash in some (currently unknown) circumstances
|
2022-05-31 13:37:56 +01:00 |
|
Samuel Keiffer
|
d86a3f7ac3
|
Merge branch 'gumgee/disable-chest-explosions' into 'master'
Updated explode_power function to make chests non-explodable
Closes #1541
See merge request veloren/veloren!3404
|
2022-05-31 04:29:55 +00:00 |
|
Maxwell
|
14d5b2e579
|
added all other types of chest sprites to check for non-explodable objects
|
2022-05-30 22:41:57 -05:00 |
|
Maxwell
|
6e3ebb64cd
|
updated changelog to include new changes
|
2022-05-30 22:41:54 -05:00 |
|
Maxwell
|
a8892bab53
|
updated explode_power function to make chests non-explodable
|
2022-05-30 22:40:59 -05:00 |
|
Samuel Keiffer
|
18b95aec23
|
Merge branch 'sam/indirect-armor' into 'master'
Armor stats from set
See merge request veloren/veloren!3411
|
2022-05-31 01:04:38 +00:00 |
|
Sam
|
2de831cf38
|
Converted asset files of other armors.
|
2022-05-30 20:25:33 -04:00 |
|
Sam
|
8b384fd63e
|
Converted asset files of set armors.
|
2022-05-30 20:25:33 -04:00 |
|
Sam
|
5e57eabd11
|
Code changes and msm
|
2022-05-30 20:25:31 -04:00 |
|
Ben Wallis
|
0e39345243
|
Merge branch 'xvar/add-diagnostic-tools-docker' into 'master'
Added iproute2 and net-tools to docker image to facilitate diagnosing network issues
See merge request veloren/veloren!3415
|
2022-05-30 20:19:00 +00:00 |
|
Ben Wallis
|
99a992d985
|
Added iproute2 and net-tools to docker image to facilitate diagnosing network issues
|
2022-05-30 21:15:21 +01:00 |
|
Samuel Keiffer
|
65e90654a0
|
Merge branch 'makselord/modular_weapons' into 'master'
modular weapon modifier costs changed to 1, 5, 10, 15, 20, 30
See merge request veloren/veloren!3414
|
2022-05-30 17:22:40 +00:00 |
|
Makselord
|
8df3118094
|
updated changelog in accordance with 2nd change
|
2022-05-30 10:08:22 -04:00 |
|
Makselord
|
4a2cdd08d4
|
modular weapon modifier costs changed to 1, 2, 5, 10, 15, 25
|
2022-05-30 09:56:17 -04:00 |
|
Marcel
|
43c17ce312
|
Merge branch 'Animals_one_slot_only' into 'master'
Change animal species to have only one inventory slot
See merge request veloren/veloren!3405
|
2022-05-29 23:53:00 +00:00 |
|
N A
|
c09f070241
|
Change animal species to have only one inventory slot
|
2022-05-29 23:53:00 +00:00 |
|
Makselord
|
f10b868dbf
|
modular weapon modifier costs changed to 1, 5, 10, 15, 20, 30
|
2022-05-29 19:50:26 -04:00 |
|
Marcel
|
f2ece25b79
|
Merge branch 'christof/economy_trace' into 'master'
Make economy trading log less intrusive and info unless explicitely activated
See merge request veloren/veloren!3413
|
2022-05-29 17:49:58 +00:00 |
|
Christof Petig
|
3fc59d7e4d
|
lower trading output to trace (and raise one to warn)
|
2022-05-29 19:09:52 +02:00 |
|
Christof Petig
|
b8c3d71fbe
|
economy trace defaults to info
|
2022-05-29 19:08:39 +02:00 |
|
Marcel
|
47a7943cc2
|
Merge branch 'upgrade_assets_manager' into 'master'
Upgrade `assets_manager` to `0.8.0` and `image` to `0.24`
See merge request veloren/veloren!3410
|
2022-05-28 22:41:23 +00:00 |
|
Samuel Keiffer
|
9afce36b87
|
Merge branch 'makselord/bamboo' into 'master'
Makselord/bamboo
See merge request veloren/veloren!3407
|
2022-05-28 22:34:49 +00:00 |
|
Makselord
|
69041137a0
|
reduced bamboo spawn rates
|
2022-05-28 18:04:06 -04:00 |
|
Makselord
|
60c2d7d968
|
updated changelog
|
2022-05-28 18:02:12 -04:00 |
|
Benoît du Garreau
|
6431c5567c
|
Fix clippy error
|
2022-05-28 23:58:47 +02:00 |
|
Makselord
|
c92cd26ff1
|
bamboo collectibles spawn near rivers
|
2022-05-28 17:56:35 -04:00 |
|
Benoît du Garreau
|
f36e74e383
|
Fix deprecated function use
|
2022-05-28 23:53:30 +02:00 |
|
Benoît du Garreau
|
ca2ef3e813
|
Add comments
|
2022-05-28 23:32:16 +02:00 |
|
Benoît du Garreau
|
8488c7b25e
|
Upgrade assets_manager to 0.8.0 and image to 0.24
This removes a significant number of duplicated dependencies
|
2022-05-28 23:18:31 +02:00 |
|
Ben Wallis
|
d56e0de392
|
Merge branch 'xvar/fix-charselect-bug' into 'master'
Fixed handling of deleted characters on character select screen
Closes #1560
See merge request veloren/veloren!3408
|
2022-05-28 18:12:49 +00:00 |
|
Ben Wallis
|
c001de7409
|
Fixed pressing enter on character creation screen attempting to log in instead of create the character. Fixed deleting a character with no characters remaining resulting in the deleted character still being selected internally.
|
2022-05-28 16:28:26 +01:00 |
|
Ben Wallis
|
ae54307080
|
Merge branch 'xvar/loot-ownership' into 'master'
Added loot ownership
See merge request veloren/veloren!3388
|
2022-05-28 12:06:49 +00:00 |
|