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
13,652 Commits 151 Branches 18 Tags 2.1 GiB
60dbcf86f9
Commit Graph

5009 Commits

Author SHA1 Message Date
Imbris
1d51aae3b2 Start attempt to premultiply alpha on the GPU. 2023-04-08 00:28:31 -04:00
Imbris
7538b04348 Operate on 4 pixels at a time when premultiplying alpha to speed things up a little. 2023-04-08 00:28:31 -04:00
Imbris
f62c2cde70 Use fast-srgb8 crate to efficiently convert between non-linear srgb u8 and 
linear f32 values for performing alpha premultiplication on the CPU.
 2023-04-08 00:28:31 -04:00
Imbris
eb6d16b02c Rename draw_graphic -> prepare_graphic since it is no longer always 
specifically rendering an image at the provided dimensions. Start
working on alpha premultipication which is necessary for being able to
properly sample colors on the GPU with bilinear filtering. Various
tweaks to comments and misc changes.
 2023-04-08 00:28:31 -04:00
Imbris
69a1a661b6 fixes and tweaks (various minor changes related to UI image scaling on 
GPU)
 2023-04-08 00:28:31 -04:00
Imbris
d62bf8a790 init (scaling UI images during sampling on the GPU instead of on the CPU) 2023-04-08 00:28:28 -04:00
Imbris
e20cf5f14f Reduce rand::thread_rng calls, document MeleeConstructor scaled field more, remove extra stances.get() in hud/mod.rs 2023-04-07 01:59:41 -04:00
Samuel Keiffer
162509e1c9 Merge branch 'sam/durability' into 'master' 
Durability

See merge request veloren/veloren!3509
 2023-04-06 22:42:52 +00:00
Hudson
e03406b103 fixed a bug where if a group member picks up an item, then the player picks up an item, it would display the incorrect number of items picked up. example: group member picks up an apple, then player picks up an apple, the ui would display that the player picked up two apples, instead of the group member picking up one and the player picking up one 2023-04-06 13:43:11 -05:00
Hudson
4881d2fd8b fixed a bug where if a group member picks up an item, then the player picks up an item, it would display the incorrect number of items picked up. example: group member picks up an apple, then player picks up an apple, the ui would display that the player picked up two apples, instead of the group member picking up one and the player picking up one 2023-04-06 12:40:08 -05:00
Monty Marz
29a7520a48 adjusted death message, fixed repair bench text 2023-04-06 10:57:17 -04:00
Sam
132f26dbc0 Addressed review 2023-04-06 10:57:16 -04:00
Sam
00710a4eb0 Fixed csv tools 2023-04-06 10:57:13 -04:00
Sam
e4ebd17363 Addressed feedback 2023-04-06 10:57:12 -04:00
Sam
ca879173be Added a repair equipped and a repair all button. Cleaned up some hacks that used to exist. 2023-04-06 10:56:55 -04:00
Sam
658de93c59 Repairing UI 2023-04-06 10:56:53 -04:00
Sam
536d88a2c7 Repair costs scale based on how damaged the item is. 2023-04-06 10:54:50 -04:00
Sam
0966753699 Added repair recipes 2023-04-06 10:54:48 -04:00
Sam
c3f5bc13f1 Equipment can now be repaired at sprites in town. 2023-04-06 10:54:48 -04:00
Sam
a555e08d0b Added durability to item tooltips 2023-04-06 10:54:47 -04:00
Sam
df13741be9 Durability system in place 2023-04-06 10:54:46 -04:00
Christof Petig
e60aace448 realize zesterers proposal 2023-04-05 00:11:26 +02:00
Christof Petig
f4a87e9f0b cargo fmt 2023-04-04 23:47:31 +02:00
Christof Petig
8d2b9b9a9c single file orichalcum armor 2023-04-04 23:46:20 +02:00
Christof Petig
5cb974f770 cargo fmt 2023-04-04 23:46:20 +02:00
Christof Petig
76baf491ec support model indices for humanoids 2023-04-04 23:46:20 +02:00
Christof Petig
0b8bc507ac fix clippy 2023-04-04 23:46:20 +02:00
Christof Petig
9b3bf4c3c8 initial support for multiple models in one vox file 2023-04-04 23:46:20 +02:00
Avi Weinstock
908b2a62fa Change item color in details mode. 2023-04-03 15:40:34 -04:00
Avi Weinstock
6899023fde Sort merchant inventories lexicographically by (quality, name, quantity) 
in details mode.
 2023-04-03 14:43:14 -04:00
