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

8841 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Wallis
ff57cb93bc Failed attempt to refactor playstate rendering 2021-06-20 21:57:42 +01:00
Ben Wallis
b636d7c9f9 removed empty line 2021-06-20 18:53:45 +01:00
Ben Wallis
1612b36753 Reworked veloren_dynlib initialisation 2021-06-20 18:52:28 +01:00
Ben Wallis
9fd5c6e124 Removed voxygen dependency on voxygen_dynlib. Refactored anim and egui hot-reloading init. 2021-06-20 18:35:24 +01:00
Ben Wallis
b4dd476318 Merge branch 'master' of https://gitlab.com/veloren/veloren into xvar/wgpu-egui 2021-06-20 17:37:03 +01:00
Ben Wallis
8ea677c8b9 Fixed dyn library prefix on linux 2021-06-20 17:36:54 +01: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
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
juliancoffee
ecd61df49b Tip how to make map with dungeons of same level 2021-06-19 23:32:54 +03: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
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
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
Ben Wallis
0cf42e9c84 Merge branch 'master' of https://gitlab.com/veloren/veloren into xvar/wgpu-egui 2021-06-18 22:04:36 +01:00
Ben Wallis
c8d17d9753 Addressed MR comments 2021-06-18 22:04:24 +01: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
Imbris
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
juliancoffee
6b335a105e balance scale to catch steel 2021-06-18 00:13:42 +03:00
juliancoffee
d4bf4bf51b Remove high tier ignots and big potions from trade 2021-06-18 00:03:51 +03:00
Ben Wallis
6fff845ae9 Upgraded egui_winit_platform to 0.8 2021-06-17 22:02:09 +01:00
juliancoffee
54b339862a tweak item_price_calculation coefficients 2021-06-17 23:49:43 +03:00
juliancoffee
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
Ben Wallis
71707f3ada Merge branch 'master' of https://gitlab.com/veloren/veloren into xvar/wgpu-egui 2021-06-17 21:36:38 +01:00
Ben Wallis
68b0d34a65 tidy 2021-06-17 21:36:24 +01:00
Joshua Barretto
0067cea560 Made /alias moderator-only 2021-06-17 19:55:46 +01:00