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
6,173 Commits 151 Branches 18 Tags 2.1 GiB
53d5a9373e
Commit Graph

2622 Commits

Author SHA1 Message Date
Imbris
fffd5d0ef0 Fix offset issue in ui on startup 2020-11-11 23:47:07 -05:00
Imbris
c0e8298ac3 Display averaged busy dt 2020-11-11 23:26:13 -05:00
Imbris
d5dd126724 Add tracy feature that randomly disappeared back into voxygen 2020-11-11 22:33:02 -05:00
Imbris
a97b188bea Make fps display and specification more precise 2020-11-11 21:47:22 -05:00
Snowram
af346806de Addressed comments 2020-11-11 22:03:54 +01:00
Snowram
fe977f0a6c Adds a speed stat to weapons 2020-11-11 22:03:53 +01:00
Joshua Barretto
7bce8b9615 More resiliant settings, better key defaults 2020-11-11 17:37:26 +00: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
61c0780872 Remove uneeded commented code, add notes to remaining commented code, use source rect calculations from conrod backend code 2020-11-11 03:02:51 -05:00
Imbris
64d885a192 Clippy fixes 2020-11-11 03:02:51 -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
9df8368c88 Add some tracing spans 2020-11-11 03:02:23 -05:00
Imbris
d2166fed3d Make iced ui use scale from the settings 2020-11-11 03:02:22 -05:00
Imbris
eda7b380dd Change glyph cache position tolerance to match changes in master 2020-11-11 03:02:22 -05:00
Imbris
469b048de9 Update iced 2020-11-11 03:02:22 -05:00
Imbris
90bfafc469 Fix tooltip positioning for tooltipped elements inside Scrollable widgets 2020-11-11 03:02:22 -05:00
Imbris
cd1a134c26 Fix bug in body.validate(), add sliders to iced char creation screen, make char selection screen more closely resemble the master version in style 2020-11-11 03:02:22 -05:00
Imbris
7aa8412556 Add tooltips in iced char creation to species, tools, randomize button, and create button 2020-11-11 03:02:22 -05:00
Imbris
fe7d65843b Highlight button of selected character, enter the world if character is selected when enter key is pressed 2020-11-11 03:02:22 -05:00
Imbris
3b664d2efb Fix tooltip border images, fade tooltips properly, improve tooltip positioning 2020-11-11 03:02:22 -05:00
Imbris
d8854e9300 Add a tooltip to the char select screen to test 2020-11-11 03:02:22 -05:00
Imbris
5c85a29111 Create Tooltip widget in iced 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
Imbris
0ab1a1ebb0 Loading screen: show animated gears instead of status message, show tips 2020-11-11 03:02:22 -05:00
Imbris
489a8a8f9e Remove background banner from login screen input boxes and move logo to right corner 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
12abd64a01 change the text arrows in language select and server select with proper ui elements 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
c247263258 Update to the latest git iced 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
bc42f3f229 Add tabbing between fields in login screen 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
3baac6aeba Update to latest iced git, rebase fixes 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
CapsizeGlimmer
34f92c7076 Implement renderer for slider 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
ba573d2065 Add error message box (is the main menu finished?) 2020-11-11 03:02:21 -05:00
Imbris
e29364eedf Add border styling to container 2020-11-11 03:02:21 -05:00
Imbris
a94bc4b725 Make cancel button in connecting screen visble again, don't save username & server for singleplayer login, make iced version go back to login screen properly. 2020-11-11 03:02:21 -05:00
Yusuf Bera Ertan
a9541f1506 Implemented server selection screen 2020-11-11 03:02:21 -05:00
Imbris
e2bf974ecb Add Scrollable widget support, implement disclaimer screen, rearrangements of main menu ui code 2020-11-11 03:02:21 -05:00
Imbris
01eb061a83 Fill in username & server fields in ui reimplementation, stop saving password in the settings file 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
20a46eb526 Make all the fonts available in iced ui rework 2020-11-11 03:02:21 -05:00
Imbris
5c13983631 Add parts of main menu such as version text and info text banner, make connection screen 2020-11-11 03:02:21 -05:00
Imbris
d6b38c8cd2 More main menu work, split main menu ui into multiple modules, misc fixes in the renderer 2020-11-11 03:02:21 -05:00
Imbris
d2f5a44d02 Input fields layout tweaks 2020-11-11 03:02:21 -05:00
Imbris
80426f352b Fix whitespace glitches, center text cursor 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
e4bc035a62 Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0 2020-11-11 03:02:21 -05:00
Imbris
75adcb20e8 More buttons, FillText custom widget that adjusts text size based on available space, created button component thing (a reusable composition of widgets), fixed log to tracing rebase error 2020-11-11 03:02:21 -05:00
Imbris
04fe308b9c Rearrange iced renderer modules, wire up events for the main menu iced ui 2020-11-11 03:02:21 -05:00
Imbris
095345d8c6 Add support for Button widget, new custom widget AspectRatioContainer 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
0053299b14 Text rendering for iced with glyph_brush works now 2020-11-11 03:02:20 -05:00
Imbris
fa1cd17a71 Add for<'b> lifetime annotation (almost worked) 2020-11-11 03:02:20 -05:00
Imbris
a7458c099c Implement text renderering with glyph_brush (lifetime error) 2020-11-11 03:02:20 -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
Imbris
b5d31f6cba Begin implementing container widget with an image background 2020-11-11 03:02:20 -05:00
Imbris
6a4b7b70c2 Start experimenting with replicating main menu 2020-11-11 03:02:20 -05:00
Imbris
0305c1979a Get resizing working 2020-11-11 03:02:20 -05:00
Imbris
bbbede68fc Initial setup to use iced 2020-11-11 03:02:20 -05:00
Marcel
696f607a70 Merge branch 'xMAC94x/clock' into 'master' 
massivly switch clock algorithm.