Avi Weinstock
8facf7b58d Add a list mode to inventories to make it easier to see item names at merchants. 2023-04-03 14:43:14 -04:00
Joshua Barretto
17cdd3e38d Merge branch 'zesterer/choose-starting-site' into 'master' 
Allow new players to choose their starting site

See merge request veloren/veloren!3848
 2023-04-02 00:45:25 +00:00
Joshua Barretto
ab5561df61 Removed redundant things 2023-04-02 01:09:12 +01:00
Monty Marz
33e643fbfd fmt 2023-04-02 01:21:10 +02:00
Monty Marz
d1f6db9da6 different site name col 2023-04-02 00:55:21 +02:00
Sam
6849f9fc21 Fix function name typo 2023-04-01 18:11:16 -04:00
Joshua Barretto
33ebb0a4a3 Make clippy happy 2023-04-01 22:55:45 +01:00
Sam
352d34557e Fix modular crafting window showing an item output when it is not possible to craft two components together. 2023-04-01 17:22:01 -04:00
Sam
2e6d55a78b Use topographic map for town selection screen. 2023-04-01 17:10:44 -04:00
Monty Marz
ca18da8061 UI tweaks 2023-04-01 21:54:48 +02:00
Maxicarlos08
ac377e2bbf
Hide invites comming from muted players 2023-04-01 18:45:19 +02:00
Joshua Barretto
19db823092 Proper next/prev site buttons 2023-04-01 12:34:58 +01:00
Joshua Barretto
0d7ee4479b Limit starter sites to towns 2023-03-31 21:31:01 +01:00
Joshua Barretto
6add1b851d Simplified map drawing 2023-03-31 20:44:59 +01:00
Joshua Barretto
0f7648aadb Better use of space on char create screen 2023-03-31 18:08:12 +01:00
Joshua Barretto
c28e61383d Added target to starting site map 2023-03-31 16:25:24 +01:00
Joshua Barretto
45644da98a Don't display the world map on character edit 2023-03-31 14:36:30 +01:00
Joshua Barretto
acec45b756 Initial implementation of starting site choice 2023-03-31 14:24:14 +01:00
Monty Marz
d1a7884ac8 Merge branch 'more_spot_things' into 'master' 
grave models, spot fixes, sword overlay

See merge request veloren/veloren!3842
 2023-03-31 02:57:39 +00:00
Isse
c34e5ad4ed Small fixes 2023-03-29 23:11:59 +00:00
Monty Marz
e4c5e50fb2 grave models, spot fixes, sword overlay 2023-03-29 13:10:49 +02:00
Samuel Keiffer
a737a1862c Merge branch 'sam/sword-balance-0' into 'master' 
Sword Tweaks

See merge request veloren/veloren!3838
 2023-03-29 01:26:33 +00:00
Sam
c9af470cc7 Final tweaks 2023-03-28 20:55:21 -04:00
flo
aec35a4792 bird_medium_wing_tweaks 2023-03-27 19:13:19 +00:00
Sam
cdaf9e5c0e Ability changes 2023-03-26 21:41:22 -04:00
Sam
5c675fdbe2 Addressed review 2023-03-21 20:18:34 -04:00
Monty Marz
3e37586ba5 icons 2023-03-21 20:18:32 -04:00
Sam
e962690fb8 Tweaks to various stats and earth splitter animation. 2023-03-21 20:18:31 -04:00
Sam
610d47f787 Effect power now affects more than just poise 2023-03-21 20:16:55 -04:00
Sam
1a58b7a8d4 Balance tweaks 2023-03-21 20:13:48 -04:00
Sam
868a42ba39 Addressed UX feedback 2023-03-21 20:10:40 -04:00
Sam
acde417ca7 Abilities that require a particular stance will be greyed out when not in that stance. 2023-03-21 20:08:21 -04:00
Sam
7386257854 Appease CI 2023-03-21 20:07:37 -04:00
Sam
3caa9dc529 Stances can now be left by interacting with the buff bar. 2023-03-21 20:03:22 -04:00
Sam
34168d9c76 Advanced AI for every stance. 2023-03-21 20:03:21 -04:00
Sam
e31668b188 Fixed dynlib features to not have UB when allocating. 2023-03-21 20:03:20 -04:00
Sam
7365fcb530 Rolls cancel recover at the cost of additional energy, sitting ends active stances. 2023-03-21 20:03:15 -04:00
Monty Marz
6b5ae2b6fe Update sword_bg.png 
positioning, wording, more icons

