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
11,876 Commits 151 Branches 18 Tags 2.1 GiB
50d85940d8
Commit Graph

4384 Commits

Author SHA1 Message Date
Christof Petig
bf3eef6e1a remove dead use 2022-06-01 22:14:23 +02:00
Christof Petig
dd28dc81be humidity + clean up 2022-06-01 22:13:35 +02:00
Christof Petig
92ab095480 test and fix temperature handling 2022-06-01 22:13:35 +02:00
Christof Petig
59d876a654 pass humidity to meta, move smoke cycle to separate file 2022-06-01 22:13:34 +02:00
Christof Petig
f12f79439f fix negative values for RGB and vary dryness and strength according to biome 2022-06-01 22:13:34 +02:00
Christof Petig
827006e7e0 vary color, strength based on position, color on biome 2022-06-01 22:13:34 +02:00
Christof Petig
6ddedecc05 introduce smoke strength and color 2022-06-01 22:13:34 +02:00
Sam
5e57eabd11 Code changes and msm 2022-05-30 20:25:31 -04:00
N A
c09f070241 Change animal species to have only one inventory slot 2022-05-29 23:53:00 +00:00
Benoît du Garreau
6431c5567c Fix clippy error 2022-05-28 23:58:47 +02:00
Benoît du Garreau
f36e74e383 Fix deprecated function use 2022-05-28 23:53:30 +02:00
Benoît du Garreau
ca2ef3e813 Add comments 2022-05-28 23:32:16 +02:00
Benoît du Garreau
8488c7b25e Upgrade assets_manager to 0.8.0 and image to 0.24 
This removes a significant number of duplicated dependencies
 2022-05-28 23:18:31 +02:00
Ben Wallis
d56e0de392 Merge branch 'xvar/fix-charselect-bug' into 'master' 
Fixed handling of deleted characters on character select screen

Closes #1560

See merge request veloren/veloren!3408
 2022-05-28 18:12:49 +00:00
Ben Wallis
c001de7409 Fixed pressing enter on character creation screen attempting to log in instead of create the character. Fixed deleting a character with no characters remaining resulting in the deleted character still being selected internally. 2022-05-28 16:28:26 +01:00
Ben Wallis
34f580dfaa Introduced loot ownership rules to combat loot stealing by players 
* Added `LootOwner` component used to indicate that an `ItemDrop` entity is owned by another entity
* A loot winner is now calculated after EXP allocation using the EXP per entity for weighted chance distribution
* Used existing Inventory Full overitem text to show "Owned by {player} for {seconds}secs" when a pickup fails due to a loot ownership check
* Updated agent code to take into account loot ownership when searching for `ItemDrop` targets to pick up
* Added `loot` ECS system to clear expired loot ownerships
 2022-05-28 12:06:49 +00:00
Christof Petig
2bf8e1865f Skiing and ice skating 2022-05-27 17:19:52 +00:00
Imbris
ca1a27bd11 Merge branch 'imbris/update-tracy' into 'master' 
Update tracy

See merge request veloren/veloren!3400
 2022-05-27 02:50:24 +00:00
Imbris
5cf899c4fe Plot fixes in client and dynamic name fix in voxygen (tracy update) 2022-05-26 22:19:11 -04:00
Imbris
a366fc4512 Update tracy 2022-05-26 00:04:03 -04:00
Marcel
fb6a8e0360 Merge branch 'xMAC94x/network_error' into 'master' 
Pass network errors through the stack to display them in logs

See merge request veloren/veloren!3385
 2022-05-25 22:12:42 +00:00
Samuel Keiffer
b9c324a183 Merge branch 'tame_and_mount_special_casing' into 'master' 
Special case taming and mounting.

See merge request veloren/veloren!3354
 2022-05-24 02:09:45 +00:00
N A
d84a26dfd8 Special case taming and mounting. 2022-05-24 02:09:45 +00:00
Corvella
a9622fe28e Add a setting to toggle zooming in when charging bow 2022-05-23 23:09:47 +00:00
Marcel Märtens
fc735f509e fix a unrelated clippy issue that came up suddenly 2022-05-23 09:20:54 +02:00
Imbris
50c34e56ce Merge branch 'chucksys/chat-opacity-text' into 'master' 
Add chat window opacity value alongside slider

See merge request veloren/veloren!3377
 2022-05-19 03:48:20 +00:00
