Snowram
a4f4fa38e2
Improve bipedlarge beast walk animation
2020-10-19 16:20:57 +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
Marcel
f6692aee74
Merge branch 'UMR1352/fix#788' into 'master'
...
Fix issue #788
Closes #788
See merge request veloren/veloren!1432
2020-10-16 12:17:49 +00:00
Samuel Keiffer
b5a969862a
Merge branch 'sam/staff-overhaul' into 'master'
...
Staff Rework
Closes #767 and #762
See merge request veloren/veloren!1429
2020-10-16 02:22:00 +00:00
Joshua Barretto
8617b17569
Merge branch 'UMR1352/fix#790' into 'master'
...
Fix issue #790
Closes #790
See merge request veloren/veloren!1439
2020-10-15 14:14:52 +00:00
Enrico Marconi
af0542db90
Suggested edit
2020-10-15 14:47:29 +02:00
Enrico Marconi
d85473bccf
Reviewer's suggested edit
2020-10-15 14:36:59 +02:00
Enrico Marconi
9c184b60e4
Fix issue #790 : hotbar working while ui is toggled off
2020-10-15 13:28:29 +02:00
Sam
14e4af7ab6
Addressed playtesting feedback.
2020-10-14 21:06:52 -05:00
jshipsey
6f3f6996a6
clippy
2020-10-14 21:06:35 -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
1c21362bc3
Fixed shockwaves hitting entities multiple times. Explosions can now regen energy. Staff M1 now has particles instead of using bomb particles.
2020-10-14 20:56:23 -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
Sam
256846a669
Initial implementation of new staff abilities.
2020-10-14 20:56:16 -05:00
jshipsey
3bb59b36cd
energy values, remove hotload
2020-10-14 12:50:33 -07:00
jshipsey
64f72a73f9
axeleap tweaks
2020-10-14 12:50:33 -07:00
jshipsey
22d8792c4b
adjustments to chargedmelee, repeater
2020-10-14 12:50:33 -07:00
Snowram
697ea80665
Axe MeleeLeap character animation
2020-10-14 12:50:33 -07:00
jshipsey
521ffd64ba
cleanup
2020-10-14 12:50:33 -07:00
jshipsey
28eb58ddfa
anims
2020-10-14 12:50:33 -07:00
jshipsey
281155186f
hammer leap melee anim
2020-10-14 12:50:33 -07:00
jiminycrick
9ebda3c353
Made bow leap more graceful and set energy costs and removed jitter for no leap
2020-10-14 12:50:32 -07:00
jiminycrick
ae4b259250
Fix what broke during rebase
2020-10-14 12:50:32 -07:00
jiminycrick
431f99a791
Reducing the amount of data in character state
2020-10-14 12:50:32 -07:00
jiminycrick
05623eb8bd
Addressed comments
2020-10-14 12:50:32 -07:00
jiminycrick
04175bab09
Add skillbar stuff for 3rd skills
2020-10-14 12:50:32 -07:00
jiminycrick
951acfca21
Add 3rd skill for hammer, bow, and axe minus skillbar UI stuff
2020-10-14 12:50:32 -07:00
Marcel Märtens
f1c9b959f4
rename a file, fix error msg, dont spam persistence by default
2020-10-13 00:06:24 +02:00
Enrico Marconi
7a5b7cb478
Fix issue #788
...
Missing items in the 'require' section are now shown in red.
2020-10-12 17:41:17 +02:00
Marcel Märtens
55b59fbe07
various small fixes according to the MR
2020-10-12 11:25:20 +02:00
Marcel Märtens
d7a74c0cf1
fix voxygen state system. before we had a timing error that we did the next voxygen step before client set in_game which lead us to a disconnect.
...
now assume in_game is correct in client unless told by server in its answer
2020-10-11 22:49:19 +02:00
Marcel Märtens
b1db5ef488
Redo Network Frontend.
...
Rather than having a single Stream to handle ALL data, seperate into multiple streams:
- Ping Stream, for seperate PINGS
- Register Stream, only used till the client is registered, then no longer used!
- General Stream, used for msg that can occur always
- NotInGame Stream, used for everything NOT ingame, e.g. Character Screen
- InGame Stream, used for all GAME data, players, terrain, entities, etc...
This version does compile, and gets the client registered (with auth too) but doesnt get to the char screen yet.
This fixes also the ignoring messages problem we had, as we are not sending data to the register stream!
This fixes also the problem that the server had to sleep for the Stream Creation, as the Server is now creating the streams and client has to sleep.
2020-10-11 22:49:14 +02:00
Imbris
b9b84d2890
Migrate singleplayer save folders to the new location if they have not already been generated
2020-10-10 20:25:32 -04:00
Imbris
83fb26c4f9
Group editable server settings into one struct that is stored in the ecs, don't expose DataDir, use Uuid in the whitelist instead of usernames, replace Banlist record tuple with new type with named fields, remove commented code
2020-10-10 02:10:32 -04:00
Imbris
a3ee5a4006
Rename model_col -> highligh_col to better reflect its usage
2020-10-10 02:10:32 -04:00
Imbris
308cca0dc9
Put server-cli specific settings in their own structure, serde_derive -> serde
2020-10-10 02:10:32 -04:00
Imbris
7c14a3f4a4
New userdata folder that holds voxygen settings and logs and server saves and settings, split up server settings file into parts that are persisted back to their files and parts that are read-only, misc fixes
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
33be0a0e9f
Merge branch 'mdroogle/interaction_hint' into 'master'
...
Add interaction hint #615
See merge request veloren/veloren!1394
2020-10-01 09:31:54 +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
51141b2c1a
Changelog line, final balance tweaks.
2020-09-29 19:48:16 -05:00
Sam
56d2afc0dc
Added keyframe support to basic beam state. Addressed some comments.
2020-09-29 19:48:15 -05:00
Sam
ffe456c703
Fixed what broke after rebasing.
2020-09-29 19:48:13 -05:00