See merge request veloren/veloren!1499
 2020-11-10 22:12:12 +00:00
Monty Marz
0e072f72cc frost cleaver 
velorite mage set

offsets
armor stats
 2020-11-10 21:43:45 +00:00
Marcel Märtens
e4e5c6e55b massivly switch clock algorithm. 
- before we had a Clock that tried to average multiple ticks and predict the next sleep.
   This system is massivly bugged.
   a) We know exactly how long the busy time took, so we dont need to predict anything in the first place
   b) Preduction was totally unrealistic after a single lag spike
   c) When a very slow tick happens, we dont benefit from 10 fast ticks.
 - Instead we just try to keep the tick time exact what we expect.
   If we can't manage a constant tick time because we are to slow, the systems have to "catch" this via the `dt` anyway.
 2020-11-10 18:31:42 +01:00
jshipsey
db753c4f3b adjust to comments 2020-11-09 18:47:52 -05:00
Sam
9b0e1c8dfc Slight balance tweaks. 2020-11-08 19:33:24 -06:00
jshipsey
7aa3de35c9 hammer keyframes 2020-11-08 19:54:46 -05:00
Sam
8fa7e246e9 Minor tweaks. 2020-11-08 18:11:53 -06:00
jshipsey
0618de138e rebase 2020-11-08 19:02:48 -05:00
jshipsey
20efc692fd ranged 2020-11-08 18:52:22 -05:00
jshipsey
92aa6a1b12 axe basic 2020-11-08 18:51:35 -05:00
jiminycrick
33e87de17e Initial combo melee for axe M1 2020-11-08 18:48:48 -05:00
AlKabir
9424ecfb4d centering assets 2020-11-08 00:35:11 -06:00
AlKabir
6535deae9c added two meat assets for mobs to drop 2020-11-07 23:34:20 -06:00
Imbris
133ba82a9b Use item_definition_id for weapon asset mapping 2020-11-07 16:44:11 -06:00
Sam
4ae946d699 Fix audio tests. 2020-11-07 15:53:19 -06:00
Sam
a4046872b2 Yeeted from code files. 2020-11-07 15:53:10 -06:00
AlKabir
77f3c7e3c5 Minor combat fixes (see issue 785) 2020-11-07 18:00:07 +00:00
TheBoredProgrammer64
b2ec207979 Revert "Removed toolCategory" 
This reverts commit 5b0ff408176ff00408cc90f2516a90d5cd303e56.
 2020-11-06 15:33:20 +00:00
