6547 Commits

Author SHA1 Message Date
Sam
e511a31780 Levling health gives you health. Added combat scaling to UI. 2021-01-19 08:07:54 -05:00
Sam
d904e20ffa Added function to automatically generate a combat rating. Currently, it is used to calculate exp. 2021-01-19 08:07:54 -05:00
Sam
933a413879 Added skill point costs to tooltips. 2021-01-19 08:07:53 -05:00
Sam
2774b0c5b2 Added tooltips with numbers. Balancing on some skills.
Added experience scaling for tougher enemies.
2021-01-19 08:07:51 -05:00
Sam
39ed979510 Added command to give yourself skill points.
adjusted social window

Changelog
2021-01-19 08:07:49 -05:00
Sam
ec3e2abc65 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
bb42c95944 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
Sam
2896e593a7 Health can now be scaled for npcs again. 2021-01-19 08:07:40 -05:00
Sam
060e78f9e0 Added function to get the max amount of skill points that can be spent in a tree. 2021-01-19 08:07:39 -05:00
Sam
5e308f1695 Exp floaters.
You load in with correct energy and health values now.
2021-01-19 08:07:36 -05:00
Monty Marz
0101006609 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
b5b132fc1a 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
1243a09d82 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
c100657219 Purged stats, including level and experience 2021-01-19 08:07:23 -05:00
Sam
7d35d69579 UI now shows how many levels you've invested into a skill. 2021-01-19 08:07:22 -05:00
Sam
ddbdea96c1 General combat skill tree.
UI for general skill tree
2021-01-19 08:07:20 -05:00
Monty Marz
664abc69d7 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
b2d52b8001 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
1a57ec4afc 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
5903578e1a Sceptre skill tree. 2021-01-19 08:07:03 -05:00
Sam
ed107dbe61 Staff skill tree. 2021-01-19 08:07:03 -05:00
Sam
97f89383b8 Implemented bow skill tree. 2021-01-19 08:07:02 -05:00
Sam
8d9d4fc62f Hammer skill tree complete. 2021-01-19 08:07:02 -05:00
Sam
4c61b59856 Axe skill tree functional. 2021-01-19 08:07:01 -05:00
Sam
b7c64463f7 Added migrations for skill trees. 2021-01-19 08:07:00 -05:00
Sam
3dd530d49a Added persistence for skill trees. 2021-01-19 08:07:00 -05:00
Sam
ba263cf444 Added sword skill tree 2021-01-19 08:06:59 -05:00
Sam
d691cc9260 Moved skill max level and skill prerequisites into ron files. 2021-01-19 08:06:59 -05:00
Sam
aceaba847d Ron file now used for skills belonging to each skill group. 2021-01-19 08:06:58 -05:00
Sam
266bea8298 Skills can now optionally have levels. Max level prevents adding skill of higher level. Support for skills having a prerequisite of a particular level. 2021-01-19 08:06:57 -05:00
Sam
80f2a20c35 Skills can now have prerequisite skills. Skills can now cost different amounts of skill points. 2021-01-19 08:06:57 -05:00
Sam
1a15625f12 You now gain skill points after a threshold of xp within a particular skill group.
Skills can now unlock skill groups. Temp method of using chat to unlock skills.
2021-01-19 08:06:52 -05:00
Samuel Keiffer
6593828913 Merge branch 'friendly-auras' into 'master'
Set up aura filtering

Closes #890

See merge request veloren/veloren!1698
2021-01-18 22:58:56 +00:00
Jesus Bracho
84218fe090 Set up aura filtering 2021-01-18 22:58:56 +00:00
Sam
7dca559885 Exp is now awarded to specific skill groups. It's automatically split between a general pool and weapon pools based on if you have the weapon in your loadout and if you've unlocked the weapon pools. 2021-01-18 17:54:03 -05:00
Samuel Keiffer
d215930f35 Merge branch 'provide-buff-information-on-killed-entities' into 'master'
Provide buff information on killed entities

Closes #927

See merge request veloren/veloren!1696
2021-01-18 05:46:53 +00:00
Jesus Bracho
40a7d0a948 Provide buff information on killed entities 2021-01-18 05:46:53 +00:00
Joshua Barretto
2df45330f7 Merge branch 'ubruntu/bird-pathing' into 'master'
Slightly better bird pathing

See merge request veloren/veloren!1692
2021-01-15 00:42:57 +00:00
ubruntu
1f223c8310 Slightly better bird pathing 2021-01-15 00:42:57 +00:00
Mckol
8e45346c14 Merge branch 'mailmap' into 'master'
Added a `.mailmap` file to unify my name in commits made with my email address

See merge request veloren/veloren!1693
2021-01-14 23:29:12 +00:00
Mckol
1287eb469b Added a .mailmap file to unify my name in commits made with my email address 2021-01-15 00:19:47 +01:00
Acrimon
ce5e1b89b2 Merge branch 'acrimon/925-campfire-fix' into 'master'
Don't apply campfire healing buff if the player is at maximum health.

Closes #925

See merge request veloren/veloren!1690
2021-01-14 15:19:49 +00:00
Marcel
bad82faa51 Merge branch 'xMAC94x/remove_cargo_check' into 'master'
remove `cargo check` as its already included in `cargo clippy`

See merge request veloren/veloren!1689
2021-01-14 14:29:04 +00:00
Acrimon
9c16bae0b2 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
Acrimon
b7f308913d
fix #925 2021-01-14 13:21:55 +01:00
Marcel
37d4f7b62d use --all-targets which is the same as before AND --lib.
Just to be future proof, lib should not matter ATM, but might in the future when we produce libs that are not used in any binary target
2021-01-14 08:16:25 +00:00
Marcel Märtens
bda6390f1a fix clippy in all examples.
added a ignore for plugins, as we cannot remove the `Result<>` type, it is necessary
2021-01-13 15:06:04 +01:00
Marcel Märtens
a7957db824 After some discussion with XVar, Song and Yakei we found out that cargo clippy is a superset of cargo check.
There are multiple hints:
 - one guy in discord  https://discord.gg/nWGhnbRb  https://discord.com/channels/273534239310479360/335502067432947748/798886188923617290
 - a old stackoverflow https://stackoverflow.com/questions/57449356/is-cargo-clippy-a-superset-of-cargo-check which lead us to the source code:
   7fa1d78c89/src/main.rs (L73)
   which either uses `check` or `fix`.
   cargo fix is documented in the docs with (https://doc.rust-lang.org/cargo/commands/cargo-fix.html)
   "executing cargo fix will under the hood execute cargo-check(1)."
 - `cargo clippy` fails after running `cargo check` prob as there is nothing to do.
 - `cargo clippy --help` points us to `cargo check --help`
Thus we are removing `cargo check` from the CI as a seperate check.

However `cargo check --examples` did check the examples.
In order to have them covered we are also running clippy now for examples, benches and all bins.
Also we moved `--locked` from cargo check to clippy.
2021-01-13 14:22:54 +01:00
Marcel
a6b8b05a54 Merge branch 'xMAC94x/fix-cache-check' into 'master'
fix CI cache for cargo check

See merge request veloren/veloren!1688
2021-01-12 02:04:12 +00:00
Marcel Märtens
f9233c1fba running cargo check with -D warnings seems to trigger a complete cache invalidation.
AND cargo check was implicitly run in clippy. In order to be future save we now ALWAYS run all CI with -D warnings.
(i verified that this works in a test pipeline)
2021-01-12 01:15:13 +01:00