Commit Graph

783 Commits

Author SHA1 Message Date
Marcel
433c857573 Merge branch 'patch-2' into 'master'
I did it from scratch to match other languages files. -Deleted some tabs and empty spaces. I hope it's the last fix and that it finally appears in the next update.

See merge request veloren/veloren!1262
2020-08-06 23:05:41 +00:00
Joshua Yanovski
b44e442325 Miscellaneous performance improvements. 2020-08-06 13:40:35 +02:00
Judge Griesa
da70e59210 I did it from scratch to match other languages files. -Deleted some tabs and empty spaces. 2020-08-05 16:22:44 +00: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
Judge Griesa
5b35cb4618 -Added crafting commands missed in the file (Probably the reason why the file wasn't read by the game). Removed some weird whitespaces. Added some NPC lines while attacked. 2020-08-03 12:22:07 +00:00
Marcel
92115ec39d Merge branch 'patch-2' into 'master'
-Removed some white spaces. Added some lines about tips. Fixed some sections.

See merge request veloren/veloren!1251
2020-08-03 08:13:41 +00:00
Joshua Yanovski
be37acf287 Merge remote-tracking branch 'origin/master' into sharp/small-fixes 2020-08-03 05:49:27 +02:00
BottledByte
a167ee98ee De-enumerized armor variants 2020-08-03 03:41:32 +00:00
Joshua Yanovski
d4d4956e92 Merge remote-tracking branch 'origin/master' into sharp/small-fixes 2020-08-02 20:56:54 +02: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
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
Judge Griesa
a5930e9676 -Removed some white spaces. Added some lines about tips. Fixed some sections. 2020-07-31 13:36:43 +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
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
VZIKL
4d157ece01 add some chinese language 2020-07-29 21:09:19 +08:00
VZIKL
e56434d443 add zh_CN support and add chinese ttf fonts 2020-07-28 21:39:51 +08:00
Joshua Yanovski
30b1d2c642 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes 2020-07-27 13:16:58 +02:00
Joshua Yanovski
7d56ba31b4 Merge remote-tracking branch 'origin/master' into sharp/small-fixes 2020-07-27 13:16:27 +02:00
Marcel
598f14b258 Merge branch 'yusdacra/update-tr-translation' into 'master'
tr_TR localization: add missing and update some keys

See merge request veloren/veloren!1229
2020-07-27 08:16:20 +00:00
Yusuf Bera Ertan
a76d2d3746
tr_TR localization: add missing and update some keys 2020-07-26 12:59:40 +03:00
Snowram
20c2fd2c0b Loading tips and villagers attack speech 2020-07-23 20:31:47 +02: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
Monty Marz
1377b369f6 more saturated pumpkins 2020-07-19 23:25:38 +02:00
Joshua Yanovski
2101113b46 Higher detail LOD. 2020-07-18 18:55:25 +02: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
Marcel
b4cf3297a4 Merge branch 'ismail.assaidi/fr' into 'master'
Ismail.assaidi/fr

See merge request veloren/veloren!1210
2020-07-16 11:34:38 +00:00
Marcel
d6411f478d Ismail.assaidi/fr 2020-07-16 11:34:37 +00:00
Monty Marz
4facf1e3f3 Fix item images, cleanup debug items folder 2020-07-16 02:46:10 +00:00
Joshua Yanovski
add2cfae04 Revert some irrelevant stuff. 2020-07-16 01:57:39 +02:00
lausek
9a54031e15 de_DE: minor updates on the German translation 2020-07-15 20:56:16 +00:00
Marcel
fc30cad5fd Merge branch 'jackrubino/it_IT' into 'master'
Jackrubino/it it

See merge request veloren/veloren!1211
2020-07-15 18:29:28 +00: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
PatatasDelPapa
1cdab4b4e8 update es_la 2020-07-14 23:25:46 -04:00
Joshua Barretto
8d6b442193 Crafting 2020-07-14 20:11:39 +00:00
Forest Anderson
6510d38b8b Merge branch 'nwilder/improve-pt-br-translation' into 'master'
Nwilder/improve pt br translation

See merge request veloren/veloren!1199
2020-07-14 03:21:45 +00:00
Kai
8e523364ac Prevent GameInputs from being bound to multiple keys unless explicitly allowed. Add a Reset to Defaults button for controls. 2020-07-12 11:59:55 -07:00
Joshua Yanovski
6c31e6b562 Fix shadow creation. 2020-07-12 19:50:26 +02:00
Joshua Yanovski
6332cbe006 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-07-12 18:47:00 +02:00
Joshua Yanovski
be438657c3 Tweaks to shadows.
Added shadow map resolution configuration, added seamless cubemaps,
documented all existing rendering options, and fixed a few Clippy
errors.
2020-07-12 18:28:08 +02:00
Samuel Keiffer
fe47a14ba5 Spin attack for axe 2020-07-08 19:58:41 +00:00
Joshua Yanovski
23b4058906 Fix moon, use nonlinear noise for terrain.
Note that the latter has a bit of performance cost.
2020-07-08 10:11:19 +02:00
Monty Marz
18a08e8fe2 settings localization 2020-07-07 23:57:52 +02:00
Joshua Yanovski
0e66f02b25 All sprites sway in the wind now. 2020-07-07 20:09:01 +02:00
Joshua Yanovski
db1401a691 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-07-07 19:34:17 +02:00
Joshua Barretto
30619771af Improved block picking 2020-07-06 23:04:13 +01:00
Joshua Barretto
62b59de95a Fixed sprite select flickering 2020-07-06 22:41:21 +01:00
Joshua Barretto
ddaa0a9246 Made char select handle client events 2020-07-06 17:11:19 +01:00
Jack Rubino
2ce92b88a9 Update it_IT.ron 2020-07-06 14:27:55 +00:00
Nícolas Wildner
9f7f9f96f9 Update pt_BR.ron 2020-07-06 01:57:34 +00:00
Nícolas Wildner
0654addb98 Updating pt_BR translation 2020-07-05 22:52:42 -03:00
Joshua Barretto
fd39ee97bc Added training dummies 2020-07-05 16:15:51 +01:00
Joshua Barretto
2f6a618d5a Added bombs, throwable items, more block kinds, weaker explosions 2020-07-05 16:15:48 +01:00
jshipsey
62eb66173f tweaks and fixes 2020-07-05 09:39:55 -04:00
Snowram
1b778ca191 Various small improvements to anims and models 2020-07-05 09:38:15 -04:00
jshipsey
ca9ae13527 more latitude tilt, better attack anims, addressed aesthetic concerns, deleted dead assets 2020-07-05 09:38:15 -04:00
jshipsey
e689de3c8a better everything 2020-07-05 09:38:14 -04:00
Snowram
86b2272176 Salamander model fixes 2020-07-05 09:38:14 -04:00
jshipsey
9ef383ff03 simplify quadmed run, integrate dampener variable 2020-07-05 09:38:14 -04:00
Snowram
ce9cd29720 Add offset to quadmed legs + various fixes and improvements 2020-07-05 09:38:14 -04:00
jshipsey
94ab3665d5 pangolin and special pangolin variable 2020-07-05 09:38:14 -04:00
jshipsey
d8fff8833e quadlow spawn in world, continued adjustments 2020-07-05 09:38:14 -04:00
jshipsey
c5f7a60f3b more run animation work, adjusting pivots 2020-07-05 09:38:14 -04:00
jshipsey
03c1a97ba9 animation tweaks, fix some idle 2020-07-05 09:38:14 -04:00
jshipsey
db64972e42 starting on trot, removing some warnings 2020-07-05 09:38:14 -04:00
Snowram
648e140be3 Add wolf, frostfang and mouflon npcs 2020-07-05 09:38:14 -04:00
Snowram
4acdc24df9 Add tarasque and grolgar improvements 2020-07-05 09:38:14 -04:00
Snowram
b1f4e4b9c1 Add new tusk ram model 2020-07-05 09:38:13 -04:00
Snowram
c22d543dd2 Add rock snapper mob 2020-07-05 09:38:13 -04:00
Snowram
1be42a8f85 Add tortoise mob 2020-07-05 09:38:13 -04:00
Snowram
016b05cf38 Add new grolgar model 2020-07-05 09:38:13 -04:00
Snowram
c7df12d2ea Set new lion model offsets, fix some jaws 2020-07-05 09:38:13 -04:00
unknown
4b493b196c Add asp mob 2020-07-05 09:38:13 -04:00
jshipsey
59777ee688 more quadmed run work 2020-07-05 09:38:13 -04:00
jshipsey
7d7ee11eef manifest, vox files 2020-07-05 09:38:13 -04:00
Snowram
1ffefde739 Run anim progress 2020-07-05 09:38:12 -04:00
Snowram
1f5e0216c4 Tiger offsets, lion new model 2020-07-05 09:38:12 -04:00
Snowram
390f516e13 Homogenizes quadmed bones names 2020-07-05 09:38:12 -04:00
Snowram
9fec5f3d14 Add tiger mob 2020-07-05 09:38:12 -04:00
jshipsey
6d9356d269 starting run anim 2020-07-05 09:38:12 -04:00
jshipsey
ccf939b4fd manifests, skeleton, basic placement 2020-07-05 09:38:12 -04:00
Snowram
c527484597 Add alligator, salamander and monitor npcs 2020-07-05 09:38:12 -04:00
Snowram
00b3301d6a Remove quad_low mobs from quad_medium 2020-07-05 09:38:12 -04:00
Snowram
fe1656931c Add legs to quadruped_medium 2020-07-05 09:38:12 -04:00
Snowram
72eb03ceb5 Add quadruped_low skeleton 2020-07-05 09:38:11 -04:00
Forest Anderson
3e830aa0ca Merge branch 'angel/add-spawn-training-dummy' into 'master'
Added spawning test dummy

See merge request veloren/veloren!1142
2020-07-04 19:24:02 +00:00
Joshua Yanovski
ffe0f5928c Fix some issues with underwater rendering. 2020-07-04 21:21:12 +02:00
Joshua Yanovski
bfda6da42f Fix some minor display issues. 2020-07-04 19:17:59 +02:00
Joshua Yanovski
ccc6a06a8d Some minor changes. 2020-07-04 18:04:34 +02:00
Joshua Yanovski
4e02024670 Merge remote-tracking branch 'origin/master' into sharp/small-fixes 2020-07-04 16:17:40 +02:00