5621 Commits

Author SHA1 Message Date
Imbris
f4a704eaa6 Input fields layout tweaks 2020-11-11 03:02:21 -05:00
Imbris
1e1e3a66ac Fix whitespace glitches, center text cursor 2020-11-11 03:02:21 -05:00
Imbris
45dd2b0896 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
4bd5349a80 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
93b5376cb9 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
d8e1af835d Rearrange iced renderer modules, wire up events for the main menu iced ui 2020-11-11 03:02:21 -05:00
Imbris
937e1e696c Add support for Button widget, new custom widget AspectRatioContainer 2020-11-11 03:02:21 -05:00
Imbris
04a56d6ec7 Rename localization/font types (e.g. VoxygenLocalization -> Localization) 2020-11-11 03:02:21 -05:00
Imbris
bd694c5a81 Text rendering for iced with glyph_brush works now 2020-11-11 03:02:20 -05:00
Imbris
9dbabff887 Add for<'b> lifetime annotation (almost worked) 2020-11-11 03:02:20 -05:00
Imbris
a1f59cb2ea Implement text renderering with glyph_brush (lifetime error) 2020-11-11 03:02:20 -05:00
Imbris
3f6faecbb5 Add support for Space widget, refine main menu ui, misc fixes and improvements. 2020-11-11 03:02:20 -05:00
Imbris
aeff910120 Revamp BackgroundContainer with scale specific padding, and use in main menu attempt 2020-11-11 03:02:20 -05:00
Imbris
43139873d5 Add Stack and CompoundGraphic widgets 2020-11-11 03:02:20 -05:00
Imbris
568795fe6f Begin implementing container widget with an image background 2020-11-11 03:02:20 -05:00
Imbris
3b644a4014 Start experimenting with replicating main menu 2020-11-11 03:02:20 -05:00
Imbris
e64f8aec60 Get resizing working 2020-11-11 03:02:20 -05:00
Imbris
a4dc47bc2c Initial setup to use iced 2020-11-11 03:02:20 -05:00
Samuel Keiffer
d942f4c7b6 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
0422c3391d Improve NPC aiming and humanoid hitboxes 2020-11-11 04:36:40 +00:00
Samuel Keiffer
a043985ba5 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
989de385e3 Yeet 2020-11-10 19:59:55 -06:00
Samuel Keiffer
2cd512577f 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
d188b12084 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
c2300ea2a5 Yeet 2020-11-10 15:49:51 -06:00
Monty Marz
f4d286f00c 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
b4f160d0e3 frost cleaver
velorite mage set

offsets
armor stats
2020-11-10 21:43:45 +00:00
Marcel Märtens
33100275fd switch to spin_sleep 2020-11-10 22:39:10 +01:00
Marcel Märtens
f831df5064 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
0c8d8fc5c6 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
6d768e9685 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
11abacda69 adjust to comments 2020-11-09 18:47:52 -05:00
jshipsey
34b05e8229 tweaks 2020-11-09 18:32:23 -05:00
Joshua Barretto
6703575641 Added birch forest 2020-11-09 22:59:41 +00:00
Joshua Barretto
1b03d0437c Updated changelog, removed old models 2020-11-09 17:19:29 +00:00
Joshua Barretto
81a01b4740 Better snow effects for non-trees 2020-11-09 17:09:33 +00:00
Joshua Barretto
ed41d0fa9b Reduced oaks in desert 2020-11-09 16:28:57 +00:00
Joshua Barretto
de78c64107 Better pine forests by shifting average oak temperature 2020-11-09 16:22:47 +00:00
Joshua Barretto
4944eb5f59 Better humidity, better snow trees 2020-11-09 15:06:37 +00:00
Joshua Barretto
69beba3e79 Removed more redundant code, desert dunes, better bridges 2020-11-09 10:20:22 +00:00
Joshua Barretto
3f7dba5127 Abandon tree generation when outside bounds 2020-11-09 10:20:22 +00:00
Joshua Barretto
27821c3aed Turned tree generation into a post-processing layer, ripped out old tree generator for performance wins 2020-11-09 10:20:22 +00:00
Joshua Barretto
9d8fab2056 Switched path generation to canvas 2020-11-09 10:20:22 +00:00
Marcel
2ca06ca7b1 Merge branch 'xMAC94x/auth-link' into 'master'
adjust path to veloren account page

See merge request veloren/veloren!1498
2020-11-09 09:01:59 +00:00
Marcel Märtens
735774b5c2 adjust path to veloren account page 2020-11-09 09:21:14 +01:00
Sam
91082b3167 Slight balance tweaks. 2020-11-08 19:33:24 -06:00
jshipsey
c665c1b268 hammer keyframes 2020-11-08 19:54:46 -05:00
Sam
ee014e3079 Minor tweaks. 2020-11-08 18:11:53 -06:00
jshipsey
28180c5c5d rebase 2020-11-08 19:02:48 -05:00
jshipsey
84586ef085 ranged 2020-11-08 18:52:22 -05:00