Marcel Märtens
40f5afc2b0 ci cleanup, dependency update 2020-11-06 14:34:42 +01:00
Samuel Keiffer
44f676d90c Merge branch 'sam/make-roll-great-again' into 'master' 
Roll overhaul

See merge request veloren/veloren!1484
 2020-11-06 03:25:18 +00:00
Sam
37ecb165ef Addressed comments. Roll now only provides i-frames to melee attacks. It also reduces height of hitbox. 2020-11-05 20:40:20 -06:00
Snowram
262ceac060 fmt 2020-11-06 01:08:35 +01:00
Monty Marz
642ad805a1 potion buff 2020-11-06 01:08:34 +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
66850a5878 Fixed audio tests. Added changelog line. 2020-11-05 18:01:46 -06:00
jshipsey
fae3ef6e59 roll anim speedup 2020-11-05 16:40:30 -05:00
Sam
a0af315930 Addressed comments. 2020-11-04 19:22:08 -06:00
Sam
87bff41a66 Addressed comments. 2020-11-04 19:22:05 -06:00
Sam
c48c022f7e Separated out health from stats component. 2020-11-04 19:22:04 -06:00
Snowram
a6d5d87bbc Fix animations regressions for biped_large 2020-11-04 02:12:43 +01:00
jshipsey
3bb839da85 convert humanoid anims, warnings 2020-11-04 01:48:06 +01:00
Snowram
b47f42bad5 More biped_large work 2020-11-04 01:48:05 +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
e6eeef4524 setup for axe/bow wield 2020-11-04 01:48:05 +01:00
jshipsey
28cde31bbb setup for staff, more anim conversions 2020-11-04 01:48:05 +01:00
Snowram
ef1428f9fe Bones scaling cleanup 2020-11-04 01:48:05 +01:00
jshipsey
3d23475abd starting to wire in new wield setup 2020-11-04 01:48:05 +01:00
Snowram
72b15a1e24 More new style keyframe translation 2020-11-04 01:48:05 +01:00
jshipsey
c878673a84 cleanup 3 2020-11-04 01:48:05 +01:00
jshipsey
f79181c01f cleanup 2 2020-11-04 01:48:05 +01:00
jshipsey
e5734c1829 adjust skeleton_attr to s_a 2020-11-04 01:48:05 +01:00
Snowram
f9f3d33189 More new style keyframe translation 2020-11-04 01:48:04 +01:00
jshipsey
e928dbe4db start cleanup 2020-11-04 01:48:04 +01:00
Snowram
a8dd44325f Convert some animations to new style keyframes 2020-11-04 01:48:04 +01:00
Joshua Barretto
6331ad9455 Implemented Flight 2020-11-03 22:46:07 +00:00
Marcel Märtens
00456c8373 extract a Presence Component, which is server only and has state of Player and Client. Presence is only valid for Clients that are in game 2020-11-03 08:56:02 +01:00
Marcel Märtens
6bb74c9c6f Fix clients are disconnecting GRACEFULLY by removing the Disconnect Request from a client, a client now sends a TERMINATE message directly 2020-11-03 08:55:54 +01:00
ubruntu
8c1e1fdc5c Fixed sneak toggle, sneaking no longer has sound, rolling can return to sneaking state, sneaking reduces aggro distance 2020-11-03 04:09:38 +00:00
Imbris
a556d2b5e7 Merge branch 'bbenton91/fix-password-length' into 'master' 
Changed password scale to allow 34 characters. Fixes issue #743

Closes #743

See merge request veloren/veloren!1464
 2020-10-30 02:37:54 +00:00
Brad
8b39dafe2e Changed password scale to allow 34 characters 2020-10-29 21:17:31 -04:00
Imbris
cb68aec291 Update changelog, address comments, fmt 2020-10-29 19:12:54 -04:00
Imbris
64def3cde4 Allow interacting with nearby blocks without pointing at them, unify selection of block/entity interactors so that only one is select at once, rearrange pickup and mount range consts 2020-10-29 18:40:11 -04:00
Imbris
325695e937 Only try to connect to the singleplayer server after it has been initialized 2020-10-29 18:30:49 -04:00
Imbris
47b06658b0 Log where the userdata folder is in binary crates, fix bug where the old 
path was logged instead of the new path when renaming invalid settings
 2020-10-29 18:30:49 -04:00
