6dd3693faa
Merge branch 'sam/fix-combo-melee' into 'master'
...
Fix oob panic in combo melee which can happen during desyncs.
See merge request veloren/veloren!2555
2021-07-05 02:28:21 +00:00
055a46e3aa
build(nix): use default-publish for release builds of voxygen
2021-07-05 05:06:41 +03:00
4bc54e0287
Fix oob panic in combo melee which can happen during desyncs.
2021-07-04 20:54:08 -05:00
5da8c70f48
Merge branch 'aweinstock/sprite-collectible-refactoring' into 'master'
...
Deduplicate data involved in sprite harvesting, making it harder to make mistakes with.
See merge request veloren/veloren!2542
2021-07-04 17:23:53 +00:00
f0f64a9fc0
Merge branch 'juliancoffee/fix_test_parse_ron' into 'master'
...
Split asset_tweak tests to separate command
See merge request veloren/veloren!2552
2021-07-04 17:14:14 +00:00
33a37a8857
Run asset_tweak tests separately
...
+ Make parse_all_ron_files_to_value panic-friendly. Remove unwraps
to unwrap_or_else with panic message.
2021-07-04 19:31:57 +03:00
971dd9059c
fix combo not reset at respawn
2021-07-04 17:28:11 +02:00
fca8227db8
Merge branch 'xvar/wgpu-egui' into 'master'
...
Added egui debug UI
See merge request veloren/veloren!2252
2021-07-04 09:47:19 +00:00
b499cf2c58
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the egui-ui feature which is enabled by default but removed for airshipper builds.
...
Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph.
This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
ca2dcf7712
Merge branch 'master' into 'master'
...
Correct spelling for glowing remains description
See merge request veloren/veloren!2551
2021-07-04 04:41:54 +00:00
0752ee728c
Update assets/common/items/crafting_ing/mindflayer_bag_damaged.ron
2021-07-04 01:44:33 +00:00
303f03dd3a
Adjust Yeti difficulty
...
Frost breath:
- ori_rate reduced from 0.6 to 0.1
- time of breath increased from 1 second to 2 seconds
- buildup increased from 0.4 to 0.8
- make it more gentle, with less damage per tick, but faster tick rate
(50 * 1 to 10 * 5)
- make Frozen debuff strength smoler, 1.5 to 0.5 and make it chance to
apply debuff.
- make him use it when closer range (10 and not 15)
Ice spikes:
- increase recovery_duration from 0.3 to 1.0
- make him slower while doing ice spikes, make ice spikes move
slower
- make him use it when closer range (15 and not 20)
Snowball:
- increase recover_duration from 0.4 to 0.9
Strike:
- increase buildup_duration fron 0.6 to 0.8
- increase recover_duration from 0.5 to 1.0
- increase knockback from 40.0 to 70.0
2021-07-04 03:44:17 +03:00
0e4ca28ee4
Correct spelling errors in item descriptions
2021-07-03 15:53:19 -05:00
89b71dc9a9
Merge branch 'juliancoffee/merchants_ux' into 'master'
...
Improve Merchant loadout from UX perspective
See merge request veloren/veloren!2544
2021-07-03 20:25:49 +00:00
836f10ae63
Remove allocation in SpriteKind::collectible_id.
2021-07-03 15:32:36 -04:00
dd2d0a98fb
Improve Merchant inventory from UX perspective
...
Changes:
- Make it use red bags with 18 slots (2 rows * 9)
- Sort items by quality
- Stack ingredients, food, potions
- Move coins to ingedients bag and put it first
- Filter unconsumed good (case when you saw 16 rugged shirts)
Refactoring:
- Split bag creation to separate functions
2021-07-03 22:16:06 +03:00
3ebc5428bd
Merge branch '1158-parse-all-rons-to-value' into 'master'
...
Fix #1158 - Add a test that all the `.ron` manifests parse
Closes #1158
See merge request veloren/veloren!2533
2021-07-03 18:11:04 +00:00
4f66bff54a
Fix #1158 - Add a test that all the .ron manifests parse
2021-07-03 18:11:04 +00:00
a9767c40d1
Merge branch 'aweinstock/networktracy' into 'master'
...
Add some tracy plots about network usage to the client.
See merge request veloren/veloren!2510
2021-07-03 05:44:30 +00:00
b4c2bc14df
Deduplicate data involved in sprite harvesting, making it harder to make mistakes with.
2021-07-02 15:23:19 -04:00
c751ec1381
Merge branch 'aweinstock/blockstats' into 'master'
...
Add block statistics generator to world/examples.
See merge request veloren/veloren!2526
2021-07-02 17:10:26 +00:00
c2106e158f
Use approximate byte count for the terrain recv graph.
2021-07-02 12:43:34 -04:00
6ba512efc8
Add some tracy plots about network usage to the client.
2021-07-02 12:40:52 -04:00
f9c263faf6
Add benchmark for color quantization using the rtree crate.
2021-07-01 13:41:37 -04:00
9bcec54313
Merge branch 'tygyh/bot-main-refactor' into 'master'
...
Tygyh/bot main refactor
See merge request veloren/veloren!2528
2021-07-01 15:59:05 +00:00
85285f9b8e
Tygyh/bot main refactor
2021-07-01 15:59:05 +00:00
bad4da8769
Merge branch 'Extract-create-new-button-from-update' into 'master'
...
Extract 'create_new_button' function from 'update'
See merge request veloren/veloren!2440
2021-07-01 14:39:03 +00:00
fc618b2222
Extract 'create_new_button' function from 'update'
2021-07-01 14:39:02 +00:00
099ddea165
Merge branch 'juliancoffee/dungeon_rebalance' into 'master'
...
Make cultist great again
See merge request veloren/veloren!2513
2021-07-01 02:37:39 +00:00
83f0807754
Merge branch 'aweinstock/fix-campfires' into 'master'
...
Fix underwater campfires.
See merge request veloren/veloren!2536
2021-06-30 23:19:45 +00:00
110aa17642
Fix underwater campfires.
2021-06-30 18:36:43 -04:00
398b658524
Merge branch 'juliancoffee/better_item_tests' into 'master'
...
More informative item tests
See merge request veloren/veloren!2534
2021-06-30 20:12:21 +00:00
d92d54f8ad
Better error signaling in assets::load_dir_expect
2021-06-30 21:06:06 +03:00
61edae79ae
Merge branch 'zesterer/keyboard' into 'master'
...
Improve default keybindings and Key names
See merge request veloren/veloren!2532
2021-06-30 17:33:17 +00:00
a3bf073875
Use assets::load_dir to test item assets
2021-06-30 18:48:28 +03:00
cf01dd7df7
Improved consistency of default controls
2021-06-30 13:39:37 +01:00
a7f7ea6327
Improved key names and platform support
2021-06-30 13:14:17 +01:00
269c6171e4
Merge branch 'DaforLynx/aeh' into 'master'
...
Sfx fixes and new test
See merge request veloren/veloren!2529
2021-06-30 11:43:01 +00:00
a757bf3dbd
Sfx fixes and new test
2021-06-30 11:43:00 +00:00
6418bcefac
Introduce maxed skillsets for melee and staff
2021-06-30 13:21:12 +03:00
593e47418c
Merge branch 'juliancoffee/dark_curry' into 'master'
...
Add variance to food drop in T5 dungeon
See merge request veloren/veloren!2522
2021-06-30 01:14:45 +00:00
07abf65bd6
Merge branch 'juliancoffee/remove_post_armor_crit' into 'master'
...
Remove post-armor crit damage
See merge request veloren/veloren!2531
2021-06-30 00:58:12 +00:00
adf340cf32
Nerf hammer poise
2021-06-30 03:52:51 +03:00
f2f50c88dc
Split room enemy generation to separate functions
2021-06-30 03:52:51 +03:00
7ff62275bf
Add RoomKind enum, address comments
...
- enum RoomKind {Peaceful, Fight, Boss, Miniboss} to specify type of
generated room.
2021-06-30 03:52:51 +03:00
86af138dc7
Buff Mindflayer flamethrower
...
- Buff DPS twice: increase tick_rate from 0.9 to 5.0 (x5.5), while reducing
damage from 400 to 150 (x2.6)
- Make ori_rate slower: 0.2 from 0.6 and make it use FromOri orientation
behaviour
2021-06-30 03:52:50 +03:00
21fc5aafcd
Nerf bow repeater knockback
2021-06-30 03:52:50 +03:00
63a9ceda29
More deterministic dungeon fights
...
- Spawn fixed number of enemies (2-4) in a room with any size. 1-3 enemies for T5 dungeon.
2021-06-30 03:52:50 +03:00
5b2ef98a7d
Slower ori_rate of StaffSimple flamethrower
...
+ use FromOri for StaffSimple flamethrower
2021-06-30 03:52:50 +03:00
c5da56e900
Nerf Husk Brute
...
- Remove HuskBrute health level buff
- Make their attack slower
2021-06-30 03:52:50 +03:00
