Commit Graph

8855 Commits

Author SHA1 Message Date
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
380c58b6fc Merge branch 'imbris/init-error' into 'master'
Log the raw client error at the ERROR level and include the dates in the...

See merge request veloren/veloren!2464
2021-06-19 07:53:16 +00:00
41b6d80635 Add CHANGELOG 2021-06-19 10:47:45 +03:00
7bf8c67808 Don't spawn enemies in boss room 2021-06-19 10:47:45 +03:00
57649a2e90 tweak clay_golem HP 2021-06-19 10:47:45 +03:00
573607c32a Nerf golem laser dmg and ori_rate, make it fire
+ Make laser state duration lower
2021-06-19 10:47:45 +03:00
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
ec5a4c61d9 Merge branch 'juliancoffee/quick_trading_balancing' into 'master'
trading.ron rebalance

See merge request veloren/veloren!2471
2021-06-19 01:10:18 +00:00
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
384409a1ed Load ori_rate for BasicBeam from assets
+ make fire turret ori_rate slower
2021-06-18 22:33:00 +03:00
36fa8bf4f7 Use Golem Shockwave only after loosing 30% health
+ Make shockwave buildup longer
2021-06-18 22:32:43 +03:00
4dc14dbe66 Merge branch 'juliancoffee/fix_common_build' into 'master'
use bg_main.jpg instead of bg_main.png in common/build.rs

See merge request veloren/veloren!2477
2021-06-18 18:11:05 +00:00
9a5f749bc7 use bg_main.jpg instead of bg_main.png 2021-06-18 20:41:18 +03:00
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
05c375a8b0 Merge branch 'zesterer/meta' into 'master'
Optimising for size

See merge request veloren/veloren!2468
2021-06-18 12:35:16 +00:00
68d88ea271 Switched to new CI cache image 2021-06-18 12:59:15 +01:00
747ef50a58 Removed .jpeg as valid image format (to encourage consistency) 2021-06-18 12:42:08 +01:00
f6d64a424f Added JPEG backgrounds 2021-06-18 12:28:55 +01:00
0265da1074 Added support for JPEG backgrounds 2021-06-18 12:27:39 +01:00
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
294b6e394a Renamed command event 2021-06-18 11:31:06 +01:00
8b44f7ed34 Add non-exploadable crafting stations to CHANGELOG 2021-06-18 13:10:27 +03:00
288a7a020b Proof of concept non-explodable sprites 2021-06-18 13:10:27 +03:00
f4f06f581c Merge branch 'DaforLynx/more-npc-sfx' into 'master'
More npc sfx

See merge request veloren/veloren!2473
2021-06-18 06:24:57 +00:00
c85238014a More npc sfx 2021-06-18 06:24:57 +00:00
338109149f Merge branch 'imbris/error-message-fix' into 'master'
Fix error message when no connection attempts succeed

See merge request veloren/veloren!2465
2021-06-18 04:00:28 +00:00
15bf815750 Fix error message when no connection attempts succeed 2021-06-17 23:29:49 -04:00
247606f8d5 Log the raw client error at the ERROR level and include the dates in the message displayed in the UI 2021-06-17 22:20:40 -04:00
fb157082a8 made it so Cool Blue Lantern is actually blue 2021-06-17 18:40:29 -07:00
6b335a105e balance scale to catch steel 2021-06-18 00:13:42 +03:00
d4bf4bf51b Remove high tier ignots and big potions from trade 2021-06-18 00:03:51 +03:00
54b339862a tweak item_price_calculation coefficients 2021-06-17 23:49:43 +03:00
f8008afa85 trading.ron rebalance
- Name all section in trading.ron
- Balance post-meat materials
- Make gems more rarer and expensive
2021-06-17 23:46:52 +03:00
0067cea560 Made /alias moderator-only 2021-06-17 19:55:46 +01:00
96cbf60c3f Made commands a distinct ClientMsg to avoid possible sanitisation problems for clients 2021-06-17 19:55:21 +01:00
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
1af6f685d1 Enabled debug lines for Veloren crates only to significantly reduce binary size 2021-06-17 15:19:25 +01:00
f132c3fcb4 Merge branch 'DaforLynx/initial-hurt-sfx' into 'master'
Added npc hurt sfx

See merge request veloren/veloren!2467
2021-06-17 05:49:09 +00:00
9a5b95bc16 Added npc hurt sfx 2021-06-17 05:49:09 +00:00
befa91fdf9 Merge branch 'slipped/stretchcontent' into 'master'
buffs to stretch progression

See merge request veloren/veloren!2447
2021-06-17 04:05:09 +00:00
a42e6e20b8 basilisk tweaks 2021-06-16 23:28:25 -04:00
0941f03608 buffs to stretch progression 2021-06-16 20:50:46 -04:00
6097bf0b1d Merge branch 'capucho/gpu-poll' into 'master'
cleanup gpu resources on maintain

See merge request veloren/veloren!2466
2021-06-16 20:30:30 +00:00
9454c34cc2 Submit queue when maintaining and minimized 2021-06-16 20:22:33 +01:00
c63cf5f734 Merge branch 'zesterer/grunts' into 'master'
Utterances and sound optimisation

See merge request veloren/veloren!2458
2021-06-16 17:10:54 +00:00
b8749dc219 Added more cow noises, prepare for merge 2021-06-16 17:23:54 +01:00
9510869870 Significantly more efficient sound effect processing, more NPC sounds 2021-06-16 17:23:22 +01:00
e3c44ba7fe More voice kinds, more opportunities for sounds 2021-06-16 17:23:22 +01:00
fb51fd3230 Emit sound from head 2021-06-16 17:23:22 +01:00
0ef29a6989 VoiceKind for better sound effect specs 2021-06-16 17:23:22 +01:00