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
4,865 Commits 151 Branches 18 Tags 2.1 GiB
c6251a956a
Commit Graph

2099 Commits

Author SHA1 Message Date
Monty Marz
9cffb61429 colors 2020-08-08 01:12:35 +02:00
Imbris
d856c20225 Integrate groups with chat groups 2020-08-08 01:12:35 +02:00
Imbris
ef4b221706 Make entity targeting easier, add EXP sharing 2020-08-08 01:12:35 +02:00
Imbris
0a8f148559 Fixes and tweaks for groups 2020-08-08 01:12:35 +02:00
Monty Marz
d9e3937a82 Basic UI 
Basic ui for groups and group window
 2020-08-08 01:12:35 +02:00
Imbris
6aba810517 Add key to select entities 2020-08-08 01:09:02 +02:00
Imbris
1741384d00 Add entity targeting 2020-08-08 01:09:01 +02:00
Joshua Yanovski
16aa9ef40a Fix hotloading and Clippy. 2020-08-08 00:53:02 +02:00
Joshua Yanovski
3dc973e0be Major speedups with SIMD. 2020-08-07 23:50:27 +02:00
Marcel Märtens
599a9a76fc add a translation test that verifys that all language RON files are parseable (without any git involved) 2020-08-07 21:31:34 +02:00
Joshua Yanovski
fba64a7d93 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-08-07 13:23:19 +02:00
Joshua Yanovski
76429d00ee Add clippy.toml. 2020-08-07 13:23:10 +02:00
Joshua Yanovski
c79f512f84 Fix all clippy issues, clean up Rust code. 2020-08-07 11:55:20 +02:00
Imbris
bdd255beb6 Tooltips now disappear when hovered and no longer appear on top of the mouse position (e.g. in the bottom of the inventory) 2020-08-07 03:30:17 -04:00
Imbris
d74a1d371e Avoid cloning armor/tool in tooltip generation, add temporary case for legacy item descriptions 2020-08-07 01:25:51 -04:00
Joshua Yanovski
6f90e010b3 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes 2020-08-07 06:47:30 +02:00
Joshua Yanovski
77a8c7c267 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-08-07 06:47:10 +02:00
nepo
cb65070aba nepo/dullahan 2020-08-07 03:56:59 +00:00
jshipsey
5929cfa5c7 fixed in-hand arrow bug 2020-08-06 20:47:27 -04:00
Yusuf Bera Ertan
af72c46c02
change treeculler crate from git to published version 2020-08-07 01:53:49 +03:00
Joshua Yanovski
b44e442325 Miscellaneous performance improvements. 2020-08-06 13:40:35 +02:00
Imbris
c2f3e1b47f Revert "Merge branch 'BottledByte/ability_design' into 'master'" 
This reverts merge request !1264
 2020-08-06 08:04:03 +00:00
Imbris
a0b1259b7e Merge branch 'BottledByte/ability_design' into 'master' 
Add ability IDs and use them in GUI

See merge request veloren/veloren!1264
 2020-08-06 04:44:51 +00:00
BottledByte
34c87d7a86 Add ability IDs and use them in GUI 2020-08-05 23:00:43 +02:00
BottledByte
ab1c43be84 Dehardcoded LanternKind, Consumable and Ingredient, fixed Sceptre hotbar 
Also fixed two wrong asset references and did some .ron formatting
 2020-08-05 01:21:42 +02:00
Joshua Yanovski
be37acf287 Merge remote-tracking branch 'origin/master' into sharp/small-fixes 2020-08-03 05:49:27 +02:00
Imbris
c118765477 Merge branch 'sharp/os-x-resize' into 'master' 
Fix window resizing on OS X.

See merge request veloren/veloren!1256
 2020-08-03 03:47:48 +00:00
BottledByte
a167ee98ee De-enumerized armor variants 2020-08-03 03:41:32 +00:00
Joshua Yanovski
125d7fc6c4 Abstract over simd vs. repr_c vectors. 
Also some minor improvements to Event size.
 2020-08-03 04:55:31 +02:00
