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
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
omm
ef7b215f07
File structure for lang es_ES aligned with EN
2021-03-11 12:08:37 +00:00
Sam
16222948a3
Sceptre skill tree and migration.
2021-03-09 18:02:07 -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
Adam Blanchet
16b66f9cd6
Add reset button to graphics settings
2021-03-08 18:48:38 +01: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
Vincent Foulon
fb953cc7f4
implement the new skilltree icons
2021-03-04 18:37:32 +00: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
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
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
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
heydabop
d4e3a3f29f
#966 - Add setting to invert controller camera Y axis
2021-02-24 10:39:44 -06: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
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
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
TheThirdSpartan
f10f88081d
Small chat message formatting changes and fixed missing player alias during admin entity possession
2021-02-17 02:15:45 +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
James Melkonian
23b1df3cdd
Add basic NPC interaction and fix NPC chat spamming
2021-01-31 20:29:50 +00:00
DaforLynx
c6e262c4ce
Small audio fixes; addresses #939 and #940
2021-01-29 11:37:10 +00:00
Sam
6dd740feaa
Nerfed bow M1 and M2, slightly buffed bow skillbar ability.
2021-01-24 14:24:59 -05:00
Sam
5e4b6809ca
Sceptre nerfs.
2021-01-22 22:46:18 -05:00
Acrimon
21ecb15571
build tip
2021-01-19 19:02:41 +01: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
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
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
Jesus Bracho
ec79890335
Provide buff information on killed entities
2021-01-18 05:46:53 +00: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
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
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
