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
5,840 Commits 151 Branches 18 Tags 2.1 GiB
de685b00b2
Commit Graph

2502 Commits

Author SHA1 Message Date
jiminycrick
0689630d98 Fading music/ambient sounds decently upon biome transition 2020-11-18 13:31:11 -08:00
jiminycrick
b5aea464f3 Switch music at biome transitions 2020-11-18 13:31:11 -08:00
jiminycrick
46d3f6f6d2 Initial biome specific music and ambient sound channel 2020-11-18 13:31:11 -08:00
Imbris
7427367d96 Fix issues with not being able to grab highlighted apples by unifying distance checking 2020-11-17 23:06:02 -05:00
Snowram
950eb1976d Addressed more comments 2020-11-17 23:54:01 +01:00
Snowram
83b2640e02 Makes basic beam Y offset depend on body scale 2020-11-17 23:27:13 +01:00
Snowram
7af561263d Addressed comments 2020-11-17 23:27:13 +01:00
Snowram
93642428f2 Move eye sight and scale in body.rs, mounts tweaks 2020-11-17 23:27:13 +01:00
Odd-Harald Lillestø Myhren
774ef72344 Merge branch 'master' into 'knarkzel/persist-combo-roll' 
# Conflicts:
#   CHANGELOG.md
 2020-11-15 22:37:30 +00:00
Knarkzel
64da99a4d7 add new was_combo field to test 2020-11-15 23:49:01 +01:00
Joshua Barretto
171ef1d7b9 Upscaling support 2020-11-15 22:18:35 +00:00
Imbris
4872d285c3 Merge branch 'imbris/fix-font-selection' into 'master' 
Properly use localization specified fonts, fix swedish translation by adding...

Closes #834

See merge request veloren/veloren!1521
 2020-11-15 03:18:29 +00:00
Imbris
03c96a7c7b Properly use localization specified fonts, fix swedish translation by adding other fonts to the font mapping list 2020-11-14 21:31:31 -05:00
Imbris
4f2512f126 Save the selected character, deselect character when deleting, auto select newly created character 2020-11-14 19:17:42 -05:00
Imbris
5dbb1aeae7 Merge branch 'imbris/fix-7' into 'master' 
Fix panic on minimizing window before the game starts up

See merge request veloren/veloren!1514
 2020-11-14 03:30:13 +00:00
Imbris
ff5b152525 Merge branch 'imbris/fix-6' into 'master' 
Fix issue where ui scale in the login menu was not updated when changed in-game

Closes #578

See merge request veloren/veloren!1513
 2020-11-14 02:49:41 +00:00
Imbris
a044981fd7 Fix panic on minimizing window before the game starts up 2020-11-13 21:09:19 -05:00
Imbris
1373b752ff Merge branch 'imbris/fix-5' into 'master' 
Remove randomization of species and body_type with the randomize button in char creation

See merge request veloren/veloren!1512
 2020-11-14 01:56:28 +00:00
Imbris
51dd5110d0 Merge branch 'imbris/fix-3' into 'master' 
Tweak clock related things and fix voxygen tracy feature

See merge request veloren/veloren!1506
 2020-11-14 01:39:33 +00:00
Imbris
cff5439796 Fix issue where ui scale in the login menu was not updated when changed in-game 2020-11-13 20:17:59 -05:00
Imbris
1952785af2 Remove randomization of species and body_type with the randomize button in char creation 2020-11-13 19:43:32 -05:00
Samuel Keiffer
1ed90bd0bf Merge branch 'sam/ron-abilities' into 'master' 
Move abilities to .ron files

Closes #821

See merge request veloren/veloren!1508
 2020-11-13 17:55:57 +00:00
Sam
b5f59f9cf3 Fixed tests. Addressed comments. 2020-11-13 10:41:34 -06:00
Monty Marz
7da8c71d89 radio buttons for buff position in settings 2020-11-13 14:32:15 +01:00
Monty Marz
691d1f5243 bigger buff icons above skillbar 2020-11-13 14:20:33 +01:00
Imbris
5fa2ac6e38 Handle window resizing properly to fix some bugs on startup 2020-11-12 23:56:36 -05:00
Imbris
f1ca3ccc69 Fix language and ui resolution in menus not updating when they are changed ingame 2020-11-12 23:03:44 -05:00
Imbris
37e4ea4669 Remove ability map from top level functions 2020-11-12 21:24:35 -06:00
Sam
9b4fa4e961 Started moving loading of ability manifest to an ecs variable. 2020-11-12 21:24:34 -06:00
Imbris
27d4310498 Add more catagories to common deps, store average busy dt as a duration, store frame delta times as seconds instead of milliseconds 2020-11-12 19:18:54 -05:00
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