Imbris
0ca3d51f29 Only allow hotbar keys instead of all UI related keys when the UI is hidden 2020-10-29 18:30:48 -04:00
Sam
7971034fde Fixed audio tests. 2020-10-28 18:15:28 -05:00
Sam
844e6f2b60 Slightly nerfed sword dash. Reduced particle count on fire aoe by factor of 3. 2020-10-28 18:15:25 -05:00
Sam
63011241ea Added keyframes to all states that were lacking them. 2020-10-28 18:15:23 -05:00
Sam
f60985d733 Transitioned buff storage from a vec to a hashmap. Addressed other comments. Only continuous buff effects are handled right now. 2020-10-26 19:30:17 -05:00
Sam
337cf6e137 Cleaned up UI code. Removed stuff added for testing. Added 10% for melee attacks to inflict a bleeding debuff. Renamed BuffId to BuffKind. Fixed memory leak. Set event emission to false when timer is decremented. 2020-10-26 19:30:10 -05:00
Sam
fdf8decb18 Handled health change over time buff effect better. 2020-10-26 19:28:27 -05:00
Sam
5a5d35fade Cleaned up logic used to handle buff addition. Old active buffs now get deleted if they had a smaller duration and weaker strength. 2020-10-26 19:28:26 -05:00
Monty Marz
3f7b5a095b player buffs at minimap visuals 
Update settings.rs
buff timers
 2020-10-26 19:28:25 -05:00
Imbris
be1767a5af Fix group tooltips, make ui buff code more efficient, avoid crashing on characters button press 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
Sam
007d3c09ac Buffs now get removed on death by default. Buffs are now required to have either the 'Buff' or 'Debuff' tag. RemoveByCategory function now has support for blacklisting certain categories. Support for UI stuffs. 2020-10-26 19:28:23 -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
Marcel Märtens
1b47913835 fix clippy after toolchain update 2020-10-26 22:30:51 +01:00
Marcel Märtens
153c6c3b13 Fixing Tarpaulin isn't easy. 
So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version.
Then we had to update several dependencies, which broke:
 - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27
 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23
 - update conrod to use modern copypasta 0.7
 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project.
 - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type.
   It was called `convert_event`
 - make a `simd` feature which is default and introduce conditional compiling.
   AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS.
 - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
 2020-10-26 17:04:20 +01:00
NathanW
7e92e21f8b Address issue #808: Add Frame Time in DebugInfo 2020-10-22 16:42:10 -06:00
Joshua Barretto
2237500743 Clouds 2020-10-21 21:05:25 +00:00
jshipsey
c74133740e remove commented code 2020-10-19 16:20:59 +02:00
Snowram
d5e60d93b4 Add missing biped_large anims 2020-10-19 16:20:59 +02:00
jshipsey
9c003cf572 bipedlarge hammer fixes 2020-10-19 16:20:59 +02: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
jshipsey
66b1fe67dc rebase 2020-10-19 16:20:58 +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
290adcfad8 Standardizes character bone names 2020-10-19 16:20:58 +02:00
Snowram
58e2d3a4ad More bipedlarge anim work 2020-10-19 16:20:58 +02:00
Snowram
c1c2c9dc07 Add bipedlarge spin and beta anims 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
Snowram
0a9ec848a7 add lizardman npcs 2020-10-19 16:20:58 +02:00
Snowram
4dcd450382 Add beast attributes 2020-10-19 16:20:57 +02:00
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
Sam
3d6c26a3c7 Fully separated sceptres from staves. 2020-09-29 19:48:12 -05:00
Monty Marz
2a884df8de fix SCT decimals not being absolutes 2020-09-29 19:48:10 -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
095433abcc Addressed comments. 2020-09-29 19:48:06 -05:00
Sam
46563e7008 Added beam system. Added collision code for spherical wedge/cylinder detection. 2020-09-29 19:48:04 -05:00
Sam
ddbe871b50 Placeholder animation for beam attack. 2020-09-29 19:48:03 -05:00
Sam
36762be2a7 Fixed explosion color of sceptre M2. 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
Forest Anderson
25ab132d73 Merge branch 'xvar/add-clone-on-ref-ptr-clippy-lint' into 'master' 
Added #![deny(clippy::clone_on_ref_ptr)] to all crates and fixed resulting lint errors

