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
14,969 Commits 151 Branches 18 Tags 2.1 GiB
02aa740f72
Commit Graph

5437 Commits

Author SHA1 Message Date
Joshua Barretto
3420e7a227 Appease clippy 2024-01-15 19:07:19 +00:00
Joshua Barretto
5bc60f2436 Add LoD zone data to char select screen 2024-01-15 19:07:19 +00:00
Joshua Barretto
43d935a150 Render render LoD terrain on char select, remove old backdrop figure 2024-01-15 19:06:17 +00:00
Maxicarlos08
d6371f7f9b
Server rules i18n and rules button in character screen 2024-01-15 00:03:23 +01:00
Joshua Barretto
e4dbe50f39
Tick client when in server info menu 2024-01-15 00:03:23 +01:00
Joshua Barretto
f99bf91617
Added rules menu when connecting to server 2024-01-15 00:02:43 +01:00
juliancoffee
1748b5e76f Final(?) step to deprecating item names 2024-01-14 21:25:15 +02:00
juliancoffee
aba8ec7558 Implement item localization 
- Add Content::Key as proxy to Language::try_msg
- Add Content::Attr as proxy to Language::try_attr
- Extend ItemKey::TagExamples so it includes base asset id
- Implement ItemDesc::l10n using new Content variants
- Add all_items_expect() function to grab all items, because
  try_all_item_defs() covers only items in asset folder.

Required assets will go in next commit
 2024-01-14 21:25:15 +02:00
juliancoffee
18e507315f Add ItemDesc::l10n method 
- Add ItemL10n struct that is similar to ItemImgs except it holds i18n
  description and not items. ItemDesc::l10n uses this struct to provide
  common_i18n::Content for both names and descriptions.
  So far it only used in voxygen, but it can be used by rtsim in
  dialogues.
- Introduced new deprecation, ItemKind::Ingredient, because it uses
  item.name().
  It's not deleted, because it's used in inventory sorting, and our
  inventory sorting is, for some reason, server-side.
- Crafting UI also still uses deprecated item.name(), because again,
  sorting. It's probably will be easier to handle, because it's UI
  sorting and we can use localized names here, but still, it's a thing
  to discuss.
- Moved Item::describe() to voxygen/hud/util.

The most important thing to note is we don't want to completely delete
deprecated .name() and .description() along with corresponding fields
in ItemDef because ItemDef is now "public" API, exposed in plugins and I
don't want to break plugins before we actually implement i18n for them.
Otherwise, it would be basically impossible to use items in plugins.

What's left is actually fully implementing ItemDesc::l10n, create
item_l10n.ron and add fallback on current .name() and .description()
implementation.
 2024-01-14 21:25:15 +02:00
juliancoffee
75013cc04a Make sfx.ron use ItemKey 2024-01-14 21:25:15 +02:00
Darren Salt
140f7a0871 Allow either Enter or Return for sending a message. 2024-01-08 11:10:32 +00:00
Imbris
03e46de748 Merge branch 'imbris/construct-dispatcher-once' into 'master' 
Only construct specs::Dispatcher once

See merge request veloren/veloren!4239
 2024-01-06 02:47:37 +00:00
Pybit
f6204f9d04 Merge branch 'master' into 'More-potions' 
# Conflicts:
#   CHANGELOG.md
 2024-01-04 11:48:30 +00:00
Imbris
6c6b9181a5 Only construct specs::Dispatcher once 
* use version of shred that has an added SendDispatcher so we can
  construct the dispatcher and send it between threads (only State to
  remain sendable)
* move closure for adding systems from State::tick to the creation
  functions
* this does mean some voxygen systems always run instead of just in the
  session state, but that should not cause issues and we can always
  configure them to do nothing if needed
 2024-01-03 18:11:06 -05:00
