Sam
7eb1eefa13
Re-created item_price_calculation with new loot tables.
2021-04-02 23:04:34 -04:00
Sam
a2906168a6
Moved materials into their own loot tables.
2021-04-02 23:04:33 -04:00
Sam
cb638180f8
Moved food items into their own loot tables.
2021-04-02 23:04:32 -04:00
Sam
31e69021cb
Switched loot tables from declaring each weapon individually to just referencing a different loot table.
2021-04-02 23:04:31 -04:00
Sam
67916b44a7
Staff weapon tiering shuffle.
2021-04-02 23:04:30 -04:00
Sam
a2fc2abf83
Made staff and sceptre balancing sane. Created loot tables for staffs and sceptres.
2021-04-02 23:04:30 -04:00
Sam
2e37cefce5
Created weapon loot tables.
2021-04-02 23:04:29 -04:00
Sam
833f1f3309
Converted all armor in loot tables to reference armor set loot tables.
2021-04-02 23:04:28 -04:00
Sam
96b354c178
Consolidated loot tables by switching to CreatureMaterial where possible
2021-04-02 23:04:27 -04:00
Sam
247004d180
Loot tables can now recursively specify loot tables. Mercahnts broken.
2021-04-02 23:04:25 -04:00
Jun NOGATA
129a3de2eb
Add Japanese message translation
2021-04-03 01:50:10 +09:00
Vincent Foulon
62b2ad80fb
Refine Sewing Set
2021-04-02 18:19:39 +02:00
Vincent Foulon
49be1fd70c
Refine some item icons
2021-04-01 21:46:57 +02:00
Vincent Foulon
dcde8df365
address review comments
2021-04-01 19:13:08 +02:00
Vincent Foulon
c2a8feada5
Add dialogue when the Merchant is busy and randomize some trading dialogues
2021-03-31 19:06:41 +02:00
Snowram
4128f7fe45
Merge branch 'snowram/new-weapons-fix' into 'master'
...
Fix a staff icon, some offset fixes, lower wolf spawn rate
See merge request veloren/veloren!2025
2021-03-30 01:04:37 +00:00
Joshua Barretto
92afdaf423
Merge branch 'zesterer/small-fixes' into 'master'
...
Bow improvements
See merge request veloren/veloren!2032
2021-03-30 00:16:45 +00:00
Snowram
606dd64741
Fix a staff icon, some offset fixes, lower wolf spawn rate
2021-03-30 00:27:03 +02:00
Samuel Keiffer
12ec46c572
Merge branch 'sam/mindflayer-balancing' into 'master'
...
Mindflayer balance tweaks.
See merge request veloren/veloren!2031
2021-03-29 21:05:49 +00:00
Joshua Barretto
8f3233365d
Improved hit particles
2021-03-29 21:52:05 +01:00
Joshua Barretto
b0acbda236
Improved archery with feedback sfx and particles
2021-03-29 21:52:04 +01:00
Snowram
6adaac8106
Addresses comments
2021-03-29 18:35:12 +02:00
Snowram
b8ac90d049
Changelog, cleanup, clippy
2021-03-29 18:35:10 +02:00
Snowram
508e35ca17
Add several new i18n lines
2021-03-29 18:34:45 +02:00
Snowram
2c09180189
Set the item tooltip for every bag slots
2021-03-29 18:34:45 +02:00
Snowram
aa71dcb9c7
Make the new tooltip item specific
2021-03-29 18:34:45 +02:00
Sam
71ba9b6a54
Mindflayer balance tweaks.
2021-03-29 10:44:46 -04:00
Sam
f6e4626887
Fix emerald sceptre. Remove duplicate asset.
2021-03-28 21:19:01 -04:00
Snowram
c8e191e138
Merge branch 'snowram/new-scepters-starves' into 'master'
...
Add new batch of starves and scepter (by Gemu)
See merge request veloren/veloren!2022
2021-03-29 00:08:19 +00:00
Snowram
5295894105
Add new batch of starves and scepter (by Gemu)
2021-03-29 01:27:55 +02:00
Joshua Barretto
b660c53b4c
Revert to old sky colours for no clouds
2021-03-28 17:07:41 +01:00
Joshua Barretto
34a7667410
Toned down aurora
2021-03-28 17:07:41 +01:00
Treeco
ab596d2ae8
New default world map, default continent scale doubled
2021-03-28 17:07:38 +01:00
Joshua Barretto
f16c2b8b4c
Made clouds adjust to world dimensions correctly
2021-03-28 17:02:17 +01:00
Joshua Barretto
d8117b3b3d
Make caves and rtsim entities scale with map size, more cloud detail
2021-03-28 17:02:16 +01:00
Joshua Barretto
0bed52f63c
Properly simulate atmospheric scattering
2021-03-28 17:01:53 +01:00
Joshua Barretto
d53042c852
Client-side time of day interpolation
2021-03-28 17:01:53 +01:00
Joshua Barretto
19ef00085d
Softer and faster clouds with more verticality
2021-03-28 17:01:51 +01:00
Scott Williams
ef43d29627
Fix husk drops in miniboss rooms.
2021-03-28 10:39:20 +00:00
Sam
f117a57083
Switched to using ForceUpdate to forcefully update the client position after a blink
2021-03-27 21:33:45 -04:00
Monty
345ef1ca22
decay display for groups and overhead bars
2021-03-27 21:05:17 -04:00
jshipsey
558c82ee54
flayer anims
2021-03-27 21:05:16 -04:00
Sam
b0b114a7f8
Balance tweaks
2021-03-27 21:05:15 -04:00
Monty Marz
345b725478
decayed health texture
2021-03-27 21:05:14 -04:00
Monty Marz
cc70560027
WIP animation
2021-03-27 21:05:13 -04:00
Sam
1edf79d109
Moved all legendaries to mindflayer loot table.
2021-03-27 21:05:12 -04:00
Sam
6c611d632a
Mindflayer now only summons minions at set thresholds of health.
2021-03-27 21:05:11 -04:00
Sam
5966b1541d
Mindflayer can now lifesteal off of its own minions
2021-03-27 21:05:11 -04:00
Sam
50e832b6d0
Mindflayer summons husks instead of dogs now
2021-03-27 21:05:10 -04:00
Snowram
39c8efe11f
Adds husk npc
2021-03-27 21:05:09 -04:00
Sam
f9835e78da
Pets no longer drop loot on death. Code to determine targeting of pets is less hacky and now takes into account alignment of their owner.
2021-03-27 21:05:07 -04:00
Sam
8e4aeff705
Improved mindflayer AI. Tweake some abilities.
2021-03-27 21:05:07 -04:00
Sam
720482d994
Gave mindflayer AI.
...
Fixed particles and made them sync across network.
2021-03-27 21:05:06 -04:00
Sam
a5b7477e96
Added summon minions ability to mindflayer
2021-03-27 21:05:05 -04:00
Sam
30da614e89
Added dimensional door ability for mindflayer
2021-03-27 21:05:05 -04:00
Sam
f1156c9ce5
Added necrotic vortex attack to mindflayer
2021-03-27 21:05:03 -04:00
Sam
0d3795112c
Added cursed flame attack to mindflayer
2021-03-27 21:05:03 -04:00
Marcel
79cc3af058
Merge branch 'swilliams/character-randomization-fix' into 'master'
...
Character Creation Randomization Fix
See merge request veloren/veloren!2004
2021-03-27 15:58:34 +00:00
Scott Williams
9ca0388561
Character Creation Randomization Fix
2021-03-27 15:58:34 +00:00
Avi Weinstock
4b62a99ed9
Improve econsim's handling of diamond prices by lowering the implied homicide rate.
2021-03-27 10:50:16 -04:00
Marcel
da5c73c84b
Merge branch 'refactor-login' into 'master'
...
refactor handling of duplicate login #1015
Closes #1015
See merge request veloren/veloren!1992
2021-03-27 13:49:09 +00:00
Sam
6c2de7d70e
Fixed boost having ridiculous velocity.
2021-03-26 16:11:25 -04:00
Scott Williams
aa9180b20f
Moved rugged armour to cloth_item
2021-03-26 16:51:43 +00:00
Scott Williams
d35475eaef
Added leather scraps recipe
2021-03-26 16:44:38 +00:00
aljazerzen
0ea102dc9c
refactor handling of duplicate login
2021-03-25 12:33:56 +01:00
Lippy13
ff2583b3b9
Add missing seashells to the sprite manifest
2021-03-25 04:37:27 +00:00
Avi Weinstock
4ec6b43693
Add a vertical camera clamp option and toggle to voxygen.
2021-03-23 18:22:32 -04:00
Samuel Keiffer
8ed7da7c49
Merge branch 'master' into 'master'
...
Update short_1.ron to make eligible for cloth scrap recipe
See merge request veloren/veloren!1981
2021-03-23 19:29:56 +00:00
steanne
818aaed32a
Update short_1.ron to make eligible for cloth scrap recipe
2021-03-23 18:16:30 +00:00
Sam
31f4ef684d
Tweaked numbers
2021-03-22 17:26:55 -04:00
Justin Shipsey
f57af6f776
Merge branch 'slipped/animtweaks' into 'master'
...
airship movement bits
See merge request veloren/veloren!1967
2021-03-22 08:49:04 +00:00
Joshua Barretto
6690854687
Merge branch 'zesterer/better-particle-emission' into 'master'
...
Smoother particle emission for moving objects
See merge request veloren/veloren!1965
2021-03-22 06:15:20 +00:00
Samuel Keiffer
1374900928
Merge branch 'sam/combat-fixes' into 'master'
...
Fixes gaining combo by shooting loot bag
See merge request veloren/veloren!1953
2021-03-22 02:01:22 +00:00
jshipsey
31747d8ff1
airship movement bits
2021-03-21 21:43:49 -04:00
Joshua Barretto
f9612c1c26
Made pickaxe obtainable
2021-03-22 00:24:07 +00:00
Joshua Barretto
7ae4230dc8
Merge branch 'zesterer/pick' into 'master'
...
Pickaxe
See merge request veloren/veloren!1959
2021-03-22 00:19:42 +00:00
Joshua Barretto
6ea5aa796b
Faster pick, less vibrant block selection
2021-03-21 20:38:08 +00:00
Joshua Barretto
fb3980e273
Outcome for block destruction, take select_pos from ControllerInputs
2021-03-21 20:10:05 +00:00
Marcel
983523c463
Merge branch 'vfoulon80/climbing-skill' into 'master'
...
Add climbing speed and cost
See merge request veloren/veloren!1950
2021-03-21 18:35:44 +00:00
Joshua Barretto
b45df7fe10
Switched to BasicMelee
2021-03-21 17:45:01 +00:00
Joshua Barretto
347e1022a0
Initial implementation of pickaxe
2021-03-21 16:09:16 +00:00
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