Sam
534c7dc8b9 Simplified item key (no assets) 2022-05-18 16:28:06 -04:00
Sam
46fe8604b7 Added search filtering to modular entries in crafting UI 2022-05-16 15:11:46 -04:00
Sam
066b8ef9fd Address feedback (no assets) 2022-05-16 15:11:43 -04:00
Sam
85c2a85817 Addressed review comments 2022-05-16 15:11:42 -04:00
Sam
13ea6dee93 Addressed second round of balance feedback (assets). 2022-05-16 15:11:40 -04:00
Sam
c0dd748bc7 Addressed second round of balance feedback (no assets). 2022-05-16 15:11:40 -04:00
Sam
95c3fdffa1 Addressed playtest feedback (no assets). 2022-05-16 15:11:39 -04:00
Sam
1b85258838 Crafting slots now properly check component recipe book to see if an input is valid. 2022-05-16 15:11:35 -04:00
Sam
64d07d02c4 Changed item definition id to better handle modular items. 2022-05-16 15:11:34 -04:00
Sam
37442b638c Changed component recipe book to generate some stuff automatically to avoid potential for stuff inside to become unsynced (no assets). 2022-05-16 15:11:33 -04:00
Sam
afd2c8730f Addressed most review comments (no assets). 2022-05-16 15:11:32 -04:00
Bryant Deters
777fcdf477 closing crafting menu clears crafting components in modular recipe [ci_skip] 2022-05-16 15:11:31 -04:00
Bryant Deters
cabde522b0 cleanup commented line [ci_skip] 2022-05-16 15:11:31 -04:00
Bryant Deters
0d4b05b256 text margin fix, removed some mutable variables, can_perform for modulars accounts for crafting sprites [ci skip] 2022-05-16 15:11:30 -04:00
Sam
f6bf8206ab Use new icons from Pfau 2022-05-16 15:11:30 -04:00
Monty Marz
c3f92622c1 bg icons 2022-05-16 15:11:29 -04:00
Sam
fceb48c3ac Removed vec allocation for component recipe iterators 2022-05-16 15:11:26 -04:00
Sam
a5a517916e Initial UI including ingredients in crafting modular components 2022-05-16 15:11:25 -04:00
Sam
085b18c07a Formatting tweaks to tooltips 2022-05-16 15:11:25 -04:00
Bryant Deters
075fee5190 modular component tooltips 2022-05-16 15:11:25 -04:00
Sam
d436362a8d Consolidated crafting UI for the primnary component of modular weapons. 2022-05-16 15:11:21 -04:00
Sam
5877334ed3 Tags are now generated for modular items. 2022-05-16 15:11:20 -04:00
Sam
aeac0f5ad6 Modular inputs now have tooltips. 2022-05-16 15:11:19 -04:00
Monty Marz
3d5e29b44d Ui 2022-05-16 15:11:18 -04:00
Sam
360e12be22 UI can display a preview of the modular weapon output. 2022-05-16 15:11:17 -04:00
Sam
8fc0138e84 Initial crafting UI for modular weapons. 2022-05-16 15:11:17 -04:00
Sam
bf348b7f43 Addressed further review. 2022-05-16 15:11:16 -04:00
Sam
94c19735ca Fixed broken stuff during rebase. 2022-05-16 15:11:16 -04:00
Sam
81c83c5e83 Items with components can now have their name modified by the components. Also addressed more review. NO ASSETS 2022-05-16 15:11:15 -04:00
Sam
524845b661 Addressed more comments on MR. 2022-05-16 15:11:15 -04:00
Sam
259db56ca6 Addressed more comments in MR review. 2022-05-16 15:11:14 -04:00
Sam
a9e9a70687 Changed ModularComponent to allow it to be more extensible. Overhauled random modular weapon function so that there is less runtime cost to generate one. NO ASSETS 2022-05-16 15:11:11 -04:00
Sam
b048179c0a Changed Item to have ItemBase instead of ItemDef. ONLY ASSETS. 2022-05-16 15:11:11 -04:00
Sam
08b7bb781f Changed Item to have ItemBase instead of ItemDef. NO ASSETS. 2022-05-16 15:11:10 -04:00
Sam
5bacf526ad Began addressing initial review of modular weapons. 2022-05-16 15:11:10 -04:00
Sam
2aad3f3961 Switched to item list as an input for modular components so that allowed items could be centralized. 2022-05-16 15:11:08 -04:00
Sam
38cb465722 Fixed loading of modular weapons from the loadout to work with nested components. 
Modular weapons can now be correctly dispalyed when wielded.
 2022-05-16 15:10:57 -04:00