Joaquin Tornello
0ecfbce4d2 Feat: Day duration slider on map creation UI (#1909) 2024-01-03 22:21:53 +00:00
Pybit
26520b51ef Added previously requested changes 2024-01-03 12:31:35 +00:00
Imbris
fc28629148 Convert to rgb earlier in screenshot process. 
Also add path information to logs when screenshot folder or file
creation fails.
 2024-01-01 16:45:44 -05:00
Imbris
35fc92f872 Merge branch 'screenshot' into 'master' 
Don't include an alpha channel when creating a screenshot file.

See merge request veloren/veloren!4222
 2024-01-01 21:41:41 +00:00
Samuel Keiffer
5bd089c56d Merge branch 'sam/remove-combo-melee' into 'master' 
Deprecated combo melee character state

See merge request veloren/veloren!4233
 2023-12-29 17:29:44 +00:00
Sam
8ee054a462 Fix tests 2023-12-29 11:50:18 -05:00
DaforLynx
0b62898060 Audio fixes and new music 2023-12-29 00:25:08 +00:00
Sam
f65d449aa3 Deprecated combo melee character state 2023-12-28 19:02:10 -05:00
flo
c123bdaef5 various_small_fixes 2023-12-27 07:30:22 +00:00
Darren Salt
4156dd56f3 Don't include an alpha channel when creating a screenshot file. 2023-12-21 17:14:07 +00:00
Christof Petig
5af8c4687e Merge branch 'christof/christmas23' into 'master' 
Christmas theme revival

See merge request veloren/veloren!4209
 2023-12-20 17:02:01 +00:00
flo
569ab5c5ed crustacean-skeleton and crab 2023-12-16 13:47:55 +00:00
Christof Petig
dd8850770e remove variation debugging output 2023-12-16 12:11:12 +01:00
Christof Petig
4b7f3d07d2 add hirdrasil ornament variants and fix clippy 2023-12-16 12:10:17 +01:00
Christof Petig
611b55b279 PRNG experiments 2023-12-15 17:27:15 +01:00
Isse
ba02d083da Merge branch 'isse/walk-toggle' into 'master' 
Roleplay stuff

See merge request veloren/veloren!4171
 2023-12-12 19:59:58 +00:00
Isse
96a3c81cbb fix captain dismounting and don't panic in RandomField::choose 2023-12-12 20:14:39 +01:00
Joshua Barretto
fbd72f7400 Better walking animation 2023-12-07 20:08:40 +01:00
Isse
b60ebd4131 don't show red text when walking 2023-12-07 20:08:03 +01:00
Isse
2097a499c7 cancel walking on some inputs 2023-12-07 20:08:03 +01:00
Isse
a3a19ecc3a tavern rtsim 2023-12-07 20:08:03 +01:00
Isse
4fa52db71d more work on tavern 2023-12-07 20:08:03 +01:00
Isse
eb2395a401 walk fixes 2023-12-07 20:08:03 +01:00
Isse
63e500d3d8 laying and steering animation 2023-12-07 20:08:02 +01:00
Isse
5320f83462 configurable walking speed 2023-12-07 20:08:02 +01:00
Hrom
de42ffdfd8 fixed perforate icon not displaying 2023-12-06 23:38:22 +01:00
HEIEnthusiast
933c897450 Renamed to potion of agility, burning potion to combustion 2023-12-05 14:15:54 -04:00
HEIEnthusiast
99b5571fd8 Renamed swiftness to retreating, changed model 2023-12-05 13:09:14 -04:00
Py bit
53600a941d Update mod.rs 2023-11-29 17:03:17 +00:00
HEIEnthusiast
db71625226 Merge branch 'master' of gitlab.com:veloren/dev/veloren into More-potions 2023-11-28 10:07:00 -04:00
Michał
14120232a0 Phoenix overhaul 2023-11-28 11:13:18 +00:00
maxicarlos08
c7ee737fef
Add hit_timing to BasicMelee 2023-11-27 21:28:12 +01:00
HEIEnthusiast
bb2adfb2e5 Removed strength and regeneration potions 2023-11-27 15:16:44 -04:00
HEIEnthusiast
783cfdc719 Merge branch 'master' into More-potions 2023-11-27 07:00:48 -04:00
HEIEnthusiast
59c3162c49 Merge branch 'master' of https://gitlab.com/veloren/dev/veloren 
12 commits behind master fix
 2023-11-27 06:32:18 -04:00
HEIEnthusiast
ac4101e70d Changed textures, added strength pot 2023-11-27 06:25:58 -04:00
Maxicarlos08
c689708ec9
fix stat UI bug while trading 2023-11-26 20:22:59 +01:00
HEIEnthusiast
0bb74f9efe Added swiftness and regeneration potions 2023-11-26 10:54:02 -04:00
Isse
31f67a97b3 clippy fix 2023-11-23 12:06:58 +01:00
Isse
88a7e1de86 better tab completion for uid 2023-11-23 11:08:21 +01:00
Isse
4d8bcf0a92 only preprocess for entity target argument 2023-11-23 11:04:30 +01:00
Isse
5a3e6316a5 fix tethering 2023-11-23 01:01:31 +01:00
Isse
51c67d7394 client shorthands 2023-11-22 23:40:13 +01:00
Isse
1071fd0bca entity targets 2023-11-22 22:40:56 +01:00
Sam
4e0e94b5c6 Removed spin melee character state 2023-11-16 19:17:38 -05:00
maxicarlos08
a5199a966a
Include required serde feature for enum-map in veloren-common 
This previously broke torvus builds, but worked fine for builds here
since veloren-rtsim enabled the serde feature.
 2023-11-16 21:47:44 +01:00
Maxicarlos08
17904d9387 crit_power -> precise_power 2023-11-14 18:07:01 -05:00
Sam
6814ce8134 Addressed review comments. 2023-11-14 18:07:00 -05:00
Sam
01d1e15be3 Fixed UI crash 2023-11-14 18:06:59 -05:00
Sam
62464dbe11 Removed crit chance stat 2023-11-14 18:06:58 -05:00
Sam
3f19c61426 Changed buffs from using hash maps to an enum map and a slot map. 2023-11-12 12:37:28 -05:00
Isse
48d95e7699 SnowGlitter experimental shader 2023-11-02 12:53:34 +01:00
Christof Petig
f73f52605f Support recipes and item images from plugins 2023-10-25 00:05:35 +02:00
Joshua Barretto
22b537a4e5 Fixed CI and incorrect vel 2023-10-21 14:58:13 +01:00
Joshua Barretto
ac7f6872db Fixed typo 2023-10-21 13:51:42 +01:00
Joshua Barretto
7589774967 Renamed tether renderer to rope, fixed tether lengths 2023-10-21 13:51:42 +01:00
Joshua Barretto
879a28fbb6 Fixed warnings 2023-10-21 13:51:41 +01:00
Joshua Barretto
deca7ae258 Finished adding tether graphics 2023-10-21 13:51:40 +01:00
Joshua Barretto
9a72d52c48 Began adding tether visuals 2023-10-21 13:49:04 +01:00
Joshua Barretto
5a41d7e33e Added cart, notion of rolling resistance (hacky) 2023-10-21 13:49:04 +01:00
DaforLynx
fd28f10dff Address comment by zesterer 2023-10-20 10:12:22 -07:00
jshipsey
1b8265803e comments addressed 2023-10-19 11:23:55 -04:00
jshipsey
d27c73ddb1 fmt 2023-10-19 00:17:50 -04:00
DaforLynx
350257c572 Fix lava sounds not playing, some adjustments to frequency 2023-10-19 00:14:14 -04:00
jshipsey
cf425a09c8 setup 2023-10-19 00:14:12 -04:00
Joshua Barretto
e81516a154 Log shader warnings 2023-10-18 21:50:40 +01:00
Joshua Barretto
cb2de226a2 Fixed tracing span ordering issue 2023-10-18 19:56:19 +01:00
Joshua Barretto
ba763f2da5 Make no terrain pop the default 2023-10-18 09:58:00 +01:00
Joshua Barretto
bf92d0287b Skip animating figures outside of the frustum 2023-10-18 09:58:00 +01:00
Christof Petig
e22046c5f4 Address zesterer's comments 2023-10-17 22:10:19 +02:00
Christof Petig
12ee21a289 first part of load items from plugin 2023-10-17 21:07:23 +02:00
Justin Shipsey
0d5017932d Merge branch 'zesterer/backpack-fixes' into 'master' 
Added wielding for wallrunning

See merge request veloren/veloren!4133
 2023-10-16 20:00:06 +00:00
Isse
b862a7aa22 Merge branch 'isse/fix-div0' into 'master' 
Fix divide by zero in state::apply_terrain_changes_internal

See merge request veloren/veloren!4140
 2023-10-16 11:35:17 +00:00
Isse
3a61fb15b2 fix divide by zero in state::apply_terrain_changes_internal 2023-10-15 23:00:36 +02:00
Samuel Keiffer
e1767ab3ad Merge branch 'sam/bezier-beam' into 'master' 
Converted beam system from spherical shell wedges to quadratic beziers

See merge request veloren/veloren!4137
 2023-10-15 15:42:02 +00:00
Joshua Barretto
e6ca99cbb4 Fixed rolling limbs 2023-10-15 15:53:34 +01:00
Joshua Barretto
eec60a3277 Improved walking animations 2023-10-15 15:33:51 +01:00
Joshua Barretto
b21ccbf480 Reduced shoulder bopping 2023-10-15 12:21:20 +01:00
Sam
ef5e37a64d Converted beam system from spherical shell wedges to quadratic beziers 2023-10-14 21:46:28 -04:00
Joshua Barretto
c327d0cc85 Better wielded rolling 2023-10-14 21:35:54 +01:00
Raul Wagner Costa
46cf1f1914 Linearize light colors on the CPU 2023-10-14 18:10:35 +00:00
Joshua Barretto
748cde14be Factored out common lantern animation 2023-10-14 15:46:20 +01:00
Joshua Barretto
30ecc997ea Factor tool back animation code out 2023-10-14 15:06:08 +01:00
Joshua Barretto
03f698034b Nicer running 2023-10-14 14:27:01 +01:00
Joshua Barretto
e293de5bae Added wielding for wallrunning 2023-10-14 12:27:08 +01:00
Joshua Barretto
32b0b33abe Merge branch 'zesterer/backpack-fixes' into 'master' 
Make backpacks distinct ArmorKinds, fix visual offsets of carried weapons

See merge request veloren/veloren!4131
 2023-10-13 22:21:53 +00:00