Snowram
b942913ee6
Adds sprite scaling
2021-05-29 00:11:01 +02:00
Monty Marz
99cf533a8a
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 veloren/veloren!2339
2021-05-26 17:34:47 +00:00
Avi Weinstock
d6442dbd3b
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
7a97fbb5cf
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
4d7828ec94
Make the camera zoom as the bow (or any ChargedRanged attack) is charging.
2021-05-26 09:34:07 -04:00
Justin Shipsey
d7c7f6bf5d
Merge branch 'sam/rework-bow' into 'master'
...
Bow Rework
See merge request veloren/veloren!2310
2021-05-26 04:44:09 +00:00
jshipsey
ae43102a5b
anim
2021-05-26 00:04:15 -04:00
Samuel Keiffer
827c6c874d
Merge branch 'juliancoffee/dungeon_refactoring' into 'master'
...
Refactor enemy creation in dungeons
See merge request veloren/veloren!2344
2021-05-25 23:22:26 +00:00
juliancoffee
6f0f3d1b62
Refactor enemy creation in dungeons
2021-05-26 01:39:48 +03:00
Marcel
2baa6f63bd
Merge branch 'Extract-invite-handling' into 'master'
...
Extract 'get_inviter_and_kind' method from 'handle_invite_decline' and...
See merge request veloren/veloren!2328
2021-05-25 20:34:47 +00:00
Jonathan Berglin
f5ed77184b
Extract 'get_inviter_and_kind' method from 'handle_invite_decline' and...
2021-05-25 20:34:46 +00:00
Justin Shipsey
1074352ca4
Merge branch 'juliancoffee/dungeon_chests' into 'master'
...
dungeon chests
See merge request veloren/veloren!2342
2021-05-24 23:05:20 +00:00
juliancoffee
c618ec7222
fmt
2021-05-25 01:23:32 +03:00
juliancoffee
2da8d96ec9
add CHANGELOG
2021-05-25 01:08:11 +03:00
juliancoffee
2d56b5dcde
Unique loot tables for each dungeon chest
2021-05-25 00:42:43 +03:00
juliancoffee
3700cc8a67
Overhaul loot tables
2021-05-25 00:20:18 +03:00
juliancoffee
940655dcb6
Adding different chests for each dungeon
2021-05-24 23:00:44 +03:00
Marcel
80b8561317
Merge branch 'lboklin/wing-clip' into 'master'
...
Fix higher than intended drag for winged entities
See merge request veloren/veloren!2336
2021-05-24 11:42:12 +00:00
Samuel Keiffer
17e684f2a2
Merge branch 'juliancoffee/asset_loadout' into 'master'
...
Move loadout creation to .ron files
See merge request veloren/veloren!2337
2021-05-23 21:57:41 +00:00
juliancoffee
e248e795a1
fixing tests
2021-05-24 00:06:03 +03:00
juliancoffee
d80a45a066
Fix species tests for random body_type and fmt
2021-05-23 22:59:48 +03:00
juliancoffee
457e5b14d8
Add tests for validation assets
2021-05-23 22:27:33 +03:00
juliancoffee
8c1643cad9
Switch to using EquipSlot key instead of String
2021-05-23 21:37:41 +03:00
juliancoffee
22b1880ae5
LoadoutBuilder efactoring
2021-05-23 20:29:19 +03:00
Sam
0961f00c7c
Updated comments in states code.
2021-05-23 11:41:09 -05:00
juliancoffee
00b182c183
Remove unused LoadoutConfig-s
2021-05-23 19:19:20 +03:00
juliancoffee
6656cfe010
Add directory hierarchy
2021-05-23 19:19:20 +03:00
juliancoffee
cbdb7dc1c1
add TODO about tests
2021-05-23 19:19:20 +03:00
juliancoffee
0722861364
Move loadout config handling to .ron files
2021-05-23 19:19:20 +03:00
juliancoffee
f0692c491b
Implement random choosing of item from loadout
2021-05-23 19:19:20 +03:00
juliancoffee
a8699cfa15
Add support for .ron loadouts
2021-05-23 19:19:20 +03:00
Justin Shipsey
cbde2d9ab8
Merge branch 'james/glide-clip' into 'master'
...
Don't modify position in glide character state
See merge request veloren/veloren!2334
2021-05-23 07:26:11 +00:00
James Melkonian
419cd2a5e4
Don't modify position in glide character state
2021-05-23 07:26:11 +00:00
Ludvig Böklin
a2afb75c83
Birds don't have wings
2021-05-23 08:17:49 +02:00
Samuel Keiffer
0aee0e2f4b
Merge branch 'aweinstock/mindflayer-fix-20210522' into 'master'
...
Fix mindflayer tactic to make it shoot purple fireballs again.
See merge request veloren/veloren!2335
2021-05-23 01:15:04 +00:00
Avi Weinstock
624f8796bd
Fix mindflayer tactic to make it shoot purple fireballs again.
2021-05-22 20:35:21 -04:00
Samuel Keiffer
95f3a12d41
Merge branch 'juliancoffee/dungeon_mobs' into 'master'
...
Dungeon rebalance
See merge request veloren/veloren!2333
2021-05-22 22:38:21 +00:00
Monty Marz
6d6bf1c2ab
Merge branch 'pfau/update_conrod_core' into 'master'
...
update conrod core commit to enhance highlight colors
See merge request veloren/veloren!2332
2021-05-22 22:34:22 +00:00
juliancoffee
7e909be2b5
Move fireworks into own table
2021-05-23 01:04:11 +03:00
juliancoffee
12d4afd3a5
fmt
2021-05-23 01:04:11 +03:00
juliancoffee
66709c4d17
Adjust mob numbers and add /kit tier-0
2021-05-23 01:04:11 +03:00
juliancoffee
4156f373c1
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
a1037501e2
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
d5883e76a9
update conrod core commit to enhance highlight colors
2021-05-22 23:22:12 +02:00
Ben Wallis
2e9522f6a0
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 veloren/veloren!2329
2021-05-22 20:47:08 +00:00
hqurve
854930bc1a
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
7828112486
Balance tweaks.
2021-05-22 15:00:05 -05:00
Samuel Keiffer
7488d8692b
Merge branch 'sam/fix-equip-slots' into 'master'
...
Fix Equip Slots
See merge request veloren/veloren!2331
2021-05-22 19:05:22 +00:00
Ben Wallis
ab3ee530f0
Merge branch 'juliancoffee/update-uk_UA' into 'master'
...
update uk ua
See merge request veloren/veloren!2330
2021-05-22 18:58:11 +00:00
Illia Denysenko
1b5f06cff9
update uk ua
2021-05-22 18:58:11 +00:00
