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,008 Commits 151 Branches 18 Tags 2.1 GiB
3ee123b745
Commit Graph

9008 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
juliancoffee
d92d54f8ad Better error signaling in assets::load_dir_expect 2021-06-30 21:06:06 +03:00
Joshua Barretto
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
juliancoffee
a3bf073875 Use assets::load_dir to test item assets 2021-06-30 18:48:28 +03:00
Joshua Barretto
cf01dd7df7 Improved consistency of default controls 2021-06-30 13:39:37 +01:00
Joshua Barretto
a7f7ea6327 Improved key names and platform support 2021-06-30 13:14:17 +01:00
Joshua Barretto
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
DaforLynx
a757bf3dbd Sfx fixes and new test 2021-06-30 11:43:00 +00:00
juliancoffee
6418bcefac Introduce maxed skillsets for melee and staff 2021-06-30 13:21:12 +03:00
Samuel Keiffer
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
Samuel Keiffer
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
juliancoffee
adf340cf32 Nerf hammer poise 2021-06-30 03:52:51 +03:00
juliancoffee
f2f50c88dc Split room enemy generation to separate functions 2021-06-30 03:52:51 +03:00
juliancoffee
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
juliancoffee
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
juliancoffee
21fc5aafcd Nerf bow repeater knockback 2021-06-30 03:52:50 +03:00
juliancoffee
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
juliancoffee
5b2ef98a7d Slower ori_rate of StaffSimple flamethrower 
+ use FromOri for StaffSimple flamethrower
 2021-06-30 03:52:50 +03:00
juliancoffee
c5da56e900 Nerf Husk Brute 
- Remove HuskBrute health level buff
- Make their attack slower
 2021-06-30 03:52:50 +03:00
juliancoffee
b9134a3f61 Make QuadMed great again 
- Make Bonerattler, Darkhound, Lion, Snowleopard use QuadMedJump (Saber
attack)
 2021-06-30 03:52:50 +03:00
juliancoffee
f9b71750ca 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
21a29ecf74 Add CorruptionSpores 
- New lootable food which you can find as husk or darkhound drop
 2021-06-30 03:33:06 +03:00
juliancoffee
46772c67e3 Remove post-armor crit damage 2021-06-30 03:16:04 +03:00
juliancoffee
ef6a12edc2 bumb Biped Cultist armour 2021-06-30 02:10:39 +03:00
Samuel Keiffer
0151e5aeed Merge branch 'potion-animations' into 'master' 
Consumable Animations

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

See merge request veloren/veloren!2527
 2021-06-29 11:58:02 +00:00
Sam
4cdf081a40 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
f5533cdb92 Moved match on ItemUseKind to create durations to a function under ItemUseKind. 2021-06-29 05:59:02 -05:00
Sam
381c7121c6 Changelog 2021-06-29 05:59:02 -05:00
Sam
8a9de26132 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
37c6fe9ee8 anims 2021-06-29 05:59:02 -05:00
Sam
9ff7ecea81 Item use now goes through use item character state if it is a consumable. 2021-06-29 05:59:02 -05:00
Sam
3559ce5803 Added UseItem character state. 2021-06-29 05:59:02 -05:00
Sam
1978b590aa Destringified consumables 2021-06-29 05:59:02 -05:00
Avi Weinstock
47b3b5e5d9 Generate palette info from block statistics, and benchmark how well it compresses. 2021-06-28 22:11:19 -04:00
Snowram
aaf5f89076 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
3ec5306ed0 Adds an outcome to death with SFX and VFX 2021-06-29 00:14:05 +02:00
Ben Wallis
94fa7da4fa Merge branch 'aweinstock/scaleprice' into 'master' 
Add prices for dragonscale, hard carapace, and plate, so that more craftable armors have prices.

See merge request veloren/veloren!2521
 2021-06-28 21:03:44 +00:00
Marcel
cd1c3f3a28 Merge branch 'tygyh/Loadout-builder-refactor' into 'master' 
Extract 'swap_equipment' and 'swap_armor' functions

See merge request veloren/veloren!2525
 2021-06-28 20:19:49 +00:00
Avi Weinstock
3f3f8a40c5 Use SQL transactions in world_block_statistics to try to speed it up. 2021-06-28 15:50:58 -04:00
Avi Weinstock
024b6c52ef Add block statistics generator to world/examples. 2021-06-28 15:02:57 -04:00
Imbris
20a9a420c6 Merge branch 'imbris/bind-order' into 'master' 
Ensure bind groups are ordered with the most frequently changed ones in later slots

See merge request veloren/veloren!2496
 2021-06-28 15:39:31 +00:00
Dr. Dystopia
11d2017bb3 Extract 'swap_equipment' and 'swap_armor' functions 2021-06-28 16:17:18 +02:00
Avi Weinstock
0ab451ec36 Add prices for dragonscale, hard carapace, and plate, so that more craftable armors have prices. 2021-06-28 09:24:22 -04:00
Marcel
7c135fb6ff Merge branch 'juliancoffee/fix_clippy' into 'master' 
update Cargo.lock

See merge request veloren/veloren!2523
 2021-06-28 13:24:11 +00:00
juliancoffee
a434be594c update Cargo.lock 2021-06-28 16:02:31 +03:00
Marcel
f4f6138d3d Merge branch 'master' into 'master' 
Update `coreaudio-sys` to v0.2.8 to fix build failure on M1 Macs

See merge request veloren/veloren!2505
 2021-06-28 07:47:50 +00:00
Marcel
010f9c250c Merge branch 'aweinstock/nodelay' into 'master' 
Enable TCP_NODELAY.

See merge request veloren/veloren!2520
 2021-06-27 23:49:01 +00:00
Marcel
11d16f34bb Merge branch 'xMAC94x/logging_fix' into 'master' 
fix logging cnt didnt reset

See merge request veloren/veloren!2518
 2021-06-27 21:54:35 +00:00
Marcel
2e57d2a14f Merge branch 'aweinstock/dungeonvoxel' into 'master' 
Use new dungeons in dungeon_voxel_export, remove old dungeon sampling...

See merge request veloren/veloren!2516
 2021-06-27 21:54:32 +00:00
Avi Weinstock
8c5d52b70a Enable TCP_NODELAY. 2021-06-27 17:45:33 -04:00