Joshua Yanovski
4e99a3d142 Fix window resizing on OS X. 
Not really clear why this was working on any platform...
 2020-08-03 04:40:36 +02:00
Imbris
7d524f6062 Merge branch 'w3yden/overitem_hud' into 'master' 
Voxygen/HUD: Display item name over dropped items

See merge request veloren/veloren!1240
 2020-08-02 19:54:33 +00:00
Joshua Yanovski
d4d4956e92 Merge remote-tracking branch 'origin/master' into sharp/small-fixes 2020-08-02 20:56:54 +02:00
Joshua Yanovski
5f3b7294af Fix formatting issues I missed before. 2020-08-02 20:43:52 +02:00
Joshua Yanovski
a428a3ebba Fix clippy warnings, part 1. 
There aer still a bunch of type too complex and
function takes too many arguments warnings that I'll fix later
(or ignore, since in the one case I did fix a function takes too
many arguments warning I think it made the code *less* readable).
 2020-08-02 20:41:51 +02:00
w3yden
3e9cfa45bb Voxygen/HUD: Display item name over dropped items 
Fix clippy warning: Removed unneeded () in fn style

Fix formatting for fn style
 2020-08-02 09:49:39 +02:00
Imbris
aced5f9797 Merge branch 'shandley/collect-block-keyup-fix' into 'master' 
Prevent inventory collect events from firing on keyup

See merge request veloren/veloren!1252
 2020-08-02 06:49:14 +00:00
Shane Handley
1ae02244bc Prevent keyholds for collect (e) 2020-08-02 15:25:57 +10:00
BottledByte
dc91209a7b Removed fine-grained Item enums and replaced them with Strings 
This change allows to introduce new weapons and pair them
with graphical assets without need to recompile.
 2020-08-02 01:21:32 +00:00
Samuel Keiffer
f930f52df5 Allows for weapons to have different stats. Seperates healing staff out from staffs into its own weapon type: sceptre. Splits bow weapon type into shortbow and longbow. 2020-08-01 20:08:30 +00:00
Shane Handley
f34894087a Prevent inventory collect events from firing on keyup, which is causing item pickup actions to be called twice. 2020-08-01 20:26:44 +10:00
jshipsey
f167026889 changelog 2020-08-01 02:28:57 -04:00
jshipsey
bcc257f893 cleanup, last tweaks 2020-08-01 02:19:45 -04:00
jshipsey
aa3bdc42d7 arming the cyclops 2020-08-01 02:19:45 -04:00
Snowram
1421517f84 Add frog npc, tweak pig model 2020-08-01 02:19:45 -04:00
jshipsey
487131efb8 cyclops run anim 2020-08-01 02:19:45 -04:00
Snowram
990762ba76 Bonerattler tweaks 2020-08-01 02:19:45 -04:00
jshipsey
5d2be2240e maneater and feed anim 2020-08-01 02:19:45 -04:00
Snowram
90d7485c38 Add troll, truffler and wendigo npcs 2020-08-01 02:19:45 -04:00
jshipsey
8991b60929 catoblepas, bonerattler, rabbit, improved anims 2020-08-01 02:19:44 -04:00
jshipsey
baf67f303e new models, anim tweaks 2020-08-01 02:19:44 -04:00
Snowram
3524d644f5 Various changes to npcs animations 
- Improved dragon run with tilting
- New run animation for quadsmall, added tilting
 2020-08-01 02:19:43 -04:00
Snowram
a0da059676 Skeleton rework with rough offsets 2020-08-01 02:19:43 -04:00
Imbris
f589564760 Fix glyph to large panic 2020-07-31 01:13:31 -04:00
Joshua Yanovski
ba54307540 Fix light animations so they are removed when the light turns off. 2020-07-30 13:22:42 +02:00
Joshua Yanovski
7e0f4bcbf0 Fix crash in edge case for pixel art. 2020-07-29 21:10:20 +02:00
Marcel Märtens
0d5e61c4b6 update auth to newest version 2020-07-29 19:28:22 +02:00
Joshua Yanovski
56da06f7a3 Merge remote-tracking branch 'origin/master' into sharp/small-fixes 2020-07-29 18:56:52 +02:00
Joshua Yanovski
cf74d55f2e Fix map image artifacts and remove unneeded allocations. 
Specifically, we address three concerns (the image stretching during
rotation, artifacts around the image due to clamping to the nearest
border color when the image is drawn to a larger space than the image
itself takes up, and potential artifacts around a rotated image which
accidentally ended up in an atlas and didn't have enough extra space to
guarantee the rotation would work).