See merge request veloren/veloren!1411
 2020-09-28 19:32:03 +00:00
Joshua Yanovski
443f3287e4 Merge branch 'sharp/remove-spurious-vox' into 'master' 
Remove spurious uses of Vox.

See merge request veloren/veloren!1406
 2020-09-27 16:41:29 +00:00
Ben Wallis
b3dd8e8a02 Added #![deny(clippy::clone_on_ref_ptr)] to all crates and fixed resulting lint errors 2020-09-27 17:25:33 +01:00
Ben Wallis
11fc74642e Refactored crafting to use ItemDef instead of Item 2020-09-27 14:55:31 +01:00
Joshua Yanovski
938039a56e Remove spurious uses of Vox. 
In the process, also try to address a few edge cases related to block
detection, such as adding back previously solid sprites and removing
filters that may be vestiges of earlier logic.
 2020-09-26 16:30:40 +02:00
Marcel Märtens
b7dc17c11f switch version to pre-alpha-2020-09-22 vs pre-alpha-v0.7.0 2020-09-22 12:04:07 +02:00
Marcel Märtens
8eec46424f switching veloren naming scheme, to either one of the following: 
`stable-0.7.0 (<hash>-<datetime>)` for release versions.
And
`nightly-<date> (<hash>)` for nightly and master versions

Reason is, many players only give information that they are running `0.x.0` but are not giving us the information which day, or commit they are running. So we should make master builds less confusing.
 2020-09-22 11:47:18 +02:00
jshipsey
4f0faf4c56 small corrections 2020-09-21 23:57:10 -04:00
Snowram
fa2dd28587 Fixed various issues from better-things branch 2020-09-21 23:57:10 -04:00
Sam
2ff59c9f60 Addressed comments 2020-09-21 17:55:29 -05:00
Sam
8ab0d5e5e0 Added icon for skillbar ability of sword. 2020-09-21 17:40:20 -05:00
jshipsey
0796337a8c resolve minor anim hiccup 2020-09-21 17:40:19 -05:00
Sam
1fbcf2be80 Fixed pipeline errors. 2020-09-21 17:40:19 -05:00
Sam
b4018e7d42 Made 3rd ability interruptible. Final balance tweaks. 2020-09-21 17:40:16 -05:00
jshipsey
8070a38a89 spin anim 2020-09-21 17:38:57 -05:00
jshipsey
e79cef4824 dash animation 2020-09-21 17:38:55 -05:00
Sam
a8e834e754 Initial implementation of spin attack for sword. 2020-09-21 17:38:54 -05:00
jshipsey
b0d359e29f slightly quicker alpha, improved anims 2020-09-21 17:38:54 -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
c99e4c3c18 Added swing duration to dash melee. Added framework for animation to be added. 2020-09-21 17:38:51 -05:00
Sam
04af75bf8d Initial implementation of new dash melee. 2020-09-21 17:38:48 -05:00
jshipsey
a18c23025e stage 2 and 3 anim 2020-09-21 17:38:46 -05:00
Sam
847bddbd89 Removed swing_frac, added a swing duration instead to allow for more utility in character state. Moved location of stage_section enum to wielding so it could more easily be used by other character states. 2020-09-21 17:38:46 -05:00
Sam
2ba9d1e54f Added support for different swings in the combo melee having differnt fractions of time buildup duration is split. 2020-09-21 17:38:45 -05:00
jshipsey
2451a64b97 stage 2 animation 2020-09-21 17:38:44 -05:00
Sam
0ba5740265 Added enum for stage section instead of using 4 bools. 2020-09-21 17:38:43 -05:00
Sam
440e45f2bc Did stuff to support addition of keyframes for combo melee animation. 2020-09-21 17:38:43 -05:00
Sam
aab56ea636 Animation time for combo melee now resets between stages. 2020-09-21 17:38:42 -05:00