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,825 Commits 151 Branches 18 Tags
Commit Graph

8825 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Barretto
8e13e53abb Enable strafing in first-person mode 2021-06-21 13:27:19 +01:00
Justin Shipsey
593dda2043 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
5288b2982e 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
1de3dd515c 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
0b4f568ea0 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
326ecf868c Added another .replace 2021-06-20 22:55:58 +01:00
Dominik Broński
980e9b4885 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
a11284edd3 Update difficulty_distribution.ron 2021-06-20 19:42:21 +00:00
Dominik Broński
eb44d4b7d8 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
11d9b93684 Accelerate econsim using arrays instead of hashmaps 2021-06-20 16:00:37 +00:00
Samuel Keiffer
94336dbed1 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
5491902a1c 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
9cf83dc6e0 Tip how to make map with dungeons of same level 2021-06-19 23:32:54 +03:00
juliancoffee
7a03c689f6 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
ef97c4d57f
build(nix): fix git ref not found and git lfs check 2021-06-19 22:05:22 +03:00
Samuel Keiffer
0c85a4e7ea 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
e40a6eb5b3 Improve rendering spans for tracy 2021-06-19 04:27:51 -04:00
Imbris
30914f23f2 add prof_span to hud elements 2021-06-19 04:27:51 -04:00
Imbris
156e2e86b5 Remove tracy features that are no longer needed now that macros have been fixed 2021-06-19 04:27:50 -04:00
Imbris
3e9c3a20e0 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
fa5b3dead5 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
7b962beda8 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
9dfa492809 Add CHANGELOG 2021-06-19 10:47:45 +03:00
juliancoffee
0fecde103d Don't spawn enemies in boss room 2021-06-19 10:47:45 +03:00
juliancoffee
08ae31fb8b tweak clay_golem HP 2021-06-19 10:47:45 +03:00
juliancoffee
0ac97ed156 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
d3195b4ead 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
dc9e123ff8 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
6949716649 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
97167a94d0 Load ori_rate for BasicBeam from assets 
+ make fire turret ori_rate slower
 2021-06-18 22:33:00 +03:00
juliancoffee
27e309fb19 Use Golem Shockwave only after loosing 30% health 
+ Make shockwave buildup longer
 2021-06-18 22:32:43 +03:00
Imbris
fb12955e4b 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
9bffa6f9e1 use bg_main.jpg instead of bg_main.png 2021-06-18 20:41:18 +03:00
Joshua Barretto
0d3cd7897f 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
493e0c9b2e 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
570ad841c8 Switched to new CI cache image 2021-06-18 12:59:15 +01:00
Joshua Barretto
6f6a7e3617 Removed .jpeg as valid image format (to encourage consistency) 2021-06-18 12:42:08 +01:00
Joshua Barretto
bb24068208 Added JPEG backgrounds 2021-06-18 12:28:55 +01:00
Joshua Barretto
38907a8bf2 Added support for JPEG backgrounds 2021-06-18 12:27:39 +01:00
Joshua Barretto
d4dd756eea 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
c3c8fcc54a Renamed command event 2021-06-18 11:31:06 +01:00
juliancoffee
8b45ea026e Add non-exploadable crafting stations to CHANGELOG 2021-06-18 13:10:27 +03:00
juliancoffee
342e0b4c45 Proof of concept non-explodable sprites 2021-06-18 13:10:27 +03:00
Imbris
4994b9a3d1 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
ae84557cca More npc sfx 2021-06-18 06:24:57 +00:00
Imbris
27dc42b855 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
8059bda7dd Fix error message when no connection attempts succeed 2021-06-17 23:29:49 -04:00
Imbris
1067baeecf 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
donovanlank
ff403ae7b5 made it so Cool Blue Lantern is actually blue 2021-06-17 18:40:29 -07:00
juliancoffee
f4c7434e5d balance scale to catch steel 2021-06-18 00:13:42 +03:00