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,978 Commits 151 Branches 18 Tags 2.1 GiB
b499cf2c58
Commit Graph

8978 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Barretto
288f2c13d4 Enable strafing in first-person mode 2021-06-21 13:27:19 +01:00
Justin Shipsey
c744cd4365 Merge branch 'donovanlank/Cool_Blue_Lantern' into 'master' 
made it so Cool Blue Lantern is actually blue

See merge request veloren/veloren!2474
 2021-06-21 05:37:49 +00:00
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
Marcel
4e600814ee Merge branch 'yusdacra/chore/nix' into 'master' 
build(nix): fix git ref not found and git lfs check

See merge request veloren/veloren!2480
 2021-06-20 22:54:37 +00:00
Scott Williams
80c45b6396 Added another .replace 2021-06-20 22:55:58 +01:00
Dominik Broński
3f45f7f250 Merge branch 'jshipsey-master-patch-07838' into 'master' 
Update difficulty_distribution.ron

See merge request veloren/veloren!2483
 2021-06-20 20:40:07 +00:00
Justin Shipsey
667e667ac8 Update difficulty_distribution.ron 2021-06-20 19:42:21 +00:00
Dominik Broński
b046541b69 Merge branch 'christof/trade_optimization' into 'master' 
Accelerate econsim using arrays instead of hashmaps

See merge request veloren/veloren!2216
 2021-06-20 16:00:37 +00:00
Christof Petig
79d7e79776 Accelerate econsim using arrays instead of hashmaps 2021-06-20 16:00:37 +00:00
Avi Weinstock
0f9181cbcb Address MR 2482 comments. 
- Change lava density to 3x water density.
- Use `ServerEvent::Buff` instead of modifying the buff component directly.
- Revert commented-out changes to fluid shaders.
 2021-06-20 11:32:05 -04:00
Samuel Keiffer
b37106e71f Merge branch 'juliancoffee/hot_reload_dungeon_difficulty' into 'master' 
Add config file for dungeon distribution

See merge request veloren/veloren!2481
 2021-06-20 04:07:26 +00:00
juliancoffee
0ec6a4e5ff Create distribution map for dungeons 
* tl;dr T0 - 27%, T1/T2 - 22%, T3/T4 - 11%, T5 - 5%.
Before every dungeon had 16% chance to be created.
 2021-06-20 00:14:54 +03:00
Avi Weinstock
f1a1160b80 Make lava solid w.r.t. rendering while still being liquid w.r.t. physics. 2021-06-19 16:52:21 -04:00
juliancoffee
ecd61df49b Tip how to make map with dungeons of same level 2021-06-19 23:32:54 +03:00
Avi Weinstock
2226a4c6a9 Add lava to caves, which sets you on fire if you swim in it. Currently requires uncommenting #define LAVA in the shaders, and only looks good with cheap fluid mode. 2021-06-19 16:31:21 -04:00
juliancoffee
e5c63b2ca7 Add config file for dungeon distribution 
- Now you can specify probability of "spawn" of dungeon with specific
difficulty
 2021-06-19 23:26:13 +03:00
Yusuf Bera Ertan
81bc3d1966
build(nix): fix git ref not found and git lfs check 2021-06-19 22:05:22 +03: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
83c49895ae Improve rendering spans for tracy 2021-06-19 04:27:51 -04:00
Imbris
315ab872f5 add prof_span to hud elements 2021-06-19 04:27:51 -04: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
044b2316a6 Eliminate strange wait time of ~1 ms during message handling on the 
client where nothing seemed to be occuring
 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
Imbris
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
juliancoffee
41b6d80635 Add CHANGELOG 2021-06-19 10:47:45 +03:00
juliancoffee
7bf8c67808 Don't spawn enemies in boss room 2021-06-19 10:47:45 +03:00
juliancoffee
57649a2e90 tweak clay_golem HP 2021-06-19 10:47:45 +03:00
juliancoffee
573607c32a Nerf golem laser dmg and ori_rate, make it fire 
+ Make laser state duration lower
 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
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
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
36fa8bf4f7 Use Golem Shockwave only after loosing 30% health 
+ Make shockwave buildup longer
 2021-06-18 22:32:43 +03:00
Imbris
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
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
68d88ea271 Switched to new CI cache image 2021-06-18 12:59:15 +01:00
Joshua Barretto
747ef50a58 Removed .jpeg as valid image format (to encourage consistency) 2021-06-18 12:42:08 +01:00
Joshua Barretto
f6d64a424f Added JPEG backgrounds 2021-06-18 12:28:55 +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
8b44f7ed34 Add non-exploadable crafting stations to CHANGELOG 2021-06-18 13:10:27 +03:00
juliancoffee
288a7a020b Proof of concept non-explodable sprites 2021-06-18 13:10:27 +03:00
Imbris
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
DaforLynx
c85238014a More npc sfx 2021-06-18 06:24:57 +00:00
Imbris
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
Imbris
15bf815750 Fix error message when no connection attempts succeed 2021-06-17 23:29:49 -04:00