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
9,121 Commits 151 Branches 18 Tags 2.1 GiB
ac10410782
Commit Graph

9121 Commits

Author SHA1 Message Date
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
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
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
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
2021-07-01 02:37:39 +00:00
Joshua Barretto
3cbf663312 Merge branch 'aweinstock/fix-campfires' into 'master' 
Fix underwater campfires.

See merge request
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
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
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
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
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
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
juliancoffee
e19a7a5fd8 Add CorruptionSpores 
- New lootable food which you can find as husk or darkhound drop
 2021-06-30 03:33:06 +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
Samuel Keiffer
74d4f3e49c Merge branch 'potion-animations' into 'master' 
Consumable Animations

See merge request
2021-06-29 16:36:41 +00:00
Marcel
23af50d6c1 Merge branch 'sam/fix-oob-index' into 'master' 
Small fixes

See merge request
2021-06-29 11:58:02 +00:00
Sam
a3dd5f395c Removed potential for accessing OOB index and panicking in animations for combo melee. 
Made only entities with a character state component emit a death outcome on death.
 2021-06-29 06:20:26 -05:00
Sam
246dc50a90 Moved match on ItemUseKind to create durations to a function under ItemUseKind. 2021-06-29 05:59:02 -05:00
Sam
896cd44ddb Changelog 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
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
Ben Wallis
5a5cdf2362 Merge branch 'aweinstock/scaleprice' into 'master' 
Add prices for dragonscale, hard carapace, and plate, so that more craftable armors have prices.

See merge request
2021-06-28 21:03:44 +00:00