positioning, first icons
 2023-03-21 19:59:06 -04:00
Sam
39b30b3458 Decontextualized some sword abilities, added UI for sword skill tree. 2023-03-21 19:59:05 -04:00
Sam
f43d25d3fe Ability icons 2023-03-21 19:59:04 -04:00
Sam
27463758e5 Finisher abilities 2023-03-21 19:59:03 -04:00
Sam
86dfa34ec9 Cleaving stance required abilities 2023-03-21 19:59:00 -04:00
Sam
fed96b2e15 Crippling stance required abilities 2023-03-21 19:58:13 -04:00
Sam
c3026d388a Defensive stance required abilities 2023-03-21 19:58:11 -04:00
Sam
69665b5418 Agility stance required abilities 2023-03-21 19:56:35 -04:00
Sam
a3d655970e Heavy stance required abilities 2023-03-21 19:56:32 -04:00
Sam
e73236819a Cross cut 2023-03-21 19:39:42 -04:00
Sam
d64c155115 Cascade 2023-03-21 19:39:41 -04:00
Sam
f8c246e5fc Skewer 2023-03-21 19:39:41 -04:00
Sam
cdaff6bec1 Fell strike 2023-03-21 19:39:40 -04:00
Sam
e0a7449a99 Crescent slash 2023-03-21 19:39:40 -04:00
Sam
fce9211d49 Secondaries for all stances 2023-03-21 19:39:39 -04:00
Sam
596fe715b8 Cleaving stance skill abilities. 2023-03-21 19:39:39 -04:00
Sam
070c6d94a5 Crippling stance skill abilities. 2023-03-21 19:39:38 -04:00
Sam
d544010c05 Defensive stance skill abilities. 2023-03-21 19:39:38 -04:00
Sam
c23139d501 Agile stance skill abilities. 2023-03-21 19:39:37 -04:00
Sam
ed0de15a5a Heavy stance skill abilities. 2023-03-21 19:39:35 -04:00
Sam
57806d7be9 Sword M1 abilities 2023-03-21 19:39:22 -04:00
Sam
61f0b424b9 Old sword mostly torn out, new sword framework in place 2023-03-21 19:39:22 -04:00
Sam
7ec9a7677f Stances change secondary abilities now. Contextual abilities try to fallback to no context if skill not owned for contextual ability. 2023-03-21 19:38:18 -04:00
Sam
b376228d45 Primary and secondary abilities can now be contextual. BasicStance character state added. 2023-03-21 19:38:15 -04:00
Sam
9875008efa Added stance component that persists even after sheathing weapon (does not yet work with M1 replacement). 2023-03-21 19:29:34 -04:00
flo666
897d1e5fe5 fix_ngoubou_jaw 2023-03-20 22:07:23 +01:00
Imbris
61cb0ad39b Merge branch 'imbris/small-tweaks' into 'master' 
Various small tweaks / fixes

Closes #1475

See merge request veloren/veloren!3817
 2023-03-18 00:52:20 +00:00
Imbris
94dd8c2b70 Address review on 3817 2023-03-17 20:17:46 -04:00
flo666
472ef6b823 fix_husk_brute_singlestrike 2023-03-15 20:32:22 +01:00
Imbris
ebffe9317c Merge branch 'catb0t/zoom-defaultbind' into 'master' 
Remove default binding for Camera Zoom Lock

See merge request veloren/veloren!3823
 2023-03-13 06:15:49 +00:00
cat stevens (catb0t)
e99d2e7ca3 Remove default binding for Camera Zoom Lock 2023-03-13 06:15:49 +00:00
Ben Wallis
45c8934b79 Merge branch 'xvar/queue-char-deletes' into 'master' 
Changed character deletion to go via batch update

See merge request veloren/veloren!3562
 2023-03-12 23:21:54 +00:00
Ben Wallis
6eedc02286 Changed character deletion to go via batch update 2023-03-12 23:21:53 +00:00