Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,988 Commits 151 Branches 18 Tags
Commit Graph

8988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Samuel Keiffer
a71b035b05 Merge branch 'juliancoffee/yeti_nerf' into 'master' 
Adjust Yeti difficulty

See merge request veloren/veloren!2550
 2021-07-05 03:46:42 +00:00
Samuel Keiffer
a049419a10 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
Sam
d7e90dccd6 Fix oob panic in combo melee which can happen during desyncs. 2021-07-04 20:54:08 -05:00
Marcel
404dc50fb9 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
Marcel
f8cc483228 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
juliancoffee
5157b84f2f 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
Ben Wallis
0ca636612d 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
Ben Wallis
9464a45783 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
Samuel Keiffer
3eeb43deb2 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
steanne
29d5f16b0c Update assets/common/items/crafting_ing/mindflayer_bag_damaged.ron 2021-07-04 01:44:33 +00:00
juliancoffee
cc27ce00fe 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
Marcel
88a0048d21 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
Avi Weinstock
9aa1985172 Remove allocation in SpriteKind::collectible_id. 2021-07-03 15:32:36 -04:00
juliancoffee
4a10800de8 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
Marcel
3e9219ce27 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
eckso
43bc40c7d5 Fix #1158 - Add a test that all the .ron manifests parse 2021-07-03 18:11:04 +00:00
Imbris
4013a10c0e 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
Avi Weinstock
aba2f232e4 Deduplicate data involved in sprite harvesting, making it harder to make mistakes with. 2021-07-02 15:23:19 -04:00
Marcel
426ed0a8cc 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
Avi Weinstock
6e525783bc Use approximate byte count for the terrain recv graph. 2021-07-02 12:43:34 -04:00
Avi Weinstock
929ed54e56 Add some tracy plots about network usage to the client. 2021-07-02 12:40:52 -04:00
Avi Weinstock
058a832d37 Add benchmark for color quantization using the rtree crate. 2021-07-01 13:41:37 -04:00
Marcel
538a14f522 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
Jonathan Berglin
bcd358a745 Tygyh/bot main refactor 2021-07-01 15:59:05 +00:00
Marcel
02f3f95f10 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
Jonathan Berglin
477edd0375 Extract 'create_new_button' function from 'update' 2021-07-01 14:39:02 +00:00
Samuel Keiffer
70d52e9495 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
Joshua Barretto
3cbf663312 Merge branch 'aweinstock/fix-campfires' into 'master' 
Fix underwater campfires.

See merge request veloren/veloren!2536
 2021-06-30 23:19:45 +00:00
Avi Weinstock
d3d4cc1382 Fix underwater campfires. 2021-06-30 18:36:43 -04:00
Ben Wallis
2ddfa9fe5d 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
juliancoffee
f4d457bc04 Better error signaling in assets::load_dir_expect 2021-06-30 21:06:06 +03:00
Joshua Barretto
a533c96d63 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
juliancoffee
bd1aff2405 Use assets::load_dir to test item assets 2021-06-30 18:48:28 +03:00
Joshua Barretto
d25d61490e Improved consistency of default controls 2021-06-30 13:39:37 +01:00
Joshua Barretto
c180af8d82 Improved key names and platform support 2021-06-30 13:14:17 +01:00
Joshua Barretto
8e2f0021e3 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
DaforLynx
e20a5db899 Sfx fixes and new test 2021-06-30 11:43:00 +00:00
juliancoffee
63fddc2516 Introduce maxed skillsets for melee and staff 2021-06-30 13:21:12 +03:00
Samuel Keiffer
5793dc5bbe 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
Samuel Keiffer
404e824231 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
juliancoffee
0dcf76333a Nerf hammer poise 2021-06-30 03:52:51 +03:00
juliancoffee
def73d4425 Split room enemy generation to separate functions 2021-06-30 03:52:51 +03:00
juliancoffee
8a8a3f9318 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
juliancoffee
ab1c93c21e 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
juliancoffee
032918e22b Nerf bow repeater knockback 2021-06-30 03:52:50 +03:00
juliancoffee
d339fc4343 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
juliancoffee
ed37a6f2f3 Slower ori_rate of StaffSimple flamethrower 
+ use FromOri for StaffSimple flamethrower
 2021-06-30 03:52:50 +03:00
juliancoffee
9eb1ae8b91 Nerf Husk Brute 
- Remove HuskBrute health level buff
- Make their attack slower
 2021-06-30 03:52:50 +03:00
juliancoffee
d929d454d1 Make QuadMed great again 
- Make Bonerattler, Darkhound, Lion, Snowleopard use QuadMedJump (Saber
attack)
 2021-06-30 03:52:50 +03:00
juliancoffee
e95539a77a Make cultist great again 
- Change cultist set stats to mixed dragonscale (hands and feet),
sunsilk (belt, pants and shoulders) and orichalcum (chest and cape)
Distribute cultist set stats as hybrid set.

- Make cultist cape count towards npc aggro
- Remove unused staff skilltree from cultist
- Remove spin number skill from sword cultist skillset
 2021-06-30 03:52:50 +03:00