Marcel
ec7d3b5e37
Merge branch 'swilliams/give_item_fix' into 'master'
...
Fix for Issue 1210
See merge request veloren/veloren!2484
2021-06-20 23:26:59 +00:00
Marcel
b0574b4ddc
Merge branch 'imbris/tracy' into 'master'
...
Refactor Client message handling, improve use of tracy, increase coverage of profiling spans in voxygen
See merge request veloren/veloren!2479
2021-06-20 23:17:08 +00:00
Scott Williams
80c45b6396
Added another .replace
2021-06-20 22:55:58 +01:00
Samuel Keiffer
e7f54d6306
Merge branch 'juliancoffee/clay_golem_tweak' into 'master'
...
clay golem tweak
See merge request veloren/veloren!2478
2021-06-19 14:49:11 +00:00
Imbris
659b42e813
Remove tracy features that are no longer needed now that macros have been fixed
2021-06-19 04:27:50 -04:00
Imbris
2bb91e8d7d
Fix span macros by putting cfgs outside the macro (they are evaluated in the crate where the macro is used), add shorthand for common case of prof_span macro, add some spans to the client code and spiff bits of it
2021-06-19 04:27:50 -04:00
juliancoffee
57649a2e90
tweak clay_golem HP
2021-06-19 10:47:45 +03:00
Samuel Keiffer
2abd23ec64
Merge branch 'juliancoffee/not_explodable_sprites' into 'master'
...
Proof of concept non-explodable sprites
See merge request veloren/veloren!2475
2021-06-19 01:10:20 +00:00
Samuel Keiffer
0b8039c3b0
Merge branch 'juliancoffee/trade_pricing_refactor' into 'master'
...
Refactor trade_pricing.rs
See merge request veloren/veloren!2469
2021-06-19 01:10:16 +00:00
juliancoffee
384409a1ed
Load ori_rate for BasicBeam from assets
...
+ make fire turret ori_rate slower
2021-06-18 22:33:00 +03:00
juliancoffee
9a5f749bc7
use bg_main.jpg instead of bg_main.png
2021-06-18 20:41:18 +03:00
Joshua Barretto
46dfc119fb
Merge branch 'aweinstock/tighten_e2t' into 'master'
...
Make e2t hitboxes tighter by checking the floating point coordinates before looking up voxels.
See merge request veloren/veloren!2460
2021-06-18 16:27:20 +00:00
Joshua Barretto
05c375a8b0
Merge branch 'zesterer/meta' into 'master'
...
Optimising for size
See merge request veloren/veloren!2468
2021-06-18 12:35:16 +00:00
Joshua Barretto
747ef50a58
Removed .jpeg as valid image format (to encourage consistency)
2021-06-18 12:42:08 +01:00
Joshua Barretto
0265da1074
Added support for JPEG backgrounds
2021-06-18 12:27:39 +01:00
Joshua Barretto
bb6e8582a6
Merge branch 'zesterer/no-cmd-santisation' into 'master'
...
Made dealing with chat vs commands safer for clients, made /alias require moderator permissions
See merge request veloren/veloren!2472
2021-06-18 10:55:57 +00:00
Joshua Barretto
294b6e394a
Renamed command event
2021-06-18 11:31:06 +01:00
juliancoffee
288a7a020b
Proof of concept non-explodable sprites
2021-06-18 13:10:27 +03:00
DaforLynx
c85238014a
More npc sfx
2021-06-18 06:24:57 +00:00
Joshua Barretto
0067cea560
Made /alias moderator-only
2021-06-17 19:55:46 +01:00
Joshua Barretto
96cbf60c3f
Made commands a distinct ClientMsg to avoid possible sanitisation problems for clients
2021-06-17 19:55:21 +01:00
juliancoffee
ff27c550d1
clippy & code cleaning & test diagnostic
...
- add clippy::pedantic
- move internal functions to methods/functions
- rename one-letter variables
- use tuple pattern matching instead of indexing
- make print_sorted fancier, also show prices on `.other` entries
2021-06-17 19:10:55 +03:00
DaforLynx
9a5b95bc16
Added npc hurt sfx
2021-06-17 05:49:09 +00:00
jshipsey
a42e6e20b8
basilisk tweaks
2021-06-16 23:28:25 -04:00
jshipsey
0941f03608
buffs to stretch progression
2021-06-16 20:50:46 -04:00
Joshua Barretto
e3c44ba7fe
More voice kinds, more opportunities for sounds
2021-06-16 17:23:22 +01:00
Joshua Barretto
fb51fd3230
Emit sound from head
2021-06-16 17:23:22 +01:00
Joshua Barretto
0ef29a6989
VoiceKind for better sound effect specs
2021-06-16 17:23:22 +01:00
Joshua Barretto
559311e1b0
Chasing sounds
2021-06-16 17:23:22 +01:00
Avi Weinstock
96ffae4387
Address MR 2460 comments.
...
- Switch from point query to AABB query to take into account block thickness.
2021-06-15 22:52:02 -04:00
Avi Weinstock
5e6363dbcc
Make e2t hitboxes tighter by checking the floating point coordinates before looking up voxels.
2021-06-15 21:29:29 -04:00
Snowram
8351aab25d
Addresses comments about roc AI
2021-06-15 09:50:23 +02:00
Snowram
f2c7836161
Makes summon range inclusive
2021-06-15 09:49:13 +02:00
Avi Weinstock
cb0566299a
Make tornado (and empty models in general) work on WGPU.
2021-06-15 09:49:13 +02:00
Snowram
3ba0500b90
Tornado summoning attack
2021-06-15 09:49:13 +02:00
Snowram
97ce50e5d4
Add troll variants and roc npcs
2021-06-15 09:49:13 +02:00
Imbris
11994b5735
Merge branch 'imbris/userdata-tweak' into 'master'
...
Fallback to executable strategy for the userdata rather than panicking when...
See merge request veloren/veloren!2445
2021-06-15 03:22:51 +00:00
Samuel Keiffer
fec328a617
Merge branch 'juliancoffee/swing_fix' into 'master'
...
Introduce hit_timing for combo_melee
See merge request veloren/veloren!2426
2021-06-15 02:38:23 +00:00
Imbris
6fe3a3c77f
Fallback to executable strategy for the userdata rather than panicking when USERDATA_STRATEGY isn't set and the executable is moved out of the project folder
2021-06-14 21:42:50 -04:00
Avi Weinstock
c5f82b241d
Mitigate conrod widget id crash by disabling pickaxe icon in xp scroller.
2021-06-14 13:39:50 -04:00
Marcel
1b36f6cab3
Merge branch 'aweinstock/forcemove-no-pushback' into 'master'
...
Don't apply e2e pushback during a forced movement character state.
See merge request veloren/veloren!2429
2021-06-14 14:42:01 +00:00
Marcel
4cafdb3bfd
Merge branch 'aweinstock/mining-skill-tree' into 'master'
...
Mining skill tree.
See merge request veloren/veloren!2406
2021-06-14 14:19:06 +00:00
Marcel
b0702d792a
Merge branch 'juliancoffee/asset_entity' into 'master'
...
EntityInfo assetization.
See merge request veloren/veloren!2382
2021-06-14 12:56:28 +00:00
juliancoffee
d5cbe27612
Responding to review
...
- make `skillset_builder::Preset` void enum and left comment about how to
extend it
- add `.with_default_equipment()` in case if preset is missing to `basic_summon`
loadout creation to match old `build_loadout()` behaviour
2021-06-14 15:40:02 +03:00
Avi Weinstock
1af9ac568f
Move force-movement e2e check so that it doesn't confer immunity to arrows.
2021-06-13 20:38:03 -04:00
Monty Marz
068d78bae8
Merge branch 'pfau/cactus_drink' into 'master'
...
Cactus Colada
See merge request veloren/veloren!2431
2021-06-13 20:03:58 +00:00
Avi Weinstock
9d4a65e8ac
Adjust mining xp numbers and add SkillGroupKind information to Outcome::ExpChange.
2021-06-13 14:34:42 -04:00
Monty Marz
01a04a80fa
icons and naming
2021-06-13 14:34:42 -04:00
Avi Weinstock
0e394029de
Mining skill tree.
2021-06-13 14:34:42 -04:00
Marcel Märtens
34f5ff62d4
implement a simple roundrobin to assure if multiple are spawned the older one has prio, spelling
2021-06-13 17:42:28 +02:00
