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
9,008 Commits 151 Branches 18 Tags 2.1 GiB
3ee123b745
Commit Graph

2061 Commits

Author SHA1 Message Date
Vincent Foulon
e06870702f Add skill for swimming speed 2021-03-21 15:58:38 +01:00
Vincent Foulon
985c26dd0a improve climbing icon 2021-03-21 13:26:44 +01:00
Vincent Foulon
71d3bf5821 fix typo in sceptre aura skill 2021-03-20 22:12:43 +01:00
Sam
c8c368adec Rebalanced a few stats 2021-03-20 16:28:03 -04:00
Vincent Foulon
8ef30dd2f3 fix one line from custist_alarm vector 2021-03-20 20:53:27 +01:00
Vincent Foulon
d4fbc78d06 Translate cultist_alarm in FR 2021-03-20 17:37:59 +01:00
Vincent Foulon
d0aa68a9d2 Add climbing speed and cost 2021-03-20 17:17:28 +01:00
Snowram
cb3bf0c884 Fix a missing dwarf hairstyle 2021-03-19 12:45:08 +01:00
Snowram
e5afb2fcf7 Various visual fixes 2021-03-18 22:53:06 +01:00
Sarra
eaaf65127d cleaning up some tools 2021-03-18 22:52:50 +01:00
Sarra
d1e16a2a00 tweaking glow and shine 2021-03-18 22:52:40 +01:00
Marcel
9c95e971f2 Merge branch 'vfoulon80/loading-animations' into 'master' 
Add new random loading animations

See merge request veloren/veloren!1931
 2021-03-18 02:28:34 +00:00
DaforLynx
fbf4defa04 Adds sfx for Sceptre aura 2021-03-17 23:54:49 +00:00
Vincent Foulon
eafa69ee4c allow loading animations to be contributed from a manifest file 2021-03-17 23:41:28 +01:00
Vincent Foulon
62b945dab1 Add new random loading animations 2021-03-17 18:15:25 +01:00
Marcel
6e6878ca9e Merge branch 'tormeh/add-monologue-strings' into 'master' 
Add monologue strings.

See merge request veloren/veloren!1925
 2021-03-17 08:45:27 +00:00
Marcel
684789c886 Merge branch 'vfoulon80/fr-skills' into 'master' 
[FR] translate skills.ron + missing keys

See merge request veloren/veloren!1901
 2021-03-17 01:25:12 +00:00
Vincent Foulon
6b0028907d [FR] translate skills.ron + missing keys 2021-03-17 01:25:11 +00:00
Tormod G. Hellen
f695b11171 Add monologue strings. 2021-03-17 01:58:12 +01:00
Monty Marz
e9cbac387e new loading bg, staff models 
item images

fix paths

loot tables, adjustments

Update main.ron
 2021-03-16 23:23:24 +00:00
Marcel
f679103041 Merge branch 'sam/nerfs' into 'master' 
Nerfs

See merge request veloren/veloren!1922
 2021-03-16 22:22:04 +00:00
James Melkonian
6ea43cfd75 Various RtSim and Agent Interaction Fixes 2021-03-16 01:30:35 +00:00
Marcel
ad49318a63 Merge branch 'sam/explosion-fix' into 'master' 
Explosions now take into account hitbox of entity.

See merge request veloren/veloren!1905
 2021-03-15 22:26:28 +00:00
Sam
1b2a62d5a8 Nerfs 2021-03-15 17:36:58 -04:00
Sam
0576e30b9e Nerfed aura 2021-03-15 14:23:28 -04:00
Sam
461ad6e339 Rebalanced explosion strengths 2021-03-15 00:36:07 -04:00
Joshua Barretto
5bc9f894ab Fixed airship manifest offset 2021-03-14 23:17:29 -04:00
Avi Weinstock
a32be4ac5a Address MR 1888 review comments. 
- Delete obsolete symbolic links.
- Add suggested comments.
- Remove dead code.
 2021-03-14 23:17:28 -04:00
