Adam Whitehurst
81397349da
fix(bug-563): Better cursor toggling, no regrab when clicking window
2021-05-24 16:14:34 -07:00
Adam Whitehurst
0c3c5728d1
Merge branch '563-toggle-cursor-automatically-when-chat-is-active' of gitlab.com:veloren/veloren into 563-toggle-cursor-automatically-when-chat-is-active
2021-05-24 15:55:25 -07:00
Adam Whitehurst
f7c09a477f
chore: add to CHANGELOG.md
2021-05-24 15:54:55 -07:00
Adam Whitehurst
72f8b8cfec
chore: more descriptive comment
2021-05-24 15:54:55 -07:00
Adam Whitehurst
c9696b01cf
feat: ungrab cursor w/ typing
2021-05-24 15:54:55 -07: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
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
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
Sam
0592d14d04
Fix
2021-05-22 13:29:03 -05:00
Samuel Keiffer
9f1bb37b70
Merge branch 'lboklin/bird-drag' into 'master'
...
Adjusted masses; less excessive knockbacks; prevent loot shooting off
See merge request veloren/veloren!2307
2021-05-22 17:56:14 +00:00
Ludvig Böklin
46d1bb5f18
Adjusted masses; less excessive knockbacks; prevent loot shooting off
2021-05-22 17:56:13 +00:00
Samuel Keiffer
e543941073
Merge branch 'juliancoffee/boss_armour' into 'master'
...
Boss armor
See merge request veloren/veloren!2327
2021-05-22 17:42:27 +00:00
Monty Marz
30bcc6aaa3
Ferocious armour for t5-dungeon minibosses
2021-05-22 10:55:36 +00:00
Monty Marz
abca6de49b
Merge branch 'pfau/animal_trainer_armor' into 'master'
...
add ferocious armor and give it to t5 dungeon beastmaster miniboss
See merge request veloren/veloren!2325
2021-05-22 10:55:36 +00:00
juliancoffee
7dc50891d2
Add placeholders for bosses armour
2021-05-22 00:20:56 +03:00
Samuel Keiffer
49533cbd26
Merge branch 'juliancoffee/boss_loot_tables' into 'master'
...
Improve dungeon loot tables
See merge request veloren/veloren!2324
2021-05-21 21:05:14 +00:00
juliancoffee
312a01122a
Add tests to loadout builder
2021-05-21 23:36:09 +03:00
Samuel Keiffer
a0599ac046
Merge branch 'sam/extra-equip-slots' into 'master'
...
Added Extra Loadout Slots
See merge request veloren/veloren!2295
2021-05-21 20:28:53 +00:00
juliancoffee
849d51aaa3
Add note to tests
2021-05-21 19:33:31 +03:00
Marcel
ee93803f4a
Merge branch 'lboklin/auto-glide' into 'master'
...
Implement auto-glide
See merge request veloren/veloren!2321
2021-05-21 09:02:59 +00:00
juliancoffee
5d86850291
fmt
2021-05-21 11:36:48 +03:00
juliancoffee
df58fa9acf
Fixing loot tables
...
- Use quad_low and quad_medium loot table for corresponding mobs in
dungeons
- Remove cultist loot table from T3-T4 loot tables
- Use resize instead of vec[obj; len] to create different loot and not
duplicated for miniboss_1
2021-05-21 11:31:39 +03:00
