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,985 Commits 151 Branches 18 Tags
Commit Graph

2919 Commits

Author SHA1 Message Date
Sam
ddcaf98f03 Fix first person backwards roll. 2021-07-04 21:54:38 -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
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
Avi Weinstock
9aa1985172 Remove allocation in SpriteKind::collectible_id. 2021-07-03 15:32:36 -04: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
058a832d37 Add benchmark for color quantization using the rtree crate. 2021-07-01 13:41:37 -04: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
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
juliancoffee
bd1aff2405 Use assets::load_dir to test item assets 2021-06-30 18:48:28 +03: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
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
912d371487 Remove post-armor crit damage 2021-06-30 03:16:04 +03:00
juliancoffee
1cf66bf42a bumb Biped Cultist armour 2021-06-30 02:10:39 +03:00
Sam
246dc50a90 Moved match on ItemUseKind to create durations to a function under ItemUseKind. 2021-06-29 05:59:02 -05:00
Sam
8bf3109133 Food now applies buff at end of state. 
Rolling and poise states now cancel the potion buff.
UseItem character state now checks that the item in the slot has the same item_definition_id as when the entity enters the state.
Rolling can no cancel item use.
Rolling now checks for move_dir instead of velocity.
 2021-06-29 05:59:02 -05:00
jshipsey
c4c183cdf0 anims 2021-06-29 05:59:02 -05:00
Sam
203b3111d1 Item use now goes through use item character state if it is a consumable. 2021-06-29 05:59:02 -05:00
Sam
ab74ee3f01 Added UseItem character state. 2021-06-29 05:59:02 -05:00
Sam
938978bdbd Destringified consumables 2021-06-29 05:59:02 -05:00
Avi Weinstock
7b0dcad68f Generate palette info from block statistics, and benchmark how well it compresses. 2021-06-28 22:11:19 -04:00
Snowram
eb0a8efad1 Merge branch 'snowram/death-outcome' into 'master' 
Adds an outcome to death with SFX and VFX

See merge request veloren/veloren!2519
 2021-06-28 23:18:45 +00:00
Snowram
64045ed7bd Adds an outcome to death with SFX and VFX 2021-06-29 00:14:05 +02:00
Dr. Dystopia
a47780fdc8 Extract 'swap_equipment' and 'swap_armor' functions 2021-06-28 16:17:18 +02:00
Marcel
9e47c177d2 Merge branch 'alphyr/assets_manager0_5' into 'master' 
Update `assets_manager` to 0.5

See merge request veloren/veloren!2501
 2021-06-27 15:50:16 +00:00
Snowram
1c7c70c1bf Merge branch 'juliancoffee/fix_dismantle' into 'master' 
Improve Dismantle UX

See merge request veloren/veloren!2498
 2021-06-27 00:11:01 +00:00
juliancoffee
641aa921bf style 2021-06-27 02:44:19 +03:00
juliancoffee
f533e3433c Add is_recycling field to recipe book 2021-06-26 21:37:13 +03:00
Daan Vanoverloop
7d39c14481 Fixing #1169 - use strum macros for BlockKind conversion 2021-06-26 17:52:32 +02:00
Benoît du Garreau
ab3c8cf764 Update assets_manager to 0.5 2021-06-26 12:05:40 +02:00
Justin Shipsey
dbc3243691 Merge branch 'swilliams/jewellery' into 'master' 
Gem Rings and small change to trading.

See merge request veloren/veloren!2500
 2021-06-26 02:44:04 +00:00
Scott Williams
14f16a3a47 Gem Rings and small change to trading. 2021-06-26 02:44:02 +00:00
Joshua Barretto
9c746f7867 Merge branch 'aweinstock/site2dungeon' into 'master' 
Convert dungeons to site2.

See merge request veloren/veloren!2499
 2021-06-25 23:06:24 +00:00
Snowram
a81c71b461 Increases base damage of husk attack, rename some cultist weapons 2021-06-25 21:18:28 +02:00
Avi Weinstock
f74506038d Convert dungeon lights to CSG, tweak pillars, convert the magic circle from lava to glowing rock, make enemies spawn in dungeons, and fix clippy warnings. 2021-06-24 23:03:24 -04:00
Snowram
3b393a9c5c Ajust new npcs from feedback 2021-06-25 03:26:32 +02:00
Snowram
f518aebe81 Ajustments to new npcs 2021-06-24 19:31:21 +02:00
Snowram
38c9ff5225 Husk brute animations 2021-06-24 19:31:19 +02:00
Snowram
080328941b Adds alpaca and llama npcs 2021-06-24 19:30:15 +02:00
Snowram
78afaf32a2 Removes warlord and warlock armours 2021-06-24 19:30:11 +02:00
Snowram
21b526856d Adds new species 2021-06-24 19:29:44 +02:00