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
Ben Wallis
34f580dfaa
Introduced loot ownership rules to combat loot stealing by players
...
* Added `LootOwner` component used to indicate that an `ItemDrop` entity is owned by another entity
* A loot winner is now calculated after EXP allocation using the EXP per entity for weighted chance distribution
* Used existing Inventory Full overitem text to show "Owned by {player} for {seconds}secs" when a pickup fails due to a loot ownership check
* Updated agent code to take into account loot ownership when searching for `ItemDrop` targets to pick up
* Added `loot` ECS system to clear expired loot ownerships
2022-05-28 12:06:49 +00:00
Isse
bba81c65d9
Merge branch 'christof/skiing' into 'master'
...
Skiing and ice skating
See merge request veloren/veloren!3106
2022-05-27 17:19:52 +00:00
Christof Petig
2bf8e1865f
Skiing and ice skating
2022-05-27 17:19:52 +00:00
Samuel Keiffer
70d82a72ff
Merge branch 'Arjen/non-humanoid-pickup-food' into 'master'
...
Non-humanoid picking up consumables when hungry
See merge request veloren/veloren!3403
2022-05-27 16:57:53 +00:00
StereoJunkie
3015b4a29d
Non-humanoid picking up consumables when hungry
2022-05-27 16:57:53 +00:00
Imbris
ca1a27bd11
Merge branch 'imbris/update-tracy' into 'master'
...
Update tracy
See merge request veloren/veloren!3400
2022-05-27 02:50:24 +00:00
Imbris
5cf899c4fe
Plot fixes in client and dynamic name fix in voxygen (tracy update)
2022-05-26 22:19:11 -04:00
Samuel Keiffer
8b7f08e8ab
Merge branch 'makselord/ingots' into 'master'
...
fixed silver, gold, copper, tin ingots not showing correctly in crafting
See merge request veloren/veloren!3402
2022-05-26 22:13:33 +00:00
Makselord
5c8c88b786
fixed silver, gold, copper, tin ingots not showing correctly in crafting
2022-05-26 17:08:39 -04:00
Joshua Barretto
3b6e6be947
Merge branch 'zesterer/fix-climbing' into 'master'
...
Fixed climbing
See merge request veloren/veloren!3401
2022-05-26 09:34:10 +00:00
Joshua Barretto
4eb781cdf7
Fixed climbing
2022-05-26 10:08:41 +01:00
Imbris
a366fc4512
Update tracy
2022-05-26 00:04:03 -04:00
Marcel
fb6a8e0360
Merge branch 'xMAC94x/network_error' into 'master'
...
Pass network errors through the stack to display them in logs
See merge request veloren/veloren!3385
2022-05-25 22:12:42 +00:00
Marcel
5c2eda64da
Merge branch 'christof/MR3316_reworked' into 'master'
...
MR3316 "Draft: Updated translations" without the directory movement and squashed
See merge request veloren/veloren!3391
2022-05-24 22:10:22 +00:00
Christof Petig
2e6e864672
fix missing comma at line ends
2022-05-24 23:31:20 +02:00
Samuel Keiffer
b9c324a183
Merge branch 'tame_and_mount_special_casing' into 'master'
...
Special case taming and mounting.
See merge request veloren/veloren!3354
2022-05-24 02:09:45 +00:00
N A
d84a26dfd8
Special case taming and mounting.
2022-05-24 02:09:45 +00:00
Justin Shipsey
1b5c4b0749
Merge branch 'Corvella/bow_zoom_toggle' into 'master'
...
Add a setting to toggle zooming in when charging bow
See merge request veloren/veloren!3396
2022-05-23 23:09:47 +00:00
Corvella
a9622fe28e
Add a setting to toggle zooming in when charging bow
2022-05-23 23:09:47 +00:00
Marcel
d50b960592
Merge branch 'Corvella/hitboxes' into 'master'
...
Hitbox improvements
See merge request veloren/veloren!3395
2022-05-23 09:18:11 +00:00
Corvella
42af9b8e15
Hitbox improvements
2022-05-23 09:18:10 +00:00