The first concern was addressed by fixing the dimensions of the map
images drawn from the UI (so that we always use a square source
rectangle, rather than a rectangular one according to the dimensions of
the map).  We also fixed the way rotation was done in the fragment
shader for north-facing sources to make it properly handle aspect ratio
(this was already done for north-facing targets).  Together, these fix
rendering issues peculiar to rectangular maps.

The second and third concerns were jointly addressed by adding an
optional border color to every 2D image drawn by the UI.  This turns
out not to waste extra space even though we hold a full f32 color
(to avoid an extra dependency on gfx's PackedColor), since voxel
images already take up more space than Optiion<[f32; 4]> requires.
This is then implemented automatically using the "border color"
wrapping method in the attached sampler.

Since this is implemented in graphics hardware, it only works (at
least naively) if the actual image bounds match the texture bounds.
Therefore, we altered the way the graphics cache stores images
with a border color to guarantee that they are always in their own
texture, whose size exactly matches their extent.  Since the easiest
currently exposed way to set a border color is to do so for an
immutable texture, we went a bit further and added a new "immutable"
texture storage type used for these cases; currently, it is always
and automatically used only when there is a specified border color,
but in theory there's no reason we couldn't provide immutable-only
images that use the default wrapping mdoe (though clamp to border
is admittedly not a great default).

To fix the maps case specifically, we set the border color to a
translucent version of the ocean border color.  This may need
tweaking going forward, which shouldn't be hard.

As part of this process, we had to modify graphics replacement to
make sure immutable images are *removed* when invalidated, rather
than just having a validity flag unset (this is normally done by
the UI to try to reuse allocations in place if images are updated
in benign ways, since the texture atlases used for Ui do not
support deallocation; currently this is only used for item images,
so there should be no overlap with immutable image replacement,
so this was purely precautionary).

Since we were already touching the relevant code, we also updated
the image dependency to a newer version that provides more ways
to avoid allocations, and made a few other changes that should
hopefully eliminate redundant most of the intermediate buffer
allocations we were performing for what should be zero-cost
conversions.  This may slightly improve performance in some
cases.
 2020-07-29 18:29:52 +02:00
Marcel Märtens
96cde882ef update auth to the newest version and remove useless dep 2020-07-29 00:05:23 +02:00
Joshua Yanovski
7d56ba31b4 Merge remote-tracking branch 'origin/master' into sharp/small-fixes 2020-07-27 13:16:27 +02:00
Imbris
ba14440a49 Fix filtering out resize events in the ui 2020-07-26 18:21:20 -04:00
Samuel Keiffer
827b91d691 Bow charged shot attack 2020-07-26 03:06:53 +00:00
Imbris
6435464d00 Make video mode selection slightly better 2020-07-25 17:07:50 -04:00
Monty Marz
31cfc05123 lots of things 
animation fixes by slipped
new cultist item
settings option for loading screen tips
loot table adjustments
 2020-07-23 12:10:13 +00:00
Justin Shipsey
24f968d813 Merge branch 'quickfixes' into 'master' 
small fixes

See merge request veloren/veloren!1221
 2020-07-21 13:36:10 +00:00
T-Dark0
fd9ec8fbd0 Voxygen and server-cli no longer panic if server creation returns error 
The process just exists instead
 2020-07-21 09:59:00 +00:00
jshipsey
5b76ed23f4 small fixes 2020-07-20 21:37:13 -04:00
Monty Marz
e353bd3cfc Fix cut off chat 2020-07-18 21:56:45 +00:00
Imbris
d46bf03e27 Merge branch 'imbris/screenshot-tweak' into 'master' 
Only screenshot and toggle fullscreen once per frame

See merge request veloren/veloren!1217
 2020-07-18 19:08:42 +00:00
Joshua Yanovski
2101113b46 Higher detail LOD. 2020-07-18 18:55:25 +02:00
Imbris
14d500abbc Only screenshot and toggle fullscreen once per frame 2020-07-18 12:21:22 -04:00
Imbris
d53ad7eb43 Fix color depth selection 2020-07-18 08:17:42 -04:00
Imbris
2a9785a40c Remove supplement_events from Window, fix suppresed clippy lint, actually use exlusive fullscreen instead of a borderless window 2020-07-17 22:18:43 -04:00
Imbris
c8133ded43 Fix issue where client_init was not set to None after it finished, use tweaked version of winit to avoid macos link failure in the CI, small comment fixes 2020-07-17 21:26:21 -04:00
Imbris
953773e1d3 Temporarily remove voxygen character_renderer example until we move to a more actively maintained rendering backend 2020-07-17 21:26:21 -04:00
Imbris
0275cc9523 Tweak pausing code to reduce duplication 2020-07-17 21:26:21 -04:00
Imbris
2f5c8fa3f3 Fixes for Alt key related issues 2020-07-17 21:26:21 -04:00
Imbris
27bfc74928 small fix and refactor stop auto walk to a method 2020-07-17 21:26:21 -04:00
Imbris
9bfb1b5f00 Fix rebase mistake 2020-07-17 21:26:21 -04:00
Imbris
97364d49ed Increment glutin version in Cargo.toml file 2020-07-17 21:26:20 -04:00
Imbris
a0d88e0774 Fix mistake with event processing 2020-07-17 21:26:20 -04:00
Imbris
f0d4ec32f5 clippy fixes 2020-07-17 21:26:20 -04:00
Imbris
8cd2207495 Proper fix for winit / cpal conflict 2020-07-17 21:26:20 -04:00
Imbris
29c877cff3 Winit 0.22 released 2020-07-17 21:26:16 -04:00
Imbris
61983b1b06 poll twice 2020-07-17 21:24:29 -04:00
Imbris
28e00a0f6e Fix singleplayer feature and rebase related stuff 2020-07-17 21:24:28 -04:00
Imbris
7dfb24d4a5 Clean comments, fix mistake, change dep source now that compatible version is available on crates.io 2020-07-17 21:24:28 -04:00
Imbris
5e8d74e00e fix Window::logical_size 2020-07-17 21:24:28 -04:00
Imbris
70eba0c30a Update changelog 2020-07-17 21:24:28 -04:00
Imbris
db91ebe9b5 fix a few minor bugs 2020-07-17 21:24:28 -04:00
Imbris
21a1382850 Update to winit 0.21.0 2020-07-17 21:24:28 -04:00
Imbris
d1b635efa4 Rearrange PlayState system to work without loop control 2020-07-17 21:24:28 -04:00
Imbris
515dbc30a7 Switch to updated gfx_window_glutin 2020-07-17 21:24:28 -04:00
Joshua Barretto
807a27328c Updated to winit 20 2020-07-17 21:24:27 -04:00
Samuel Keiffer
6cce09be85 Added protection stat to admin armor hidden in debug folder. Removed blue cultist armor set from drop table as it is an admin set. 2020-07-18 00:05:28 +00:00
Joshua Yanovski
add2cfae04 Revert some irrelevant stuff. 2020-07-16 01:57:39 +02:00
lausek
05cc6f222b avoid comparing to own entity when mounting; fix coding style 2020-07-15 15:31:42 +02:00
lausek
a3326b5744 fix #611; add distance check when mounting pet 2020-07-15 14:54:53 +02:00
Joshua Yanovski
2e2ab3dc1e Fixing various things about shadows. 
* Correcting optimal LISPSM parameter.
* Figure shadows are cast when they're not visible.
* Chunk shadows stay cast until you look away.
* Seamless cubemaps for point lights.
* Etc.
 2020-07-15 13:30:49 +02:00
Joshua Barretto
8d6b442193 Crafting 2020-07-14 20:11:39 +00:00