Commit Graph

4745 Commits

Author SHA1 Message Date
Joshua Yanovski
b44e442325 Miscellaneous performance improvements. 2020-08-06 13:40:35 +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
Imbris
f5aaa4d334 Merge branch 'BottledByte/armor_stringify' into 'master'
De-enumerized armor variants

See merge request veloren/veloren!1255
2020-08-03 03:41:32 +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
Imbris
c083c8241b Merge branch 'strings_not_enums' into 'master'
Fixed #590, Removed fine-grained weapon Kind enums and replaced them with Strings

Closes #590

See merge request veloren/veloren!1253
2020-08-02 01:21:33 +00: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
Imbris
8d31cfd459 Merge branch 'sam/weapon-stats' into 'master'
Weapon stats

Closes #645

See merge request veloren/veloren!1238
2020-08-01 20:08:30 +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
Justin Shipsey
bae5352cea Merge branch 'snowram/npcs-rework' into 'master'
npc improvements

See merge request veloren/veloren!1234
2020-08-01 14:41:20 +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
830fa3e9e0 Merge branch 'imbris/fix' into 'master'
Fix glyph too large panic

See merge request veloren/veloren!1250
2020-07-31 06:31:22 +00:00
Imbris
f589564760 Fix glyph to large panic 2020-07-31 01:13:31 -04:00
Marcel
66c7a18403 Merge branch 'xMAC94x/test_other_auth' into 'master'
switch to auth that doesn't use agent

See merge request veloren/veloren!1249
2020-07-30 23:44:53 +00:00
Marcel Märtens
7f97baca70 switch to auth that doesn't use agent 2020-07-31 01:05:01 +02:00
Joshua Yanovski
ba54307540 Fix light animations so they are removed when the light turns off. 2020-07-30 13:22:42 +02:00
Marcel
151fd2bb8c Merge branch 'Judge_Griesa/es_la_translation' into 'master'
Judge griesa/es la translation

See merge request veloren/veloren!1244
2020-07-30 10:22:10 +00:00
Marcel
0203854bd3 -Update on Latinamerican Spanish translation!
Some spell check and changed some words for others to have a better context.
2020-07-30 10:22:09 +00:00
Joshua Yanovski
7e0f4bcbf0 Fix crash in edge case for pixel art. 2020-07-29 21:10:20 +02:00
Marcel
18f93bb3a0 Merge branch 'updateauth' into 'master'
update auth to newest version

See merge request veloren/veloren!1242
2020-07-29 17:53:22 +00: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
9f53a4a19f Merge branch 'vzikl/add-zh-translation' into 'master'
add zh_CN support and chinese ttf fonts

See merge request veloren/veloren!1241
2020-07-29 14:35:47 +00:00
VZIKL
4d157ece01 add some chinese language 2020-07-29 21:09:19 +08:00
Marcel
b7f88b7e9f Merge branch 'update_authc' into 'master'
update auth to the newest version and remove useless dep

See merge request veloren/veloren!1239
2020-07-28 23:21:13 +00:00
Marcel Märtens
96cde882ef update auth to the newest version and remove useless dep 2020-07-29 00:05:23 +02:00
VZIKL
e56434d443 add zh_CN support and add chinese ttf fonts 2020-07-28 21:39:51 +08:00
Joshua Yanovski
ad18ce9399 Fix continent scale hack. 2020-07-28 13:21:09 +02:00