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

8262 Commits

Author SHA1 Message Date
Monty Marz
3dd2bcd9e5 Merge branch 'aweinstock/bow-zoom-charge-master' into 'master' 
Make the camera zoom as the bow (or any ChargedRanged attack) is charging.

See merge request
2021-05-26 17:34:47 +00:00
Avi Weinstock
e127067431 Change the ChargedRanged zoom distance from 0.0 to 2.0, and add a delay after the mouse click before the zoom starts (i.e. hold to zoom, spam click will not zoom). 2021-05-26 11:51:29 -04:00
Avi Weinstock
c0a9c4245b Add zoom scaling as well as FOV scaling to ChargedRanged, and restore the old zoom afterwards. 2021-05-26 09:34:08 -04:00
Avi Weinstock
5652f68019 Make the camera zoom as the bow (or any ChargedRanged attack) is charging. 2021-05-26 09:34:07 -04:00
Justin Shipsey
285904a850 Merge branch 'sam/rework-bow' into 'master' 
Bow Rework

See merge request
2021-05-26 04:44:09 +00:00
jshipsey
51383eee13 anim 2021-05-26 00:04:15 -04:00
Samuel Keiffer
f84ef7f8c0 Merge branch 'juliancoffee/dungeon_refactoring' into 'master' 
Refactor enemy creation in dungeons

See merge request
2021-05-25 23:22:26 +00:00
juliancoffee
f4b3aef9b4 Refactor enemy creation in dungeons 2021-05-26 01:39:48 +03:00
Marcel
567f9d2119 Merge branch 'Extract-invite-handling' into 'master' 
Extract 'get_inviter_and_kind' method from 'handle_invite_decline' and...

See merge request
2021-05-25 20:34:47 +00:00
Jonathan Berglin
5c8fc8da83 Extract 'get_inviter_and_kind' method from 'handle_invite_decline' and... 2021-05-25 20:34:46 +00:00
Justin Shipsey
d4204bafbc Merge branch 'juliancoffee/dungeon_chests' into 'master' 
dungeon chests

See merge request
2021-05-24 23:05:20 +00:00
juliancoffee
e36e63825d fmt 2021-05-25 01:23:32 +03:00
juliancoffee
dc7c093bbb add CHANGELOG 2021-05-25 01:08:11 +03:00
juliancoffee
0fada1cfde Unique loot tables for each dungeon chest 2021-05-25 00:42:43 +03:00
juliancoffee
9bc15c3adf Overhaul loot tables 2021-05-25 00:20:18 +03:00
juliancoffee
718c5b88f4 Adding different chests for each dungeon 2021-05-24 23:00:44 +03:00
Marcel
c4f1f99985 Merge branch 'lboklin/wing-clip' into 'master' 
Fix higher than intended drag for winged entities

See merge request
2021-05-24 11:42:12 +00:00
Samuel Keiffer
9dbc58ce03 Merge branch 'juliancoffee/asset_loadout' into 'master' 
Move loadout creation to .ron files

See merge request
2021-05-23 21:57:41 +00:00
juliancoffee
d5c566ff24 fixing tests 2021-05-24 00:06:03 +03:00
juliancoffee
8e5f2d4d3b Fix species tests for random body_type and fmt 2021-05-23 22:59:48 +03:00
juliancoffee
f01b700c88 Add tests for validation assets 2021-05-23 22:27:33 +03:00
juliancoffee
9ed030442b Switch to using EquipSlot key instead of String 2021-05-23 21:37:41 +03:00
juliancoffee
3c82a0e8cd LoadoutBuilder efactoring 2021-05-23 20:29:19 +03:00
Sam
f79d507d24 Updated comments in states code. 2021-05-23 11:41:09 -05:00
juliancoffee
53cd3ccfec Remove unused LoadoutConfig-s 2021-05-23 19:19:20 +03:00
juliancoffee
95dedc0e4e Add directory hierarchy 2021-05-23 19:19:20 +03:00
juliancoffee
8cb1e22dda add TODO about tests 2021-05-23 19:19:20 +03:00
juliancoffee
e8c0f62c60 Move loadout config handling to .ron files 2021-05-23 19:19:20 +03:00
juliancoffee
d587aff613 Implement random choosing of item from loadout 2021-05-23 19:19:20 +03:00
juliancoffee
23b566dbf8 Add support for .ron loadouts 2021-05-23 19:19:20 +03:00
Justin Shipsey
02c1c170fb Merge branch 'james/glide-clip' into 'master' 
Don't modify position in glide character state

See merge request
2021-05-23 07:26:11 +00:00
James Melkonian
9dde9259cd Don't modify position in glide character state 2021-05-23 07:26:11 +00:00
Ludvig Böklin
e611b048e2 Birds don't have wings 2021-05-23 08:17:49 +02:00
Samuel Keiffer
4832ffef5a Merge branch 'aweinstock/mindflayer-fix-20210522' into 'master' 
Fix mindflayer tactic to make it shoot purple fireballs again.

See merge request
2021-05-23 01:15:04 +00:00
Avi Weinstock
62de40239a Fix mindflayer tactic to make it shoot purple fireballs again. 2021-05-22 20:35:21 -04:00
Samuel Keiffer
7988f50259 Merge branch 'juliancoffee/dungeon_mobs' into 'master' 
Dungeon rebalance

See merge request
2021-05-22 22:38:21 +00:00
Monty Marz
6231208eb8 Merge branch 'pfau/update_conrod_core' into 'master' 
update conrod core commit to enhance highlight colors

See merge request
2021-05-22 22:34:22 +00:00
juliancoffee
d584da11d6 Move fireworks into own table 2021-05-23 01:04:11 +03:00
juliancoffee
a1d2849dae fmt 2021-05-23 01:04:11 +03:00
juliancoffee
2f568235d9 Adjust mob numbers and add /kit tier-0 2021-05-23 01:04:11 +03:00
juliancoffee
6027f2ffa3 Adjust loot tables 
- Add regular drop to T5 miniboss
- Fixup cultist loot table
- Give own loot table to Deadwood in T0
 2021-05-23 01:04:11 +03:00
juliancoffee
b31b80637e Edit minibosses in lower tiers 
- Deadwood to T0 (instead of bonerattlers)
- Rats to T1 (instead of bonerattlers)
- Bonerattlers to T3 (instead of hakulaqs, it's still placeholder)
 2021-05-23 01:04:05 +03:00
Monty
52c7ec0db1 update conrod core commit to enhance highlight colors 2021-05-22 23:22:12 +02:00
Ben Wallis
41777371dc Merge branch 'hqurve/item-pickups' into 'master' 
Item pickups are shown in separate window and "inventory-full" messages are shown above the item attempted to be picked up

See merge request
2021-05-22 20:47:08 +00:00
hqurve
36aae8b34b Item pickups are shown in separate window and "inventory-full" messages are shown above the item attempted to be picked up 2021-05-22 20:47:08 +00:00
Sam
7a40a04f16 Balance tweaks. 2021-05-22 15:00:05 -05:00
Samuel Keiffer
0adff71506 Merge branch 'sam/fix-equip-slots' into 'master' 
Fix Equip Slots

See merge request
2021-05-22 19:05:22 +00:00
Ben Wallis
59af4af9a9 Merge branch 'juliancoffee/update-uk_UA' into 'master' 
update uk ua

See merge request
2021-05-22 18:58:11 +00:00
Illia Denysenko
e91d0c4dbd update uk ua 2021-05-22 18:58:11 +00:00
Sam
6028befbce Fix 2021-05-22 13:29:03 -05:00