Commit Graph

5682 Commits

Author SHA1 Message Date
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
Samuel Keiffer
fb72fc7433 Merge branch 'james/npc-projectile-aiming' into 'master'
Improve NPC aiming and humanoid hitboxes

See merge request veloren/veloren!1502
2020-11-11 04:36:41 +00:00
James Melkonian
6085edaa34 Improve NPC aiming and humanoid hitboxes 2020-11-11 04:36:40 +00:00
Samuel Keiffer
7ad330af4c Merge branch 'sam/fix-assets-update-2' into 'master'
Fix 2 for Assets Update Merge

See merge request veloren/veloren!1501
2020-11-11 03:12:40 +00:00
Sam
e90104ba0f Yeet 2020-11-10 19:59:55 -06:00
Samuel Keiffer
c087b74a8d Merge branch 'sam/fix-assets-update' into 'master'
Fix merge of assets update branch

See merge request veloren/veloren!1500
2020-11-10 23:10:36 +00: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
Sam
e6693d5979 Yeet 2020-11-10 15:49:51 -06:00
Monty Marz
670af0ad1e Merge branch 'pfau/assets_update' into 'master'
Assets update

See merge request veloren/veloren!1458
2020-11-10 21:43:45 +00:00
Monty Marz
0e072f72cc frost cleaver
velorite mage set

offsets
armor stats
2020-11-10 21:43:45 +00:00
Marcel Märtens
72afd7af6c switch to spin_sleep 2020-11-10 22:39:10 +01: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
Justin Shipsey
a8ac051f33 Merge branch 'james/axe-hammer-keyframes' into 'master'
James/axe hammer keyframes

See merge request veloren/veloren!1497
2020-11-10 01:03:11 +00:00
Joshua Barretto
b4d337c746 Merge branch 'zesterer/worldgen-canvas' into 'master'
*The* world generation cleanup (part 1)

See merge request veloren/veloren!1490
2020-11-10 00:01:11 +00:00
jshipsey
db753c4f3b adjust to comments 2020-11-09 18:47:52 -05:00
jshipsey
cd188fd32b tweaks 2020-11-09 18:32:23 -05:00
Joshua Barretto
bce6195479 Added birch forest 2020-11-09 22:59:41 +00:00
Joshua Barretto
b09148abee Updated changelog, removed old models 2020-11-09 17:19:29 +00:00
Joshua Barretto
962f0ec812 Better snow effects for non-trees 2020-11-09 17:09:33 +00:00
Joshua Barretto
b0f7cdfe66 Reduced oaks in desert 2020-11-09 16:28:57 +00:00
Joshua Barretto
d9550ddebd Better pine forests by shifting average oak temperature 2020-11-09 16:22:47 +00:00
Joshua Barretto
71718d9c98 Better humidity, better snow trees 2020-11-09 15:06:37 +00:00