Avi Weinstock
e9aab63a04 Account for model translation in the physics. The voxel collider still needs to be north-aligned for now. 2021-03-14 23:09:52 -04:00
James Melkonian
6ff054099f Allow spawned airships to move 2021-03-14 23:09:52 -04:00
Avi Weinstock
bcd3799395 Airship fixes: figure culling, player hitbox bounds w.r.t. airships, physics state unioning. 2021-03-14 23:09:51 -04:00
Avi Weinstock
5d85775dcf Airship progress: now possessable, and physics kind of works (desyncs from the visuals by a shift + scale, and rotation isn't done at all yet, but the contours are correct). 2021-03-14 23:09:51 -04:00
Avi Weinstock
8b9e84972a Draft of airships (spawn command, visuals, some physics refactoring, no collision yet). 2021-03-14 23:09:49 -04:00
Marcel
5570b57282 Merge branch 'sam/yeet-inputs' into 'master' 
Reworked Controller Inputs to use Control Actions

See merge request veloren/veloren!1900
 2021-03-15 01:32:02 +00:00
Imbris
a558d42da7 Merge branch 'snowram/new-npcs' into 'master' 
Snowram/new npcs

See merge request veloren/veloren!1896
 2021-03-15 00:10:46 +00:00
Sam
21e6f4797c Primary ability fully functional. 2021-03-14 17:26:53 -04:00
DaforLynx
f924e047ac Renamed 'Upscale Factor' to 'Internal Resolution' as per what was decided in #981 2021-03-14 12:18:29 -07:00
Snowram
60dd47cdea Theropod charge attack 2021-03-14 18:10:40 +01:00
PersianKnight
b87514266d Bug fix debug info hotkey and axe skill tree text 2021-03-14 20:16:54 +03:30
Snowram
9d7e8957bb Add new npcs 2021-03-14 14:24:35 +01:00
Christof Petig
15b11d9154 Implement /price_list (work in progress), stub for /buy and /sell 
remove outdated economic simulation code

remove old values, document

add natural resources to economy

Remove NaturalResources from Place (now in Economy)

find closest site to each chunk

implement natural resources (the distance scale is wrong)

cargo fmt

working distance calculation

this collection of natural resources seem to make sense, too much Wheat though

use natural resources and controlled area to replenish goods

increase the amount of chunks controlled by one guard to 50

add new professions and goods to the list

implement multiple products per worker

remove the old code and rename the new code to the previous name

correctly determine which goods guards will give you access to

correctly estimate the amount of natural resources controlled

adapt to new server API

instrument tooltips

Now I just need to figure out how to store a (reference to) a closure

closures for tooltip content generation

pass site/cave id to the client

Add economic information to the client structure
(not yet exchanged with the server)

Send SiteId to the client, prepare messages for economy request
Make client::sites a HashMap

Specialize the Crafter into Brewer,Bladesmith and Blacksmith

working server request for economic info from within tooltip

fully operational economic tooltips
I need to fix the id clash between caves and towns though

fix overlapping ids between caves and sites

display stock amount

correctly handle invalid (cave) ids in the request

some initial balancing, turn off most info logging

less intrusive way of implementing the dynamic tool tips in map

further tooltip cleanup

further cleanup, dynamic tooltip not fully working as intended

correctly working tooltip visibility logic

cleanup, display labor value

separate economy info request in a separate translation unit

display values as well

nicer display format for economy

add last_exports and coin to the new economy

do not allocate natural resources to Dungeons (making town so much larger)

balancing attempt

print town size statistics

cargo fmt (dead code)

resource tweaks, csv debugging

output a more interesting town (and then all sites)

fix the labor value logic (now we have meaningful prices)

load professions from ron (WIP)

use assets manager in economy

loading professions works

use professions from ron file

fix Labor debug logic

count chunks per type separately
(preparing for better resource control)

better structured resource data

traders, more professions (WIP)

fix exception when starting the simulation

fix replenish function
TODO:
- use area_ratio for resource usage (chunks should be added to stock, ratio on usage?)
- fix trading

documentation clean up

fix merge artifact

Revise trader mechanic

start Coin with a reasonable default

remove the outdated economy code

preserve documentation from removed old structure

output neighboring sites (preparation)

pass list of neighbors to economy

add trade structures

trading stub

Description of purpose by zesterer on Discord

remember prices (needed for planning)

avoid growing the order vector unboundedly

into_iter doesn't clear the Vec, so clear it manually

use drain to process Vecs, avoid clone

fix the test server

implement a test stub (I need to get it faster than 30 seconds to be more useful)

enable info output in test

debug missing and extra goods

use the same logging extension as water, activate feature

update dependencies

determine good prices, good exchange goods

a working set of revisions

a cozy world which economy tests in 2s

first order planning version

fun with package version

buy according to value/priority, not missing amount

introduce min price constant, fix order priority

in depth debugging

with a correct sign the trading plans start to make sense

move the trade planning to a separate function

rename new function

reorganize code into subroutines (much cleaner)

each trading step now has its own function

cut down the number of debugging output

introduce RoadSecurity and Transportation

transport capacity bookkeeping

only plan to pay with valuable goods, you can no longer stockpile unused options
(which interestingly shows a huge impact, to be investigated)

Coin is now listed as a payment (although not used)

proper transportation estimation (although 0)

remove more left overs uncovered by viewing the code in a merge request

use the old default values, handle non-pileable stocks directly before increasing it
(as economy is based on last year's products)

don't order the missing good multiple times
also it uses coin to buy things!

fix warnings and use the transportation from stock again

cargo fmt

prepare evaluation of trade

don't count transportation multiple times

fix merge artifact

operational trade planning
trade itself is still misleading

make clippy happy

clean up

correct labor ratio of merchants (no need to multiply with amount produced)

incomplete merchant labor_value computation

correct last commit

make economy of scale more explicit

make clippy happy (and code cleaner)

more merchant tweaks (more pop=better)

beginning of real trading code

revert the update of dependencies

remove stale comments/unused code

trading implementation complete (but untested)

something is still strange ...

fix sign in trading

another sign fix

some bugfixes and plenty of debugging code

another bug fixed, more to go

fix another invariant (rounding will lead to very small negative value)

introduce Terrain and Territory

fix merge mistakes
 2021-03-14 03:18:32 +00:00
DaforLynx
99261bf105 Many small changes to audio code, mainly sfx - changelog in MR 2021-03-12 15:00:09 -08:00
Sam
803e42cc01 Fixed broken weapon. 2021-03-12 11:00:54 -05:00
jshipsey
49f496e290 intitial values 2021-03-12 00:58:12 -05:00
Sam
66181a7f8c Rebalanced crit stats 2021-03-11 20:30:15 -05:00
Marcel
93cab075f8 Merge branch 'xMAC94x/non_blocking_register' into 'master' 
Auth requests are now done async, the register system is fetching it, via a PendingLogin component

See merge request veloren/veloren!1875
 2021-03-11 21:51:55 +00:00
Joshua Barretto
a9bcaf0a37 Merge branch 'PersianKnight/Reset_to_Defaults_Buttons' into 'master' 
Add Reset to Default Buttons for Interface, Gameplay and Sound Settings

See merge request veloren/veloren!1877
 2021-03-11 21:29:11 +00:00
PersianKnight
3b3ffe30e9 Add Reset to Default Buttons for Interface, Gameplay and Sound Settings 2021-03-11 22:09:30 +03:30
Joshua Barretto
f479231b15 Merge branch 'glowy-shiny-pretty' into 'master' 
Glowy shiny pretty

See merge request veloren/veloren!1874
 2021-03-11 17:37:33 +00:00
Samuel Keiffer
9b198b5cda Merge branch 'sam/sceptre-overhaul' into 'master' 
Overhaul sceptre

Closes #768

See merge request veloren/veloren!1845
 2021-03-11 16:47:50 +00:00
Marcel Märtens
728bff610b Allow HTTP auth servers again. 
only `localhost` are allowed in a release build.
 when debug assertions are on, others are also allowed.

This change undoes the changes to the settings, so compared to master, there is no effect
 2021-03-11 17:24:52 +01:00
Marcel Märtens
a98e72c391 Auth requests are now done async, the register system is fetching it, via a PendingLogin component 
The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without.
correct is now `auth.veloren.net`
incorrect is: `https://auth.veloren.net`
 2021-03-11 17:05:02 +01:00
Joshua Barretto
6e0807f3f5 Cheaper and less broken material reflection/glow 2021-03-11 13:56:11 +00:00
omm
ef7b215f07 File structure for lang es_ES aligned with EN 2021-03-11 12:08:37 +00:00
Joshua Barretto
d1b58ebb36 More reflective weapons 2021-03-10 18:59:04 +00:00
Joshua Barretto
09e32cb952 Initial implementation of glow/shininess 2021-03-10 18:58:25 +00:00
Sam
de5ef03ac4 Auras will now refresh buffs if a buff was already present that had a lesser duration. 
Attack effects can now have multiple requirements.
Fix for sceptre heal not requiring energy.
Nerfed warding aura protection.
Added icon for warding aura.
Changelog.
 2021-03-09 18:03:06 -05:00
Sam
16222948a3 Sceptre skill tree and migration. 2021-03-09 18:02:07 -05:00
Sam
c13e84aff5 Aura duration separated from cast duration in aura state 
Healing beam now requires combo > 0 to enter character state
Removed last vestiges of old sceptre abilities
Combo extended to most other attacks
Cast aura state renamed to basic aura
 2021-03-09 18:02:00 -05:00
Sam
d711c77468 Aura particles. 2021-03-09 17:59:45 -05:00
Monty Marz
935aec743d cleanup, icons 2021-03-09 17:59:45 -05:00
Sam
cb1b26d717 Beam particle tweaks 2021-03-09 17:59:43 -05:00
Monty
49fcd6ee13 adjusted combo counter anim 2021-03-09 17:59:43 -05:00
Sam
398370ca51 Changed lifesteal beam particles to look better. 
Warding aura now just provides damage reduction instead of invulnerability. Also with a longer duration and less movespeed penalty.
 2021-03-09 17:59:41 -05:00
Sam
c6a222340e Particles for lifesteal beam. Changed how frontend recognized beams. 2021-03-09 17:59:39 -05:00
Sam
18edc1092b Basic beam now generates combo. Healing beam now consumes combo, and requires combo to heal. 2021-03-09 17:59:33 -05:00
Sam
43874a4aa5 Added healing beam character state. 
This was done as there was a lot of special casing in basic beam to account for healing.
 2021-03-09 17:58:20 -05:00
Sam
a1bbc136fc New abilities for sceptre are done 2021-03-09 17:56:38 -05:00
Marcel
ee0ab197da Merge branch 'updated_spanish_es_strings' into 'master' 
Updated strings Added missing translations in Spanish es_ES and retrieving localized text

See merge request veloren/veloren!1866
 2021-03-09 12:59:03 +00:00
tukilo
cea895ea24 Updated strings Added missing translations in Spanish es_ES and retrieving localized text 2021-03-09 12:30:53 +01:00
Avi Weinstock
d8f0a1c426 Add critical chance and critical multiplier stats to weapons. 2021-03-08 23:27:25 -05:00
Adam Blanchet
16b66f9cd6 Add reset button to graphics settings 2021-03-08 18:48:38 +01:00
Marcel
e29964ead1 Merge branch 'sarrakitty/fireworks' into 'master' 
added a white firework

See merge request veloren/veloren!1856
 2021-03-07 18:37:35 +00:00
Joshua Barretto
36d20e6990 Better docs, faster terrain meshing 2021-03-07 14:25:07 +00:00
Joshua Barretto
9910398917 Fixed snow biome trees 2021-03-07 14:25:07 +00:00
Joshua Barretto
0cbdc2b1b7 Better tree names 2021-03-07 14:25:07 +00:00
Joshua Barretto
db573f6b2d Turn giant trees into proper sites 2021-03-07 14:25:07 +00:00
Monty
b6ac4e46fb tree icon UI works and hover icon 2021-03-07 14:25:07 +00:00
Joshua Barretto
a54a3da102 Added tree map icon 2021-03-07 14:25:05 +00:00
Joshua Barretto
d4ce69df99 Static light flickering 2021-03-07 14:25:02 +00:00
Joshua Barretto
1d16f14dd5 Small fixes 2021-03-07 14:25:02 +00:00
Joshua Barretto
331375fd8f Adjusted static lighting 2021-03-07 14:25:02 +00:00
Joshua Barretto
fe2479ee4c Better LoD water prediction 2021-03-07 14:25:01 +00:00
Monty
8214c9df82 PoI icon 2021-03-07 14:25:01 +00:00
Joshua Barretto
31832e1245 Fixed wall leaking with dynamic light ambiance 2021-03-07 14:25:01 +00:00
Joshua Barretto
aabe1d7cfd Point light ambiance for less harsh shadows 2021-03-07 14:25:01 +00:00
Joshua Barretto
100cafa91b Directional baked lights for figures 2021-03-07 14:25:01 +00:00
Joshua Barretto
0c302bb020 Lanterns in trees 2021-03-07 14:25:01 +00:00
Joshua Barretto
185b1c3053 Specialised giant trees 2021-03-07 14:25:01 +00:00
Joshua Barretto
7d526da735 Experimental giant mother trees 2021-03-07 14:25:01 +00:00
Sarra
db3bc1b9bb added a white firework 2021-03-07 03:48:50 -05:00
Imbris
575301c763 Merge branch 'Quibble/item-buff-tooltips' into 'master' 
Tooltips use item stats for buff information

See merge request veloren/veloren!1820
 2021-03-05 22:00:24 +00:00
Imbris
e724ac072e Merge branch 'sarrakitty/fireworks' into 'master' 
made firework explosions colorful

See merge request veloren/veloren!1851
 2021-03-05 17:48:56 +00:00
Snowram
e2d4799f7d Merge branch 'vfoulon80/convert-fr-translations' into 'master' 
Split the french translation into multiple files

See merge request veloren/veloren!1672
 2021-03-05 12:23:08 +00:00
Vincent Foulon
6e66cecce7 Split the french translation into multiple files 2021-03-05 12:23:08 +00:00
Sarra
4284ce0411 made firework explosions colorful 2021-03-05 01:22:29 -05:00
Marcel
cb305536e8 Merge branch 'vfoulon80/skilltree-icons' into 'master' 
implement the new skilltree icons

See merge request veloren/veloren!1794
 2021-03-04 18:37:33 +00:00
Vincent Foulon
fb953cc7f4 implement the new skilltree icons 2021-03-04 18:37:32 +00:00
Sam
39a580b5ee Added test that all items are properly formatted and valid. Fixed items that were broken. 2021-03-03 16:45:36 -05:00
Sam
ae856edb31 Fixed debug back armor. Removed leather_3 item. 2021-03-03 15:05:51 -05:00
Lippy13
43c35f957f Remove buff information from item description text 2021-03-03 00:25:12 +00:00
Snowram
2b7b9f887b Fixes leather sets 2021-03-02 19:28:29 +01:00
Tadabito
f75f36a2c5 update cloth item tag to fix panic during crafting 2021-03-02 10:31:21 +00:00
Justin Shipsey
9ad8804b60 Merge branch 'armor-org' into 'master' 
armor org

See merge request veloren/veloren!1835
 2021-03-02 01:29:46 +00:00
jshipsey
308045cfc9 final asset corrections, fix glider anim 2021-03-01 17:37:47 -05:00
heydabop
bfc82f7236 Fixes #974 - convert tool/weapon equip time to floating point seconds 2021-03-01 15:06:39 -06:00
Sam
f304fe0f10 Fix a few asset paths for armors. 2021-03-01 00:58:43 -05:00
Samuel Keiffer
0497a437a4 Merge branch 'sam/invulnerability-buff' into 'master' 
Invulnerability Buff

Closes #965

See merge request veloren/veloren!1834
 2021-03-01 05:46:46 +00:00
Sam
7e34f1225f Migration for armor re-organization. 2021-03-01 00:42:35 -05:00
jshipsey
8944115f8e more asset organization 2021-02-28 22:18:43 -05:00
Samuel Keiffer
537efdd47e Merge branch 'aweinstock/trade-requestitem' into 'master' 
During a trade, allow requesting items from the counterparty's inventory...

See merge request veloren/veloren!1829
 2021-03-01 02:39:36 +00:00
Sam
6ab4e2264e Buff icon 2021-02-28 17:31:35 -05:00
Sam
531c38c3ad Factored formatting of buff text out to a single function. 2021-02-28 16:04:33 -05:00
Imbris
b7bd0306e6 Merge branch 'Lerg/Issue_#976' into 'master' 
Issue #976 Some inputs are missing the ability to be rebound

See merge request veloren/veloren!1832
 2021-02-28 18:23:30 +00:00
Justin Shipsey
13df691f69 Merge branch 'heydabop/966-controller-y-invert' into 'master' 
#966 - Setting to invert controller Y axis

See merge request veloren/veloren!1817
 2021-02-28 18:02:04 +00:00
Lerg
94bd1f2605 Issue #976 Some inputs are missing the ability to be rebound because they are missing from the input iterator 2021-02-28 19:02:32 +03:00
Avi Weinstock
7e458ecd40 During a trade, allow requesting items from the counterparty's inventory (prequisite for NPC trading). 2021-02-28 10:13:49 -05:00
jshipsey
1a1020342e re-org armor, common 2021-02-27 22:02:05 -05:00
Monty Marz
e5273e3a8e reroute the F1 key to open the controls settings, removed loading screen tips about levels and the stats button 2021-02-27 19:02:26 +00:00
jshipsey
16720a6826 weapon/manifest tweaks 2021-02-27 10:44:55 -05:00
Sam
238fcaf5f1 Particle rebase fixes 2021-02-27 01:42:47 -05:00
jshipsey
0a353576dc address comments 2021-02-27 01:42:47 -05:00
Snowram
17112926e7 Adds harvester npc 2021-02-27 01:42:47 -05:00
jshipsey
51bc74b2a5 visual weapon variation, adjust minotaur dash, keyframed golem quake 2021-02-27 01:42:47 -05:00
jshipsey
16a44cd532 minotaur moves, added claygolem 2021-02-27 01:42:47 -05:00
jshipsey
417f4638ed balance pass 2 2021-02-27 01:42:47 -05:00
jshipsey
79ec9115f5 rebase, yeti in dungeon 2021-02-27 01:42:47 -05:00
jshipsey
e06ebf3507 initial balance 2021-02-27 01:42:47 -05:00
Snowram
858fbe1a6c Adds yeti npc 2021-02-27 01:42:46 -05:00
jshipsey
30af3a4493 dash, spin, jump changes 2021-02-27 01:42:46 -05:00
Snowram
1b9815dc34 Adds 3 new npcs, tusk ram new design 2021-02-27 01:42:46 -05:00
Sam
53b0ba286a Ice particles for Wendigo 2021-02-27 01:42:46 -05:00
jshipsey
ce3b2141e1 theropod retrofit, some more moves 2021-02-27 01:42:46 -05:00
jshipsey
5792faa992 some new moves, combine biped weapons into one file 2021-02-27 01:42:46 -05:00
jshipsey
57d5e90ddd full bipedsmall armor swaps 2021-02-27 01:42:46 -05:00
Sam
df70976ff5 Fixed particles. 2021-02-27 01:42:46 -05:00
jshipsey
cb59c8017e anim tweaks, more loadout setup 2021-02-27 01:42:46 -05:00
jshipsey
130d51786a golem retrofit 2021-02-27 01:42:46 -05:00
Timo Kösters
a4513fe09d Improve particles 2021-02-27 01:42:46 -05:00
jshipsey
952a77f94d speedier weapons initial testing 2021-02-27 01:42:45 -05:00
jshipsey
aa4237b019 BL improvements, various fixes 2021-02-27 01:42:45 -05:00
jshipsey
e4e25e20c9 rebase 2021-02-27 01:42:45 -05:00
jshipsey
0dc8b2e482 rendering 2021-02-27 01:42:45 -05:00
jshipsey
ca3248cc93 new dungeon setups, new npcs, weapon specific loadouts, anims 2021-02-27 01:42:45 -05:00
jshipsey
ac16a8900d bow 2021-02-27 01:42:45 -05:00
jshipsey
66664f3f89 the stabs 2021-02-27 01:42:45 -05:00
jshipsey
6a57dd25d0 wielding 2021-02-27 01:42:45 -05:00
jshipsey
31208e29ee run anim tweaks 2021-02-27 01:42:45 -05:00
unknown
559ece5ede More npcs work 2021-02-27 01:42:45 -05:00
unknown
6f18d16aa2 Add new quadmeds npcs with rough offsets 2021-02-27 01:42:44 -05:00
Snowram
f48fea57f4 Sahagin, Adlet npcs 2021-02-27 01:42:43 -05:00
jshipsey
7cf723bb9d gnome 2021-02-27 01:42:43 -05:00
jshipsey
266986626d biped_small setup 2021-02-27 01:42:43 -05:00
Snowram
1172c2f2c3 Merge branch 'Sarrakitty/OceanFlora' into 'master' 
added coral reefs, kelp forests, and seagrass

See merge request veloren/veloren!1819
 2021-02-27 01:52:33 +00:00
Sarra
02eb76416f tweaking coral models and seagrass spawns 2021-02-25 23:39:41 -05:00
Samuel Keiffer
8e07174c1d Merge branch 'aweinstock/coin-item' into 'master' 
Add a coin item and make amounts visible on dropped items.

See merge request veloren/veloren!1821
 2021-02-26 04:17:12 +00:00
Samuel Keiffer
6af9e58965 Merge branch 'add-gemu-models' into 'master' 
Add sword and bow models from backlog

See merge request veloren/veloren!1818
 2021-02-26 02:59:51 +00:00
Avi Weinstock
7d2e8f72eb Add a coin item and make amounts visible on dropped items. 2021-02-25 21:31:30 -05:00
Sarra
1d4b8d4d99 correcting formatting and removing commented out code that wasn't supposed to be there 2021-02-25 20:41:57 -05:00
Snowram
2bab3cdced Fixes weapons model and icon offsets 2021-02-26 02:37:59 +01:00
Samuel Keiffer
00937a4e8b Merge branch 'aweinstock/modularforms' into 'master' 
Support modular weapon components made from a tagged material using the material as a multiplier.

See merge request veloren/veloren!1815
 2021-02-26 00:53:02 +00:00
Avi Weinstock
e1484c28c0 Finish plumbing MaterialStatsManifest. Fix issue with speed clamping when recursing through components. Improve statblocks in item tooltips. 2021-02-25 15:26:49 -05:00
Sarra
f39f5ab5d3 added coral reefs, kelp forests, and seagrass 2021-02-25 05:33:18 -05:00
Sam
017e037e69 Weapon offsets in humanoid manifest 2021-02-24 21:52:32 -05:00
Sam
b0b4a07b9e Bows 2021-02-24 20:37:43 -05:00
Sam
84a5b3dcc5 Axes 2021-02-24 19:11:41 -05:00
Sam
ee5c9d78ca Swords 2021-02-24 18:54:06 -05:00
heydabop
d4e3a3f29f #966 - Add setting to invert controller camera Y axis 2021-02-24 10:39:44 -06:00
Snowram
914266c705 Merge branch 'nwildner/pt_BR_trade-updates' into 'master' 
pt br trade updates

See merge request veloren/veloren!1810
 2021-02-23 23:21:30 +00:00
Nícolas Wildner
e4f8a9ed6c pt br trade updates 2021-02-23 23:21:30 +00:00
Avi Weinstock
78014d7d3b Put material stats in their own manifest, and multiply a form's stats by the weighted average of the material multipliers. 2021-02-23 15:49:34 -05:00
Avi Weinstock
4e57678f34 Support modular weapon components made from a tagged material using the material as a multiplier. 2021-02-23 15:31:51 -05:00
Snowram
14c252d8b2 Merge branch 'snowram/turret' into 'master' 
Object animation, beam fixes, turret implementation

See merge request veloren/veloren!1805
 2021-02-23 20:16:56 +00:00
Imbris
f33d3873b4 Merge branch 'aweinstock/modular-weapon-rigging' into 'master' 
Support modular weapon voxel meshes being made by assembling their components.

See merge request veloren/veloren!1806
 2021-02-23 00:45:26 +00:00
Avi Weinstock
c3ac8a1b51 Support modular weapon voxel meshes being made by assembling their components. 2021-02-23 00:45:26 +00:00
Marcel
6081ebbe15 Merge branch 'sam/ecs-sys-struct' into 'master' 
Sam/ecs sys struct

See merge request veloren/veloren!1813
 2021-02-23 00:08:09 +00:00
Marcel
72bd0f42fc Merge branch 'xMAC94x/prot_improvements' into 'master' 
xMAC94x/prot_improvements

See merge request veloren/veloren!1796
 2021-02-22 22:47:43 +00:00
Justin Shipsey
56f8e66d5d Merge branch 'steanne-master-patch-91284' into 'master' 
Update _manifest.ron for minor typos in villager statements

See merge request veloren/veloren!1807
 2021-02-22 22:10:38 +00:00
Sam
2b5120319d Character behavior system now uses immutable data struct 2021-02-22 15:30:53 -05:00
Snowram
684961b15c Adds look_dir to anims, humanoid heads pivot fixes 2021-02-22 20:00:06 +01:00
Marcel Märtens
3f5c64bec0 Client::new can now resolve DNS requests, better networking error messages 2021-02-22 17:35:19 +01:00
steanne
838a0d8928 Update _manifest.ron for minor typos in villager statements 2021-02-22 00:04:02 +00:00
Snowram
4078eeb877 Various fixes to object animation, cleanup 2021-02-21 19:56:46 +01:00
Snowram
f25b2b1500 Various fixes to beam, body based interp 2021-02-21 19:17:56 +01:00
Snowram
e7bbf3981d Object animation 2021-02-21 19:17:44 +01:00
Snowram
775224983b Initial turret implementation 2021-02-21 18:23:54 +01:00
Sam
f5a74b4f33 Removed duplicate possess stick 2021-02-20 17:12:27 -05:00
Avi Weinstock
8bdbf4f7c9 Implement modular weapons. 
- Add ItemKind::ModularComponent, Item::components.
- Add tool::StatKind::{Direct,Modular} for the modular weapons themselves.
- Move ItemConfig from ItemDesc to Item, so components' stats can be taken into account.
- Crafting stores into the components field.
- Components/recipes/placeholders are created dynamically.
- Show which components a modular weapon contains in the tooltip in voxygen.

Squashed fixes:
- `Item::duplicate` components in `Item::new_from_item_def`.
- Speed of 1.0 for now.
 2021-02-20 14:30:39 -05:00
Samuel Keiffer
479cf9fc4e Merge branch 'sam/dual-wielding' into 'master' 
Dual wielding backend

See merge request veloren/veloren!1787
 2021-02-20 05:12:17 +00:00
Sam
eaf3e02e39 Addressed comments 
Fixed audio test
 2021-02-19 19:55:23 -05:00
Sam
cfadd6da04 Added 1h swords. 2021-02-19 19:33:26 -05:00
Sam
d5ccc33abc Factored out duplicate code into closures, consolidated ability handling logic to a single function. 2021-02-19 18:45:48 -05:00
Sam
bbfcde5e59 Re-deleted duplicate weapons that somehow reappeared. 2021-02-19 17:30:24 -05:00
Sam
411b4083b1 Added 1h hammers. 
Fixed audio tests.
 2021-02-19 17:30:24 -05:00
Sam
50cbe42b07 Added one-handed axes. 2021-02-19 17:30:23 -05:00
Sam
12545dd372 Added handedness to weapon tooltips. 2021-02-19 17:30:23 -05:00
Sam
8f0cca074d Dual wielding now uses skillbar abilities from multiple weapons. 2021-02-19 17:30:22 -05:00
Sam
fc01e9ea68 Handedness of weapons affects power and speed. 2021-02-19 17:30:21 -05:00
Sam
582c3f8459 Check for prerequisite skill in using an ability is no longer hardcoded. 2021-02-19 17:30:21 -05:00
Sam
341affdae2 Added hands field to all ron files of weapons. 
Removed weapons that were duplicated in weapons and npc_weapons from npc_weapons.
Added migration to convert npc_weapons that ended up in anyone's inventory to weapon version.
Consolidated debug boost and possess sticks into one debug_stick, and renamed the admin sword (with name cultist_purp_2h_boss-0) to admin_sword
 2021-02-19 17:30:20 -05:00
Avi Weinstock
559ad7b7f5 Client-side trade improvements. 
- Add item tooltips in trade.
- More localization support.
- Fix bindings (R for trade, B for bag).
 2021-02-19 15:20:27 -05:00
Nícolas Wildner
7a29cc9eff creating char_selection.ron plus minor portuguese fixes for better formal language (like olhos - eyes and not olho) 2021-02-17 08:28:04 +00:00
TheThirdSpartan
f10f88081d Small chat message formatting changes and fixed missing player alias during admin entity possession 2021-02-17 02:15:45 +00:00
Felix Huettner
b8d5b812e1 Allow minimap to always face north 
Some players prefer their minimap to always face north for better
orientation.
 2021-02-16 19:57:19 +01:00
Avi Weinstock
03d28f7d93 Implement tags for items, allowing a crafting recipe to take any item with that tag as input. 
- Added a recipe that turns any of the cloth equipment dropped by villagers into 1x cloth scraps.
- Animate placeholder items for tagged crafting.
 2021-02-16 01:05:54 +00:00
Avi Weinstock
abb5684883 Trade implementation progress. 
- Accept/decline buttons that submit the proper messages
- A phase2 screen that renders the (item, quantity) pairs as text
- More checks in the trade state machine server-side.
 2021-02-12 18:43:10 -05:00
Avi Weinstock
e2b55e0706 Implement enough of a trade UI that dragging & dropping items into it round-trips between clients. 2021-02-12 18:43:09 -05:00
Avi Weinstock
e9b811b62b Plumb trade requests through the group invite UI, such that they can be accepted/declined without impacting the counterparty's movement. 2021-02-12 18:43:09 -05:00
Avi Weinstock
250391656f Initial draft of trade UI (creates a placeholder window that acts like crafting in terms of bringing up the bag, defaulting to the "r" key). 2021-02-12 18:43:09 -05:00
Snowram
e54602c752 Merge branch 'Sarrakitty/gliders' into 'master' 
Sarrakitty/gliders

See merge request veloren/veloren!1771
 2021-02-12 09:49:53 +00:00
DaforLynx
ebbb06a400 Added crickets blocktype, added 3 new cricket sounds, made crickets chirp consistently, made frogs more sporadic 2021-02-12 00:54:42 +00:00
Sarra
8ac23ffcc2 fit models, adjusted drop rates 2021-02-11 09:29:26 -05:00
Sarra
7c23f97d89 tweaked a few things with the moth glider 2021-02-10 20:14:50 -05:00
Sarra
14b344469a basic gliders 2021-02-10 19:02:36 -05:00
Sarra
0511563e35 moth glider 2021-02-10 19:02:36 -05:00
Imbris
3e98e18c46 Merge branch 'aweinstock/sort-crafting' into 'master' 
Crafting UI: sort items lexicographically by craftability and then alphabetically.

See merge request veloren/veloren!1767
 2021-02-10 04:04:42 +00:00
Avi Weinstock
5d0c18efeb Crafting UI: sort items lexicographically by craftability and then alphabetically. 2021-02-09 19:30:54 -05:00
Snowram
477bdfdfe7 Adresses some comments, various visual tweaks 2021-02-10 00:30:23 +01:00
Snowram
02f446fe4b Adds lights to dungeons 2021-02-10 00:30:23 +01:00
Sarra Kitty
a956dad360 Sarrakitty/small fixes 2021-02-08 20:37:24 +00:00
Scott Williams
ae22a98167 Added a miniboss loot table for the stonework defender, made damaged bag, glider, and root of evil mindflayer exclusive drops. 2021-02-07 19:04:20 +00:00
James Melkonian
1d8496ea21 Move agent system to server 2021-02-06 06:15:25 +00:00
Pascal Fuhrmann
9f7637ab21 Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts 2021-02-05 01:39:12 +00:00
Samuel Keiffer
c16cddb290 Merge branch 'azymohliad/update-uk' into 'master' 
Update Ukrainian translation

See merge request veloren/veloren!1749
 2021-02-03 16:18:50 +00:00
Andrii Zymohliad
7be836318b Update Ukrainian translation 2021-02-03 16:18:49 +00:00
Sam
78a2459e6d Changed knockback from an enum to a struct. 2021-02-02 13:06:30 -05:00
Pascal Fuhrmann
f4deb08a40 fixing #944 - LeapMelee fall damage fix & adjustments 2021-02-02 16:51:04 +00:00
James Melkonian
23b1df3cdd Add basic NPC interaction and fix NPC chat spamming 2021-01-31 20:29:50 +00:00
Joshua Barretto
60c16e57b1 Added snow particles 2021-01-31 15:15:17 +00:00
Sam
e38ecafc17 Restored knockback to hammer. 2021-01-29 13:46:23 -05:00
Treeco
a1e56c69a4 Fix traveller backpack having all its slots removed 2021-01-29 12:47:30 +00:00
Marcel
b88f04215e Merge branch 'DaforLynx/small-sound-fixes' into 'master' 
Small audio fixes; addresses #939 and #940

Closes #940 and #939

See merge request veloren/veloren!1739
 2021-01-29 11:37:10 +00:00
DaforLynx
c6e262c4ce Small audio fixes; addresses #939 and #940 2021-01-29 11:37:10 +00:00
jiminycrick
a02444825d Address some comments 
Eliminated extra stagger state

Responding to more comments

Move poise character state changes to character behavior system

Move poise out of JoinTuple/Data

Finish up comments (various fixes)
 2021-01-28 17:31:05 -08:00
jiminycrick
46c8c744fa Add migration for starter gear 2021-01-28 17:22:39 -08:00
jiminycrick
152156d065 Fix rebase and scrub poise from UI 2021-01-28 17:22:39 -08:00
jiminycrick
661764f4aa Some preliminary balancing 
Fix rebase
 2021-01-28 17:22:39 -08:00
jiminycrick
dd69b5f2bc Poise stats 2021-01-28 17:22:35 -08:00
jiminycrick
c83296a4ec Initial broken implementation of poise 
Character movement no longer broken.
 2021-01-28 17:22:33 -08:00
Entropy9s
1f6cf7e155 StaminaPlus buff, modifying stamina via buffs 
trying to fix this, coming back to this later

please remember to change potion back future self!

this ALMOST works. maybe MR ready, kinda jank tho

so close, and yet so far...

IT WORKS IT WORKS IT WORKS IT WORKS IT WORKS IT WO

did the same with health, ill fix this garbage l8r

think we're basically done here

whoops forgot to change the food back

fixing and cleaning up part 1

fixed everything part 2 now with buff images

ran clippy + fmt, fixed items that i modified

bracket bulldozing, boldly

hopefully this should be good?

need to rebase real quick

please let me be done

StaminaPlus buff, modifying stamina via buffs

trying to fix this, coming back to this later

please remember to change potion back future self!

this ALMOST works. maybe MR ready, kinda jank tho

so close, and yet so far...

IT WORKS IT WORKS IT WORKS IT WORKS IT WORKS IT WO

did the same with health, ill fix this garbage l8r

think we're basically done here

whoops forgot to change the food back

fixing and cleaning up part 1

fixed everything part 2 now with buff images

ran clippy + fmt, fixed items that i modified

hopefully this should be good?

cargo clippy fmt stuff

deleted an extraneous file?? how did that even...?
 2021-01-26 22:47:55 +00:00
Scott Williams
0cde434e3b All gems make a sound. 2021-01-25 22:53:23 +00:00
Sam
9b7edcf32f Changed how beams determined the energy regen and energy cost. 2021-01-24 23:47:10 -05:00
Snowram
ad6cdcab71 Merge branch 'swilliams/gems' into 'master' 
Adds 6 different gems and removes shiny gem.

See merge request veloren/veloren!1729
 2021-01-25 01:25:40 +00:00
Scott Williams
efd953b4f4 Added other gems to crafting loot table. 2021-01-24 19:49:42 +00:00
Scott Williams
e50bd4dc6f Changed some recipes to use other gems. Removed DELETE statements from migration. 2021-01-24 19:45:44 +00:00
Sam
6dd740feaa Nerfed bow M1 and M2, slightly buffed bow skillbar ability. 2021-01-24 14:24:59 -05:00
Scott Williams
be311f8ff2 Added gem models for item_manifest 2021-01-24 18:20:10 +00:00
Scott Williams
157e56d8ca Removed Shiny Gem, Added migration to change shiny gems to diamonds. Changed shiny gem recipes to diamonds 2021-01-24 16:40:22 +00:00
Sam
314f0428fc Rebalanced mindflayer. 2021-01-24 10:56:12 -05:00
Scott Williams
32bbdffc38 Added 6 gems, removed shiny gem from cave, replaced with diamond. 2021-01-24 14:00:49 +00:00
Monty
7cbf946a65 6 new sceptres, add DPS display to tooltips 2021-01-23 23:10:36 +01:00
Samuel Keiffer
39d1c9e885 Merge branch 'sam/skill-balancing-1' into 'master' 
Skill balancing

See merge request veloren/veloren!1716
 2021-01-23 21:12:35 +00:00
Rotsuoy
994677a4d0 Rotsuoy/savanna grass 2021-01-23 07:46:54 +00:00
Sam
5e4b6809ca Sceptre nerfs. 2021-01-22 22:46:18 -05:00
Sam
b5a3b3442c Addressed comments. 2021-01-21 17:45:03 -05:00
Snowram
8b06d844f7 Golem spinmelee anim 2021-01-21 01:23:10 +01:00
Sam
c888ec0535 Golems are now lactose tolerant. 2021-01-20 11:54:57 -05:00
Monty Marz
1eb7f78189 Revert "Added TR translations for deaths by debuffs." 
This reverts commit 0817e45e13.
 2021-01-20 11:20:06 +00:00
jiminycrick
7dda25a66d More footstep sfx based on distance 2021-01-19 19:51:19 -08:00
Sarra
f12e9f1665 small sfx fix, adding consume sfx for salads and lettuce 2021-01-19 16:24:44 -05:00
Acrimon
6f82ac352d Merge branch 'acrimon/build-tip' into 'master' 
Add a tip about the build command

See merge request veloren/veloren!1699
 2021-01-19 20:45:26 +00:00
Sarra Kitty
e7d852835c Sarrakitty/rotsys item sprites 2021-01-19 18:23:44 +00:00
Acrimon
21ecb15571
build tip 2021-01-19 19:02:41 +01:00
Monty Marz
ac60bf5794 Better visuals for skill button labels, don't show "0 EXP" in the SCT 
Made functions that were called every frame significantly cheaper.

Final UI fixes.
 2021-01-19 08:08:29 -05:00
Sam
eaa41c7dea Skills are now factored into combat rating. New formula for exp scaling per SP. 
Adjust lvl up msg fade

Add female humanoid names WIP

Changed text formatting when skill is max level. Added message to show you have 0 skill points available.

Addressed a lot of comments.

various changes to UI

- fix skillbar offset
- remove CR indicators for group members
- add CR indicators to group member frames
- use unified CR indicator icon

Exp reward tweaks.

Fixed flamethrower range skill description.
 2021-01-19 08:08:26 -05:00
jshipsey
5d1993009f keyframed axe spin 
Fixed error in converting FK to entity_id from character_id.

Giant match statements in persistence.

Tweaked roll.

Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
 2021-01-19 08:08:18 -05:00
Monty
5362000de4 adjusted potions, refined level up message animation 
fixed incorrect translation used on axe double strike regen skill

Changed migration so that skills and skill groups foreign key to entity_id instead of character_id
 2021-01-19 08:08:14 -05:00
Monty Marz
de5c5702b3 stats display 
Addressed comments.

Addressed comments.
 2021-01-19 08:08:11 -05:00
Sam
c809569f6b Added level up sound to skill point gain. Fixed tests. 
Fixed duplicate roll description.
 2021-01-19 08:08:08 -05:00
Noé
acbd965e65 implemented en translation for Hammer, Bow, Scepter and Staff skills 
skill tree translation

Clamped earning SP to avoid u16 overflow.

translation fixes

Fixed exp scaling function

Fixed exp scaling function

remove debug combat rating display

Update overhead.rs

implemented en translation for Axe
 2021-01-19 08:08:02 -05:00
Sam
a606313856 Added scaling exp costs per skill point. 
Fix tooltip being red.

multiple fixes, started translation

change exp giving items
adjust loot tables
adjust combat rating indicators
fix group frame offsets
 2021-01-19 08:07:57 -05:00
Sam
ae8c8b47f1 Added tooltips with numbers. Balancing on some skills. 
Added experience scaling for tougher enemies.
 2021-01-19 08:07:51 -05:00
Sam
89766b2b34 Added command to give yourself skill points. 
adjusted social window

Changelog
 2021-01-19 08:07:49 -05:00
Sam
986c05621a Wired up skill UI to check for prerequisites being met and sufficient skill points. 
available SP check in general HUD, more skill icons

Trimmed 2000 lines from a file.

UI tweaks
 2021-01-19 08:07:45 -05:00
Sam
4b52574750 Skill point gains are displayed in hud. 
level up message visuals and functionality

Handles simultaneous skill point gains in UI.
 2021-01-19 08:07:41 -05:00
Monty Marz
30df603115 flashing buttons for available points, WIP lock/unlock indicator 
Condensed UI code. Removed some hardcoding.

icons

squash later, WIP colouring for unavailable skills
 2021-01-19 08:07:33 -05:00
Sam
51c0bd765f Database support for refunding skills. 
Nonfunctional xp floaters, squash when working.

more icons, lock visuals
 2021-01-19 08:07:29 -05:00
Monty Marz
48bd921d0a EXP bar and available points UI 
fix overhead UI

Add WIP overhead difficulty indicator

readd commented out exp counter for later use

Wired skill information into UI.
 2021-01-19 08:07:25 -05:00
Sam
c0c45a1996 Purged stats, including level and experience 2021-01-19 08:07:23 -05:00
Sam
48c98b11cf General combat skill tree. 
UI for general skill tree
 2021-01-19 08:07:20 -05:00
Monty Marz
58d9534496 cleaned up skillbar, adjusted buffs placing 
cleaned up skillbar, adjusted buffs placing

cleaned up skillbar, adjusted buffs placing

render diary example items in voxygen instead of using pre-rendered image files
 2021-01-19 08:07:16 -05:00
Sam
bde2bc1f77 UI for sword skill tree 
Axe skill tree UI

Hammer skill tree UI

Bow skill tree UI

moar renders

Staff skill tree UI

Sceptre skill tree UI
 2021-01-19 08:07:12 -05:00
Monty Marz
3f436079e8 Skill-Tree UI 
switchable tabs
rework icons, fix cursor toggle
auto slot placing

Bow leap skill changed to bow glide skill.
 2021-01-19 08:07:06 -05:00
Sam
0ccbdc3b8c Sceptre skill tree. 2021-01-19 08:07:03 -05:00
Sam
5c7705f874 Staff skill tree. 2021-01-19 08:07:03 -05:00
Sam
662a08defc Implemented bow skill tree. 2021-01-19 08:07:02 -05:00
Sam
4dfe14c103 Hammer skill tree complete. 2021-01-19 08:07:02 -05:00
Sam
72604e8a4e Axe skill tree functional. 2021-01-19 08:07:01 -05:00
Sam
cc60ca58be Added sword skill tree 2021-01-19 08:06:59 -05:00
Sam
0e84ba18c2 Moved skill max level and skill prerequisites into ron files. 2021-01-19 08:06:59 -05:00
Sam
5a23f063a0 Ron file now used for skills belonging to each skill group. 2021-01-19 08:06:58 -05:00
Jesus Bracho
ec79890335 Provide buff information on killed entities 2021-01-18 05:46:53 +00:00
Acrimon
c5e3828c64 Merge branch 'master' into 'master' 
Update tr_TR to new multi file format.

See merge request veloren/veloren!1671
 2021-01-14 12:25:22 +00:00
Monty Marz
06e7ac25c1 fix loot tables, enemy bar color change 2021-01-09 15:26:24 +01:00
Ben Wallis
aef2637288 Refactored loadout to have public functions for each slot instead of requiring callers to use the _INDEX consts 2021-01-08 19:12:09 +00:00
Tadabito
db9a6a4cec Update tr_TR to new multi file format. 2021-01-02 12:04:04 +03:00
Vincent Foulon
da81b2f0b2 Update i18n's README.md to correct grammar and formatting 
Address the following reviews:
https://gitlab.com/veloren/veloren/-/merge_requests/1666#note_476145978
https://gitlab.com/veloren/veloren/-/merge_requests/1666#note_476145980
https://gitlab.com/veloren/veloren/-/merge_requests/1666#note_476145981
 2020-12-31 12:32:22 +01:00
Vincent Foulon
7a4c3fa9a6 renamed _root.ron files to _manifest.ron 2020-12-31 12:32:21 +01:00
Vincent Foulon
b3758d12e4 rename a translation file to prevent it from being ignored by git 2020-12-31 12:32:20 +01:00
Vincent Foulon
7150e1f820 rename a translation file and clear some commented code 2020-12-31 12:32:19 +01:00
Vincent Foulon
bb7cc3d53b (temp?) fixed list_localization function + add sub_directories to other languages 2020-12-31 12:32:17 +01:00
Vincent Foulon
00140384f7 convert the other languages into folders 2020-12-31 12:32:16 +01:00
Vincent Foulon
3295ff2c58 created LocalizationFragment + load localization sub directories 2020-12-31 12:32:16 +01:00
Vincent Foulon
924c24fa78 (PoC)(WIP) Convert single translation file to a folder 2020-12-31 12:32:15 +01:00
Joshua Barretto
a404707f87 Avoid div0 in shiny water shader 2020-12-30 22:18:19 +00:00
Nícolas Wildner
dc46618b4c Update pt_BR.ron 2020-12-27 00:09:12 +00:00
Sarra Kitty
e8eb2b3a6c new gliders 
added sandraptor glider

added sandraptor glider

stuff

working on other raptor gliders

adding file and placeholder model (copy of morpho) for monarch butterfly gliders

adding models for snow and wood raptor gliders

added a proper model for the monarch glider

adding crafting recipies for raptor gliders, and raptor feather item for the recipe. Made monarch and morpho rare drops in cave loot table

made raptors drop their feathers

fmt
 2020-12-24 02:54:18 +00:00
Justin Shipsey
be4d8a7138 Merge branch 'snowram/npcs-names-json-to-ron' into 'master' 
Converts npcs names file to ron

See merge request veloren/veloren!1659
 2020-12-23 07:43:57 +00:00
unknown
3c1e1c6733 Converts npcs names file to ron 2020-12-23 00:58:25 +01:00
Entropy
e62c77f452 i am stupid and forgot iron ingots, whoops. 2020-12-22 13:07:23 -08:00
Justin Shipsey
9af232c6e9 Merge branch 'entropy9s/BasicIngredients' into 'master' 
Basic Crafting Ingredients

See merge request veloren/veloren!1609
 2020-12-18 20:28:44 +00:00
Entropy
6f331e0435 changed sec count to be consistent w/ other foods 2020-12-17 12:43:33 -08:00
Monty
8b9db7b179 cleanup, changelog, small bugfixes 
fmt
fix rebase
fmt
 2020-12-14 21:52:24 +01:00
Monty Marz
b5a2104ca5 group member indicator visuals 
functional group member indicators
adjust visuals
z-comparison
 2020-12-14 21:16:13 +01:00
Joshua Barretto
985156fca4 Merge branch 'zesterer/gfx' into 'master' 
Made LoD water reflective

See merge request veloren/veloren!1632
 2020-12-14 18:49:59 +00:00
Snowram
834670a641 Merge branch 'snowram/objects-offsets-ron' into 'master' 
Put objects offsets into a .ron file

See merge request veloren/veloren!1627
 2020-12-14 18:00:07 +00:00
Joshua Barretto
49cabfae18 Made LoD water reflective 2020-12-14 16:52:33 +00:00
Snowram
96ed008348 Puts objects offsets into a .ron file 2020-12-14 02:43:49 +01:00
Samuel Keiffer
c3732a8a8c Merge branch 'nahua/replace_sceptre_m2_sound' into 'master' 
Issue 872: Replace explosion sound with heal bomb sound for sceptre M2

See merge request veloren/veloren!1618
 2020-12-13 23:18:30 +00:00
nahuakang
f3ed13ca09 Replace explosion sound with heal bomb sound for sceptre M2 2020-12-13 22:09:28 +01:00
Entropy
d533d08707 extraneous periods go away 2020-12-11 19:20:36 -08:00
Entropy
71d98d34fb Adding some basic consumable crafting ingredients 
more stuff being squashed in. tons of non-food items added
 2020-12-11 19:20:35 -08:00
Marcel
e54b4d5797 Merge branch 'DaforLynx/campfire-loading-tip' into 'master' 
Loading screen tip for campfire healing

See merge request veloren/veloren!1601
 2020-12-12 00:29:57 +00:00
DaforLynx
70814ee922 Loading screen tip for campfire healing 2020-12-12 00:29:57 +00:00
Marcel
9b1bc41f6e Merge branch 'jacki/german' into 'master' 
Updated de_DE translation

See merge request veloren/veloren!1572
 2020-12-11 23:51:00 +00:00
Tobias Frisch
23e3964059 Updated de_DE translation 
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
 2020-12-11 23:51:00 +00:00
Vincent Foulon
2503d79567 Update French Translation 2020-12-11 23:29:44 +00:00
Monty Marz
f9d4d744a0 Better group frame placement 2020-12-10 21:31:19 +01:00
Snowram
ecdbd1c5d6 Makes consumables heal faster 2020-12-10 18:06:32 +01:00
Pfauenauge90
6d1bae67d0 adjust mindflayer strength, fix en translation, update es_la translation, fix undead eyes 2020-12-10 18:06:31 +01:00
Monty Marz
f2ba7cc297 add baobabs, fix map difficulty, make mushrooms lootable 2020-12-10 18:06:29 +01:00
Justin Shipsey
4bdd84ab46 Merge branch 'snowram/fishes' into 'master' 
Add fishes

See merge request veloren/veloren!1577
 2020-12-09 02:59:55 +00:00
Entropy
98688651b5 changed kickers to use 3 leather 2020-12-08 16:27:21 -08:00
Snowram
526d3bd035 Vacations are never over 2020-12-08 23:03:40 +01:00
Snowram
f94a4ec90d Improves fish_small, new npc 2020-12-08 23:03:39 +01:00
Snowram
72d73ecd38 Initial fish work 2020-12-08 23:03:38 +01:00
Sam
490915d384 Modified how most abilites that could scale were scaled. 2020-12-07 22:00:24 -06:00
Joshua Barretto
b37be14b86 Added cave mushrooms 2020-12-05 18:00:29 +00:00
Joshua Barretto
a5c37262dd Better aurora 2020-12-05 11:20:25 +00:00
Joshua Barretto
e413392694 Better mist access 2020-12-05 11:20:25 +00:00
James Melkonian
71303fecfd Aura System and Campfire Health Regen 2020-12-04 22:24:56 +00:00
iOddishGX
31e2e93786 Lowered the energy cost from 80 to 40 
Increased the healing multiplier
Lowered the damage output
Increased the radius
Made the projectile slightly faster
 2020-12-01 20:01:24 +00:00
Marcel
a431fe3fad Merge branch 'sam/dehardcode-energy' into 'master' 
Graying out skills with insufficient energy no longer dependent on hard-coded values

Closes #824

See merge request veloren/veloren!1560
 2020-11-27 16:27:09 +00:00
Samuel Keiffer
352917d9cb Graying out skills with insufficient energy no longer dependent on hard-coded values 2020-11-27 16:27:09 +00:00
Snowram
b316e9aa7c Updates ru_RU translation 2020-11-26 22:59:39 +01:00
Sam
6a6260daa1 Weapon combat fixes: 
- Modified energy and speed scaling of sword, axe, and hammer combo melees.
 - Nerfed bow basic attack knockback. Buffed bow damage and energy regen.
 - Corrected xp values for theropods. Removed unnecessary function for xp increase per level.
 - Guards no longer flee at low health.
 - Buffed sword spin.
 - Nerfed axe spin and sword dash moderately.
 - Dash now takes a little time to reach full speed. Sword M2 and hammer M1 damage values tweaked.
 2020-11-26 09:15:45 +01:00
Marcel
103c2302b0 Merge branch 'azymohliad/add-ukrainian' into 'master' 
Added Ukrainian translation

See merge request veloren/veloren!1555
 2020-11-25 17:21:32 +00:00
Andrii Zymohliad
733a471090 Added Ukrainian translation 2020-11-25 17:21:32 +00:00
Monty Marz
e7d27a2c21 fmt 
cleanup
 2020-11-25 16:53:48 +00:00
Yusuf Bera Ertan
3c887315ae
update Turkish translations 2020-11-25 15:46:56 +03:00
DaforLynx
6783e13125 Added two new songs along with edits to the .ron 
comma
 2020-11-25 08:25:40 +00:00
Marcel
d1a9264a99 Merge branch 'angryanimals' into 'master' 
animal attacks

See merge request veloren/veloren!1542
 2020-11-25 01:33:20 +00:00
Sam
5461f002fe Correct beam offsets used. Fix scaling damage on hammer M1. Add can_strafe function to body. 2020-11-24 17:56:39 -06:00
Sam
8ab2d2524a Changed default main and secondary tool from Some(empty) to None. 
weapon fixes
 2020-11-24 17:49:04 -06:00
jiminycrick
aad9734055 Agent tactic refactoring 
Lower theropods spawns

clippy, changelog

review response
 2020-11-24 17:49:00 -06:00
jiminycrick
1cf0aff5ef More ai work 
balance

Lavadrake AI tweaks

feedback tweaks
 2020-11-24 17:48:54 -06:00
jshipsey
d10dd83e5f theropods in world, small tweaks 2020-11-24 17:48:51 -06:00
jshipsey
f411ff7e04 bunch of animations and more attacks 2020-11-24 17:48:51 -06:00
jshipsey
6f72e68ad6 hoof attack, tweaks 2020-11-24 17:48:50 -06:00
jiminycrick
1337fdaa57 Generalize rotation time 2020-11-24 17:48:49 -06:00
jshipsey
a27b086401 placeholder for charge animal, animated leapmelee, small fixes 2020-11-24 17:48:49 -06:00
jiminycrick
a1aa3efd29 Moved hit timer to charged melee and adjusted for tail slap 2020-11-24 17:48:48 -06:00
jshipsey
1f59ef92d8 species specific speeds, more animation 2020-11-24 17:48:48 -06:00
jiminycrick
6b534729be Initial AI for quad low 2020-11-24 17:48:47 -06:00
jshipsey
c07d8df58b assigning weapons, building animations 
ability mapping
 2020-11-24 17:48:43 -06:00
jiminycrick
793d6095b3 Maneater AI 
Rebase fixes and maneater AI
 2020-11-24 17:48:38 -06:00
jshipsey
e3e513cc11 initial quadlow ranged work 2020-11-24 17:48:27 -06:00
jshipsey
ae06016e9a Wolf attacks and ai. 
initial wolf dash testing

tool.rs

Wolf attack AI
 2020-11-24 17:48:20 -06:00
Joshua Barretto
46dc49bc0a Fixed bit-twiddling colour bug 2020-11-24 18:44:41 +00:00
Christof Petig
a3db20c9d6 Show caves in map 2020-11-23 19:05:17 +01:00
Joshua Barretto
e770e88af5 Better town colour 2020-11-23 10:58:22 +00:00
Monty Marz
d069eb9a57 street lamp particles, ground fire bowl, misc fixes 2020-11-23 10:58:21 +00:00
Joshua Barretto
e461fbd951 Make chimneys glow 2020-11-23 10:58:21 +00:00
Joshua Barretto
4bb0da24b6 Addressed review comments 2020-11-23 10:57:57 +00:00
Snowram
0737c71749 Adds new cultist armors, defines loadouts for dungeons 2020-11-23 10:57:57 +00:00
Joshua Barretto
8fd2e4537d Addressed review comments 2020-11-23 10:57:57 +00:00
Monty Marz
8e18b26031 Update street_lamp.vox 2020-11-23 10:57:57 +00:00
Joshua Barretto
bb9e593a44 Fixed glow AO 2020-11-23 10:57:57 +00:00
Joshua Barretto
b4e3dbc719 Added glow tint 2020-11-23 10:57:57 +00:00
Joshua Barretto
d7bbceca2d Added light/glow map sample interpolation for entities 2020-11-23 10:57:56 +00:00
Joshua Barretto
27e7fd0727 Preserved light/glow maps to prevent sprites/entities being lit when they shouldn't be 2020-11-23 10:57:56 +00:00
Joshua Barretto
51d1a2ecff Added glow 2020-11-23 10:57:56 +00:00
Joshua Barretto
a0f0417f8f Fixed close cloud sampling issue 2020-11-23 10:57:56 +00:00
Monty Marz
099dfc959f translations, fixes 2020-11-23 10:57:56 +00:00
Monty Marz
5b907ede9e fix hints 2020-11-23 10:57:55 +00:00
Joshua Barretto
058908f603 Made flamethrower and healing staff emit light on use 2020-11-23 10:57:55 +00:00
Monty Marz
97934d1070 map fixes 2020-11-23 10:57:55 +00:00
Joshua Barretto
5930ca4a59 Temporarily make particles opaque to avoid depth-related rendering problems 2020-11-23 10:57:55 +00:00
Joshua Barretto
7eb437501d Fixed various particle issues 2020-11-23 10:57:55 +00:00
Joshua Barretto
0f2e7434fc Sun, brightness, and gamma adjustments 2020-11-23 10:57:55 +00:00
Joshua Barretto
bcc220804a Added exposure to settings 2020-11-23 10:57:55 +00:00
Joshua Barretto
062ce4b158 Resolved or patches various water shader issues 2020-11-23 10:57:16 +00:00
Joshua Barretto
1e7b9fa9b5 Resolved or patches various water shader issues 2020-11-23 10:57:16 +00:00
Joshua Barretto
86571c9e2e Partially fixed mist 2020-11-23 10:57:15 +00:00
Joshua Barretto
aa59d66a76 Fixed many map problems, re-added surface mist 2020-11-23 10:57:15 +00:00
Joshua Barretto
579bdcf10e Forest soil undulation, better acadia placement 2020-11-23 10:57:15 +00:00
Monty Marz
99b3a4465a WIP map zooming and dragging 2020-11-23 10:57:15 +00:00
Joshua Barretto
ef03137c65 Better water, shadows, clouds 2020-11-23 10:57:15 +00:00
Joshua Barretto
be1fb5b5d2 Shader quality tweaks 2020-11-23 10:57:15 +00:00
Joshua Barretto
0e8a14250f Minor emissions tweaks 2020-11-23 10:57:15 +00:00
Joshua Barretto
42c6142ec6 Added occasional sky emission at night 2020-11-23 10:57:15 +00:00
Joshua Barretto
e09c22f9cc Altered splay to avoid strange LoD shape 2020-11-23 10:45:02 +00:00
Monty Marz
c825e33f1a map icon options WIP 2020-11-23 10:45:02 +00:00
Joshua Barretto
34987c1654 Don't do gamma twice 2020-11-23 10:45:02 +00:00
Joshua Barretto
271c1e29a5 Adjusted sun/moon for HDR 2020-11-23 10:45:02 +00:00
Joshua Barretto
1d031538f9 Added HDR 2020-11-23 10:45:02 +00:00
Joshua Barretto
49df604de0 Better scattering and scatter (of both varieties) 2020-11-23 10:45:02 +00:00
Joshua Barretto
ee65b4fb17 Improved cloud quality by improving sun access heuristic 2020-11-23 10:45:02 +00:00
Monty Marz
1864f4626c map icons 2020-11-23 10:45:01 +00:00
Joshua Barretto
de685b00b2 Improved water pathfinding 2020-11-23 10:45:01 +00:00
Joshua Barretto
b352ef5d55 Terrain pop-in, fixed agent pathfinding in water 2020-11-23 10:45:01 +00:00
Joshua Barretto
717fd88565 Experimental dissolve VD 2020-11-23 10:45:01 +00:00
Joshua Barretto
6adfa547db Added site icons to main map 2020-11-23 10:45:01 +00:00
Joshua Barretto
d4d4f17d3c Added world map size icons 2020-11-23 10:45:01 +00:00
Joshua Barretto
c906764889 Better LoD 2020-11-23 10:45:01 +00:00
Monty Marz
f448212515 Update leather_blue-0.vox 2020-11-23 10:45:01 +00:00
Monty Marz
225756b011 npc armour 2020-11-23 10:45:01 +00:00
Monty Marz
427f431ac8 Duh. 2020-11-23 10:45:00 +00:00
Joshua Barretto
99a881f349 Added entity simulation to rtsim, reification, assimilation 2020-11-23 10:44:59 +00:00
Joshua Barretto
2b5e09e32e Better high-quality clouds 2020-11-23 10:38:00 +00:00
Joshua Barretto
c3cedd4ddf Improved cloud quality 2020-11-23 10:37:59 +00:00
Monty Marz
9e290d59ae more quirky dry assets 2020-11-23 10:37:59 +00:00
Knarkzel
7a917f87e1 added norwegian 2020-11-20 16:49:32 +01:00
jiminycrick
9272eee55b Switched out wind sfx 2020-11-18 17:07:40 -08:00
Snowram
d98bfa72ad Improves bipedlarge and theropod anims, balance tweaks 2020-11-19 00:56:50 +01:00
Snowram
b48de84f8c Adds 3 new npcs 2020-11-19 00:53:17 +01:00
Snowram
44fe398ba3 Adds 2 new npcs, some models tweaks 2020-11-19 00:53:13 +01:00
Snowram
42d2108c39 Adds mindflayer npc 2020-11-19 00:53:09 +01:00
Snowram
9bfccd42d3 Adds new animals 2020-11-19 00:53:02 +01:00
jiminycrick
2d2f267907 Addressed comments and fixed pipeline 2020-11-18 13:31:13 -08:00
jiminycrick
3b47add55a Fully move sfx away from ECS event bus 2020-11-18 13:31:13 -08:00
jiminycrick
b3aa454f8e Initial work to move combat sfx to outcomes 2020-11-18 13:31:12 -08:00
jiminycrick
a9711eea01 Beginning to address comments 2020-11-18 13:31:12 -08:00
jiminycrick
c44a9092d3 Biome definition tweaks and more sfx 2020-11-18 13:31:12 -08:00
jiminycrick
a684bc90fd Quadraped footsteps and songs in biomes 2020-11-18 13:31:12 -08:00
jiminycrick
e1fcb3744e Comment out audio device picker 2020-11-18 13:31:12 -08:00
jiminycrick
d47e0bbb73 Getting merge ready minus device picker 2020-11-18 13:31:12 -08:00
jiminycrick
695cc7f5cb Broken wind implementation 2020-11-18 13:31:12 -08:00
jiminycrick
9b759efe41 Snow footsteps 2020-11-18 13:31:12 -08:00
jiminycrick
09a1974974 River water sfx 2020-11-18 13:31:12 -08:00
jiminycrick
d0bd5118bf Made biome probabilities neater 2020-11-18 13:31:12 -08:00
jiminycrick
e880654f2e Probability for biome play 2020-11-18 13:31:12 -08:00
jiminycrick
c8d79b0b0e Dungeon and cave specific music 2020-11-18 13:31:12 -08:00
jiminycrick
0a9f1ee11c Remove ambient channel system in favor of sfx system 2020-11-18 13:31:12 -08:00
jiminycrick
39d4ee8a96 Owls, campfires, and better bird sfx handling 2020-11-18 13:31:12 -08:00
jiminycrick
c6a443ac0f fixed false audio track lengths 2020-11-18 13:31:12 -08:00
jiminycrick
3169562a80 Night time sfx and swimming 2020-11-18 13:31:12 -08:00
jiminycrick
aa6b7cbb65 Bird calls from trees 2020-11-18 13:31:12 -08:00
jiminycrick
9e790f6cac Really broken block sfx pushed so others can see 2020-11-18 13:31:12 -08:00
jiminycrick
3473347742 Sfx from blocks 2020-11-18 13:31:12 -08:00
jiminycrick
0689630d98 Fading music/ambient sounds decently upon biome transition 2020-11-18 13:31:11 -08:00
jiminycrick
b5aea464f3 Switch music at biome transitions 2020-11-18 13:31:11 -08:00
jiminycrick
46d3f6f6d2 Initial biome specific music and ambient sound channel 2020-11-18 13:31:11 -08:00
Knarkzel
e0265012e8 added to changelog 2020-11-16 17:01:55 +01:00
Knarkzel
e0a814b3f8 dont allow spam op hammer when stamina is 0 2020-11-16 17:00:04 +01:00
Joshua Barretto
171ef1d7b9 Upscaling support 2020-11-15 22:18:35 +00:00
Imbris
03c96a7c7b Properly use localization specified fonts, fix swedish translation by adding other fonts to the font mapping list 2020-11-14 21:31:31 -05:00
Sam
050ad82e55 Abilities are now loaded from .ron files. 2020-11-12 21:24:34 -06:00
Sam
4c6ee4b161 Created manifest file to tie abilities to a particular weapon kind. 2020-11-12 21:24:33 -06:00
Sam
770aaf6b93 Added projectile constructor. Removed a bunch of cloning. 2020-11-12 21:24:32 -06:00
Sam
abf7301a89 Changed how buffs were constructed on projectiles. 2020-11-12 21:24:32 -06:00
Sam
f4244ecbaf Added ron files for unique and WIP tools. 2020-11-12 21:24:31 -06:00
Sam
a4bfe07fbc Created ron files for abilities of the base 6 weapons. 2020-11-12 21:24:31 -06:00
Snowram
fe977f0a6c Adds a speed stat to weapons 2020-11-11 22:03:53 +01:00
Imbris
865482d768 ui: Improve login info banner gradient, smallify things, put login menu quit button at the bottom 2020-11-11 03:02:51 -05:00
Imbris
b84815cc0b Shink file size of some image assets 2020-11-11 03:02:51 -05:00
Imbris
eec6d68585 Update changelog 2020-11-11 03:02:49 -05:00
Imbris
584824d405 Tweak scrollbar in char select screen to look nicer, fix warnings, remove old ui code, add character loading/deleting/creating/error info popups 2020-11-11 03:02:23 -05:00
Imbris
3b664d2efb Fix tooltip border images, fade tooltips properly, improve tooltip positioning 2020-11-11 03:02:22 -05:00
Imbris
0361272746 Update to reflect changes in master ui: switched daggers with sceptre, added background at the bottom of the loading screen, added randomize button in the char creation screen 2020-11-11 03:02:22 -05:00
Yusuf Bera Ertan
bae7f56393 add padding to language select and server select menu buttons so that the scrollbar doesn't overlap them 2020-11-11 03:02:22 -05:00
Yusuf Bera Ertan
52479fec2f add title to server select menu, don't use unneeded Container in language select menu 2020-11-11 03:02:22 -05:00
Yusuf Bera Ertan
5af6757de0 add language selection menu to main menu screen 2020-11-11 03:02:22 -05:00
Imbris
42c6550a0b Add more parts of the character selection screen, add mouse detector widget, misc tweaks 2020-11-11 03:02:22 -05:00
Imbris
de770694d8 Basic structure of character selection 2020-11-11 03:02:22 -05:00
Imbris
586bdddc9e Add gradient primitive to ui, adjust textbox aspect ratio, misc tweaks 2020-11-11 03:02:22 -05:00
Imbris
545f3bd44b Start rewrite of character selection with iced 2020-11-11 03:02:21 -05:00
Imbris
10c046be2f Delete conrod main menu code!!!!!!, small tweaks 2020-11-11 03:02:21 -05:00
Imbris
73982637b2 Add styling for Container, implement auth trust prompt, misc additions 2020-11-11 03:02:21 -05:00
Imbris
561068106e Add input fields to main menu attempt, fix a few bugs, add bullet point to the font (might have done this wrong). (just a few glitches left when text contains spaces) 2020-11-11 03:02:21 -05:00
Imbris
bc0792a57a Rename localization/font types (e.g. VoxygenLocalization -> Localization) 2020-11-11 03:02:21 -05:00
Imbris
29526977d8 Add support for Space widget, refine main menu ui, misc fixes and improvements. 2020-11-11 03:02:20 -05:00
Imbris
b25162635a Revamp BackgroundContainer with scale specific padding, and use in main menu attempt 2020-11-11 03:02:20 -05:00
Imbris
5428feb0df Add Stack and CompoundGraphic widgets 2020-11-11 03:02:20 -05:00
Sam
e90104ba0f Yeet 2020-11-10 19:59:55 -06:00
Sam
e6693d5979 Yeet 2020-11-10 15:49:51 -06:00
Monty Marz
0e072f72cc frost cleaver 
velorite mage set

offsets
armor stats
 2020-11-10 21:43:45 +00:00
Justin Shipsey
a8ac051f33 Merge branch 'james/axe-hammer-keyframes' into 'master' 
James/axe hammer keyframes

See merge request veloren/veloren!1497
 2020-11-10 01:03:11 +00:00
Joshua Barretto
b09148abee Updated changelog, removed old models 2020-11-09 17:19:29 +00:00
Joshua Barretto
3f02aa5134 Removed more redundant code, desert dunes, better bridges 2020-11-09 10:20:22 +00:00
Joshua Barretto
9b233708e2 Turned tree generation into a post-processing layer, ripped out old tree generator for performance wins 2020-11-09 10:20:22 +00:00
Marcel
981b71759e Merge branch 'xMAC94x/auth-link' into 'master' 
adjust path to veloren account page

See merge request veloren/veloren!1498
 2020-11-09 09:01:59 +00:00
Marcel Märtens
d9f7a72139 adjust path to veloren account page 2020-11-09 09:21:14 +01:00
jshipsey
92aa6a1b12 axe basic 2020-11-08 18:51:35 -05:00
Sam
08a0926c40 Fixed sneaky admin sword. 2020-11-08 13:58:23 -06:00
Justin Shipsey
8cab21d44c Merge branch 'AlKabir/animals-dont-drop-lootbags' into 'master' 
Make different mobs drop different assets on death (not just lootbags)

See merge request veloren/veloren!1462
 2020-11-08 07:26:10 +00:00
jiminycrick
66dbfebf3b Asset ron file fix 2020-11-07 22:06:08 -08:00
AlKabir
aaac3dadcb improved the steak asset 2020-11-07 23:52:18 -06:00
AlKabir
6535deae9c added two meat assets for mobs to drop 2020-11-07 23:34:20 -06:00
Sam
aeca76c748 Fixed cultist sword not displaying correctly in inventory. 2020-11-07 21:48:24 -06:00
Sam
b4296c3a2c Fixed stupid error. 2020-11-07 19:54:37 -06:00
Imbris
133ba82a9b Use item_definition_id for weapon asset mapping 2020-11-07 16:44:11 -06:00
Sam
8adee6ef20 Added Tool() around file paths in other manifest. 2020-11-07 15:53:19 -06:00
Sam
261ebf3990 Added Tool() around file paths. 2020-11-07 15:53:18 -06:00
Sam
d484ac2e38 Yeeted from ron files. 2020-11-07 15:53:16 -06:00
Sam
ca65cdace1 Yeeted from manifest files. 2020-11-07 15:53:14 -06:00
Monty Marz
642ad805a1 potion buff 2020-11-06 01:08:34 +01:00
Snowram
0d92f02deb Buff stonegolem, nerf giants, add missing sfxs 2020-11-06 01:08:33 +01:00
Monty Marz
ca932f6c15 easier to get minor potions 
increase cost of a minor potion to 4 apples
 2020-11-06 01:08:32 +01:00
Monty Marz
eb79820c25 tweaks consumables buffs values 2020-11-06 01:08:32 +01:00
Snowram
a52f83e92c Addresses some comments 2020-11-06 01:08:31 +01:00
Snowram
ce96af4363 Allow for an arbitrary array of effects and buffs for consumables 2020-11-06 01:08:30 +01:00
Sam
a0af315930 Addressed comments. 2020-11-04 19:22:08 -06:00
Marcel
7517991d73 Merge branch 'TR_translations' into 'master' 
Updated translations

See merge request veloren/veloren!1473
 2020-11-04 16:13:53 +00:00
TheBoredProgrammer64
3f7b007227 Updated translations 2020-11-04 16:13:53 +00:00
Snowram
a6d5d87bbc Fix animations regressions for biped_large 2020-11-04 02:12:43 +01:00
jshipsey
fb1aae22dd manifests 2020-11-04 01:48:06 +01:00
jshipsey
f009492319 cleanup 4 2020-11-04 01:48:05 +01:00
unknown
14ec1b9f5f starting to wire in new wield setup for bipedlarge 2020-11-04 01:48:05 +01:00
jshipsey
28cde31bbb setup for staff, more anim conversions 2020-11-04 01:48:05 +01:00
Joshua Barretto
6331ad9455 Implemented Flight 2020-11-03 22:46:07 +00:00
Fausk
3679701ebf Grammar and length reduction, Lucerne and Pike Hammer swap names for consistency 2020-11-01 13:29:35 -07:00
Kelly Monroe
47adb2f1d1 Fixing up further grammar and length issues, Lucerne and Spike Hammer swap names 2020-11-01 13:29:35 -07:00
Fausk
477b575f4e fixup improved item descriptions for most items (no swords) 2020-11-01 13:29:35 -07:00
Joshua Barretto
0aca8ee0f7 Better minimal clouds 2020-10-30 15:43:51 +00:00
Joshua Barretto
70f0a7c57c Cloud tweaks 2020-10-30 15:43:51 +00:00
Tadabito
12d449f40f Added translation for place holder quest. 2020-10-28 20:36:19 +00:00
Tadabito
0e3980f656 Fixed the missing comma 2020-10-28 19:25:42 +00:00
Tadabito
e24addd87d Update tr_TR.ron 2020-10-28 18:44:34 +00:00
Monty Marz
900e654252 update german translation, add missing string to en file 2020-10-28 14:39:58 +01:00
Monty Marz
3f7b5a095b player buffs at minimap visuals 
Update settings.rs
buff timers
 2020-10-26 19:28:25 -05:00
Monty Marz
8fa398954d Initial implementation of buffs UI 
player buffs animation

more testing debuffs

sorting and display limit fix

overhead buffs

fix

WIP buff removal function

fmt

Update buffs.rs

Now with compiling: WIP group UI buffs

positioning

Update group.rs

Update group.rs

Small optimizations.

Fixed positioning of buffs in group panel. Broke buff tooltips in group panel.

buff frame visuals

added setting for displaying buffs at minimap
 2020-10-26 19:28:24 -05:00
Monty Marz
b31c6877b4 skillbar fixes, buff UI module 
adjustments, fixes, assets, test buffs widgets
 2020-10-26 19:28:23 -05:00
Monty Marz
f096bece5c skillbar update part 1 
skillbar rework part 2
 2020-10-26 19:28:21 -05:00
Sam
1a1ceb54bc Server event used to deal damage/heal with buffs. Buff kills now award xp. 2020-10-26 19:28:20 -05:00
Forest Anderson
14b5d01af3 Merge branch 'angel/add-dutch-translation' into 'master' 
Added Dutch translation

See merge request veloren/veloren!1446
 2020-10-22 18:09:52 +00:00
Joshua Barretto
2237500743 Clouds 2020-10-21 21:05:25 +00:00
Forest Anderson
709cef2665 More small fixes 2020-10-21 19:02:59 +00:00
Forest Anderson
4d22b93863 Some fixes by @Jurre 2020-10-21 18:45:00 +00:00
Forest Anderson
f79e13135e Added Dutch translation, created by @Namp007 2020-10-21 13:39:36 -04:00
jshipsey
64d73abdec roshwalr fix 2020-10-19 16:20:59 +02:00
jshipsey
caa048b1d5 small fixes 2020-10-19 16:20:59 +02:00
Snowram
7a62ddfd3f Add BeastClaw npc weapontype 2020-10-19 16:20:59 +02:00
Snowram
f9383e4dd8 Add roshwalr npc 2020-10-19 16:20:59 +02:00
Snowram
c9985e14cb Rename Saurok, various anim fixes 2020-10-19 16:20:58 +02:00
jshipsey
65df398672 werewolf work 2020-10-19 16:20:58 +02:00
Snowram
6c54e6d8fe Add sand, snow and wood raptor npcs 2020-10-19 16:20:58 +02:00
Snowram
588f66a1ee Add treant npc 2020-10-19 16:20:58 +02:00
Snowram
58e2d3a4ad More bipedlarge anim work 2020-10-19 16:20:58 +02:00
unknown
94cbe3faf4 Better bipedlarge weild, charge and shoot anims 2020-10-19 16:20:58 +02:00
unknown
d2f91bc3a0 Assigns a ToolKind to bipedlarge weapons 2020-10-19 16:20:58 +02:00
jshipsey
0e628ef67f rebase fix 2020-10-19 16:20:58 +02:00
Snowram
0a9ec848a7 add lizardman npcs 2020-10-19 16:20:58 +02:00
Snowram
f4a068c422 Initial bipedlarge beast walk animation 2020-10-19 16:20:57 +02:00
Snowram
204fa50de9 Add werewolf npc 2020-10-19 16:20:57 +02:00
Sam
14e4af7ab6 Addressed playtesting feedback. 2020-10-14 21:06:52 -05:00
jshipsey
6a744eed82 anims 2020-10-14 21:06:32 -05:00
Monty Marz
4b2eba71e7 new staff skill icons 2020-10-14 20:56:58 -05:00
Sam
7ef73f5981 Added particles for fire shockwave. Added ability key enum so held abilities could differentiate what button they should check. Modified energy fields on basic beam so it could drain energy every second. 2020-10-14 20:56:22 -05:00
Sam
cbb72363af Reworked explosions. Tweaked staff fireball. 2020-10-14 20:56:21 -05:00
Sam
04dcd012da Flamethrower particles. 2020-10-14 20:56:21 -05:00
Sam
c80f16ae74 Started to add particles. 2020-10-14 20:56:20 -05:00
jiminycrick
512d881cd2 Fixed clippy errors and added SFX 2020-10-14 15:30:58 -07:00
jiminycrick
95c36cc3fb Skill icons with proper rotation 2020-10-14 12:50:33 -07:00
jiminycrick
04175bab09 Add skillbar stuff for 3rd skills 2020-10-14 12:50:32 -07:00
Monty Marz
e1a77d040d loot table adjustments 
- decrease blue glider drop rate
- decrease cloth scaprs drop rate from villagers
- add crafting mats to crates instead
 2020-10-11 16:25:35 +00:00
Imbris
a3ee5a4006 Rename model_col -> highligh_col to better reflect its usage 2020-10-10 02:10:32 -04:00
Imbris
ef74d395a6 Improve figure and sprite highlighting 2020-10-10 02:10:31 -04:00
Monty Marz
2b800a2b63 make clippy happy 
Delete glider.ron
 2020-10-07 02:23:20 +00:00
Marcel
613b3b103f Merge branch 'undefined' into 'master' 
Correction of errors

See merge request veloren/veloren!1421
 2020-10-05 22:54:49 +00:00
Sam
e501235265 Loot table fix 2020-10-04 08:52:19 -05:00
pablo saavedra soler
90e795fd9f I have corrected many errors in Spanish grammar and dialect in Latin America 2020-10-04 06:41:35 +00:00
Sam
47abf49751 Addressed comments 2020-09-29 20:48:23 -05:00
Sam
207586cfab Beam particles fixed/tweaked. 2020-09-29 19:48:17 -05:00
Sam
0b80257aa3 Add migration 2020-09-29 19:48:15 -05:00
Sam
56d2afc0dc Added keyframe support to basic beam state. Addressed some comments. 2020-09-29 19:48:15 -05:00
Sam
37fcfb8b6f Created manifest for database to filepath for items. 2020-09-29 19:48:12 -05:00
Sam
3d6c26a3c7 Fully separated sceptres from staves. 2020-09-29 19:48:12 -05:00
Sam
3e2e06f2f8 Projectile effects are now drained, so that the same projectile can't trigger it's effects on multiple enemies. 2020-09-29 19:48:11 -05:00
Sam
de45784596 Addressed round of testing feedback. 2020-09-29 19:48:09 -05:00
Monty Marz
13d9b814ab separate sceptres from staffs, show values below 1.0 as decimals in the SCT, add starting sceptre 
remove firebolt from starting sceptre
 2020-09-29 19:48:07 -05:00
Sam
6bb680f372 M1 now only regens stamina when healing allies if they are not at full health. 2020-09-29 19:48:02 -05:00
Monty Marz
2b8d1e6fb9 test values 2020-09-29 19:48:00 -05:00
Monty Marz
387f2cb60c color adjustments 2020-09-29 19:47:59 -05:00
Sam
6b23af6e0b Tweaked particles. Added skill icons. 2020-09-29 19:47:58 -05:00
Sam
8b9202710f New sceptre M2 is functional. 2020-09-29 19:47:57 -05:00
Sam
921d224ef6 Lifesteal now works. Added particles to healing beam. 2020-09-29 19:47:57 -05:00
Nícolas Wildner
5329b4c54b Update pt_BR.ron 2020-09-26 19:13:45 +00:00
Nícolas Wildner
55865dfb06 Update pt_BR.ron 2020-09-26 18:46:37 +00:00
Nícolas Wildner
855631feda Update pt_BR.ron 2020-09-26 18:20:59 +00:00
Nícolas Wildner
738688ea60 Update pt_BR.ron 2020-09-26 18:10:22 +00:00
jshipsey
4f0faf4c56 small corrections 2020-09-21 23:57:10 -04:00
Sam
8ab0d5e5e0 Added icon for skillbar ability of sword. 2020-09-21 17:40:20 -05:00
Sam
fe70b7fbce Addressed second round of feedback. 2020-09-21 17:38:53 -05:00
Sam
b06ab250cc Addressed first round of feedback on sword overhaul. 2020-09-21 17:38:52 -05:00
Sam
cf573a42bd Initial implementation of combo melee attack. 2020-09-21 17:38:41 -05:00
Joshua Barretto
1e900e8c6a Removed unused sprite manifests 2020-09-21 16:07:38 +01:00
Sam
99aba78422 Added healing healthsource logic to shockwave system. 2020-09-19 14:40:19 -05:00
Sam
6a1acd47a1 Added maximum vertical angle for shockwave. 2020-09-19 14:40:19 -05:00
Sam
819fb8ee77 Changed boss from cyclops to stone golem. Added ai specific for boss. 
Tweaked shockwave.

Fix rebasing errors.
 2020-09-19 14:40:16 -05:00
scott-c
1f2ed53c42 Tweak particle effects 2020-09-19 14:40:15 -05:00
Sam
0c48efd445 Added particles dedicated for shockwave. 2020-09-19 14:40:15 -05:00
Sam
66b0fee3c7 Separated knockback out from basicmelee. Added weapon for cyclops boss to use, and added 1 ability to it. 2020-09-19 14:29:04 -05:00
Joshua Yanovski
b2dc95239d Merge branch 'martin-t/dust' into 'master' 
Fix typo: velorite dusk->dust

See merge request veloren/veloren!1390
 2020-09-18 23:54:17 +00:00
Monty Marz
5fe79e1c6a new loading screen bgs (part 1) 
Add a basic random feature to char creation

loading screen bg (part 2)

loading screen changes, random button graphics
Random appearance also pick a random npc name
 2020-09-18 23:17:47 +00:00
Martin Taibr
a9756607a3 fix typo: velorite dusk->dust 2020-09-19 00:43:29 +02:00
jshipsey
90e5bbaac0 rebase 2020-09-17 22:41:40 -04:00
jshipsey
fff6a6fb0a finish odonto 2020-09-17 22:32:11 -04:00
jshipsey
5bb45a4861 spawn tweaks, improved odonto 2020-09-17 22:32:11 -04:00
Snowram
fecc40ad8e Better quadmed legs/feet ratio 2020-09-17 22:32:11 -04:00
jshipsey
8a43cba3b6 quadsmall manifest changes 2020-09-17 22:32:11 -04:00
Snowram
62f6a5799a Initial quadmed feed animation 2020-09-17 22:32:10 -04:00
jshipsey
03b7320b4b general housekeeping 2020-09-17 22:32:10 -04:00
jshipsey
06b39b9072 species specific improvement 2020-09-17 22:32:10 -04:00
Snowram
6a16268ff0 Quadmed run anim tweaks and deers offsets tweaks 2020-09-17 22:32:10 -04:00
jshipsey
2589c0cfc6 thropod manifest changes 2020-09-17 22:32:10 -04:00
Snowram
9308cabeb8 add deer, beaver and porcupine npcs 2020-09-17 22:32:10 -04:00
Snowram
ee95550355 Tweak offsets for theropods 2020-09-17 22:32:10 -04:00
jshipsey
cd6e1ad45f haul out the critter skele, add theropod 2020-09-17 22:32:10 -04:00
jshipsey
ecae71c016 gliders as items. anim improvements 2020-09-17 22:32:09 -04:00
jshipsey
412495e5fc assets/manifests 2020-09-17 22:18:49 -04:00
Ben Wallis
712f2e9c97 * Moved migrations to beginning of server initialisation 
* Added migrations for entity ID changes to existing tables
 2020-09-17 23:02:14 +00:00
tylerlowrey
30c3146682 Added main menu kick message with kick reason after player is kicked 2020-09-14 07:52:31 +02:00
tylerlowrey
fee79720ee Added ban message with reason when banned user attempts to login to server 2020-09-14 07:52:31 +02:00
TheThirdSpartan
7fd673ecb2 Added localization config options for new death messages 2020-09-09 20:26:20 +00:00
Raiyan Sayeed
906da2f0c7 added option for borderless fullscreen in setting -> graphics menu 2020-09-07 05:12:15 +00:00
TheThirdSpartan
6dbd1bc132 adding feature requested in issue #153 - displaying your alias in game as 'you' 2020-09-06 19:42:32 +00:00
Joshua Barretto
0adc57e487 Made particle code more rugged 2020-09-04 11:49:49 +01:00
Joshua Barretto
70f52d876a Improved lighting 2020-09-04 11:48:57 +01:00
Monty Marz
8a25ad91df reed models 2020-09-04 11:48:57 +01:00
Joshua Barretto
032ec9ef41 Added bee hives 2020-09-04 11:48:56 +01:00
Joshua Barretto
88add8456f Added fireflies, reeds near rivers 2020-09-04 11:48:56 +01:00
Joshua Barretto
4405227ffb Made light attenuation nicer, fixed campfire light offset 2020-09-04 11:48:54 +01:00
Marcel
e512578ef5 Merge branch 'intel-gpu-fix' into 'master' 
Fix a crash and model/shadow issues on Intel Gen7/7.5 GPUs.

See merge request veloren/veloren!1349
 2020-09-03 09:11:19 +00:00
Marcel
5d1f7d7a0a Merge branch 'update-zh' into 'master' 
update the Simplified Chinese translation

See merge request veloren/veloren!1350
 2020-09-02 08:07:28 +00:00
law4x
87c8351890 update the Simplified Chinese translation 2020-09-02 08:07:27 +00:00
scott-c
69e0bf2023 fix missing firework particle rng & adjust firework colors 2020-09-01 20:33:17 +08:00
Lippy13
7c33e7d714 Work around an issue with Intel Gen7/7.5 GPUs where matrices default to being row major if they are not directly assigned to a matrix that has a column major layout. 2020-08-31 19:50:45 +01:00
Lippy13
7efa3373f6 Fix crash on Intel Gen7 GPUs caused by having two return statements in the same branch of code. 2020-08-31 19:49:01 +01:00
Marcel
62427cb01f Merge branch 'vzikl/add-zh-translation' into 'master' 
Update to OpenSource Font - WQY-ZenHei & add zh_CN

See merge request veloren/veloren!1304
 2020-08-30 20:40:01 +00:00
VZIKL
cc55e71a5d Update to OpenSource Font - WQY-ZenHei & add zh_CN 2020-08-30 20:40:01 +00:00
black silence
2587a38f6f fix several DE translations 2020-08-28 20:37:28 +02:00
Joshua Yanovski
8be3648a4d Move sprite data to a config file. 2020-08-28 09:23:43 +02:00
Joshua Yanovski
3a96b73b2c Move figure meshing to a background thread. 2020-08-28 05:25:31 +02:00
scott-c
d316463eb3 Add combat sfx #647 2020-08-26 19:28:00 +08:00
Joshua Barretto
bf7afcf5c9 Merge branch 'zesterer/small-fixes' into 'master' 
Better world colours, better projectiles, better aiming, many other small improvements

See merge request veloren/veloren!1332
 2020-08-25 15:59:05 +00:00
notoria
2be4202d01 Corrected some spelling errors 2020-08-25 12:21:25 +00:00
Joshua Barretto
12ea028a3d Improved single-tick projectile wall/entity collision bug 2020-08-25 00:04:04 +01:00
Joshua Barretto
e4de32ac25 Fixed quadruped hitboxes 2020-08-24 21:46:08 +01:00
Joshua Barretto
2b9d5ee4a2 Fixed bad hitbox radii and adjusted field colour 2020-08-24 20:52:18 +01:00