Sam
0a38567e8d Modular weapons can now be properly displayed in the inventory. 2022-05-16 15:10:57 -04:00
Sam
762b3be3c3 Modular weapons can now be dropped as loot or assigned to enemies. 2022-05-16 15:10:56 -04:00
Sam
c01fe655f1 Added wood 2022-05-16 15:10:55 -04:00
Sam
d380a2dbaf Quality is now propogated through modular items from the quality of the components. 2022-05-16 15:10:55 -04:00
Monty Marz
c5b79021f8 Fix wrapping for ingredients text 2022-05-16 15:10:54 -04:00
Sam
405b9b2448 Modular weapons now have programmatically generated names. 2022-05-16 15:10:53 -04:00
Sam
4e89bc7485 Added test functions to assist in fixing unit tests that broke from changed functionality. 2022-05-16 15:10:52 -04:00
Sam
6620c1dd1f Added HandsKind to automatically resolve handedness of modular weapons. 2022-05-16 15:10:51 -04:00
Sam
85b7382487 Added handedness requirements to recipes and components. 2022-05-16 15:10:50 -04:00
Sam
77934c9214 Made changes to crafting to allow modular weapons to work as intended. 2022-05-16 15:10:48 -04:00
IsseW
bd53d0b354 fix wrong spelling 2022-05-16 00:06:57 +02:00
IsseW
fb7aa07b01 site command completion 2022-05-15 23:57:21 +02:00
Cheuk Yin Ng
0962d3d67e Add chat window opacity value alongside slider 2022-05-15 08:30:30 -07:00
holychowders
be0e322219 Remove "(Items)" from stealth stat descriptions. 2022-05-14 09:34:57 -05:00
holychowders
63f829be66 Add icon to stealth stat in Bag UI. 
- Thanks to Toaster for making the icon.
 2022-05-12 20:28:23 -05:00
holychowders
ff905fab95 Add stealth stat to Bag UI. NOTE: Needs icon. 2022-05-12 20:26:43 -05:00
Joshua Barretto
e02f8aee65 Merge branch 'zesterer/lod-objects' into 'master' 
LoD Objects (inc. Trees)

See merge request veloren/veloren!3367
 2022-05-11 14:56:12 +00:00
Joshua Barretto
01e1cb34b0 Fixed minor LoD issues 2022-05-11 15:00:44 +01:00
Joshua Barretto
9ac84c0a3a Improved LoD models 2022-05-11 12:20:42 +01:00
Joshua Barretto
5e1f16fb7a Better tree colours 2022-05-11 00:15:05 +01:00
Joshua Barretto
907ba3dcbc Added giant trees to LoD 2022-05-10 20:30:48 +01:00
Joshua Barretto
d4fd9d2d0e Added LoD houses 2022-05-10 19:19:46 +01:00
Joshua Barretto
7382aab13a Upped default LoD distance 2022-05-10 17:12:12 +01:00
Joshua Barretto
c7e51a6c59 Added frustum culling for LoD objects 2022-05-10 16:21:14 +01:00
Joshua Barretto
19d19df63c Flush LoD distance on login 2022-05-10 15:43:53 +01:00
Joshua Barretto
06300bc75f Updated changelog 2022-05-10 12:56:24 +01:00
Joshua Barretto
f35c98d1a1 Added LoD distance setting 2022-05-10 12:40:06 +01:00
Joshua Barretto
2d7aa1aaa3 Added no terrain pop experimental shader 2022-05-10 12:40:06 +01:00
Joshua Barretto
596ae73117 Added NoLodVoxels option 2022-05-10 12:40:06 +01:00
Joshua Barretto
2df01385d2 Voxelise trees 2022-05-10 12:38:37 +01:00
Joshua Barretto
1db7cc7fde LoD trees in snow are white 2022-05-10 12:38:36 +01:00
Joshua Barretto
cf346d05c1 Different kinds of tree 2022-05-10 12:38:36 +01:00
Joshua Barretto
ac0e7a7724 Use dedicated fragment shader 2022-05-10 12:38:36 +01:00
Joshua Barretto
b3126ca687 Initial implementation of LoD trees 2022-05-10 12:38:36 +01:00
holychowders
1ebbf335e1 Simplify stealth logic. Remove max item stealth upper limit and restore close to original curve. 2022-05-06 19:25:03 -05:00
holychowders
dc9dbc30b4 - Adjust Stats Diary UI to show stealth as a percentage from armor items. 
- `(Max)` is also shown when stealth from items is maxed out (currently
  30%).

Notes:
- FIXME: Someone more familiar with the different armor types may want to adjust their stealths.
  - In addition, the current max stealth sum from armor is `0.3`, beyond which no stealth effect is caused.
 2022-05-06 13:15:46 -05:00
Marcel Märtens
697673bcca update toolchain to nightly-2022-04-25 2022-05-03 15:22:28 +02:00