Commit Graph

986 Commits

Author SHA1 Message Date
Imbris
586bdddc9e Add gradient primitive to ui, adjust textbox aspect ratio, misc tweaks 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
Imbris
10c046be2f Delete conrod main menu code!!!!!!, small tweaks 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
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
bc0792a57a Rename localization/font types (e.g. VoxygenLocalization -> Localization) 2020-11-11 03:02:21 -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
Sam
e90104ba0f Yeet 2020-11-10 19:59:55 -06:00
Sam
e6693d5979 Yeet 2020-11-10 15:49:51 -06:00
Monty Marz
0e072f72cc frost cleaver
velorite mage set

offsets
armor stats
2020-11-10 21:43:45 +00: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
b09148abee Updated changelog, removed old models 2020-11-09 17:19:29 +00:00
Joshua Barretto
3f02aa5134 Removed more redundant code, desert dunes, better bridges 2020-11-09 10:20:22 +00:00
Joshua Barretto
9b233708e2 Turned tree generation into a post-processing layer, ripped out old tree generator for performance wins 2020-11-09 10:20:22 +00:00
Marcel
981b71759e 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
d9f7a72139 adjust path to veloren account page 2020-11-09 09:21:14 +01:00
jshipsey
92aa6a1b12 axe basic 2020-11-08 18:51:35 -05:00
Sam
08a0926c40 Fixed sneaky admin sword. 2020-11-08 13:58:23 -06:00
Justin Shipsey
8cab21d44c Merge branch 'AlKabir/animals-dont-drop-lootbags' into 'master'
Make different mobs drop different assets on death (not just lootbags)

See merge request veloren/veloren!1462
2020-11-08 07:26:10 +00:00
jiminycrick
66dbfebf3b Asset ron file fix 2020-11-07 22:06:08 -08:00
AlKabir
aaac3dadcb improved the steak asset 2020-11-07 23:52:18 -06:00
AlKabir
6535deae9c added two meat assets for mobs to drop 2020-11-07 23:34:20 -06:00
Sam
aeca76c748 Fixed cultist sword not displaying correctly in inventory. 2020-11-07 21:48:24 -06:00
Sam
b4296c3a2c Fixed stupid error. 2020-11-07 19:54:37 -06:00
Imbris
133ba82a9b Use item_definition_id for weapon asset mapping 2020-11-07 16:44:11 -06:00
Sam
8adee6ef20 Added Tool() around file paths in other manifest. 2020-11-07 15:53:19 -06:00
Sam
261ebf3990 Added Tool() around file paths. 2020-11-07 15:53:18 -06:00
Sam
d484ac2e38 Yeeted from ron files. 2020-11-07 15:53:16 -06:00
Sam
ca65cdace1 Yeeted from manifest files. 2020-11-07 15:53:14 -06:00
Monty Marz
642ad805a1 potion buff 2020-11-06 01:08:34 +01:00
Snowram
0d92f02deb Buff stonegolem, nerf giants, add missing sfxs 2020-11-06 01:08:33 +01:00
Monty Marz
ca932f6c15 easier to get minor potions
increase cost of a minor potion to 4 apples
2020-11-06 01:08:32 +01:00
Monty Marz
eb79820c25 tweaks consumables buffs values 2020-11-06 01:08:32 +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
a0af315930 Addressed comments. 2020-11-04 19:22:08 -06:00
Marcel
7517991d73 Merge branch 'TR_translations' into 'master'
Updated translations

See merge request veloren/veloren!1473
2020-11-04 16:13:53 +00:00
TheBoredProgrammer64
3f7b007227 Updated translations 2020-11-04 16:13:53 +00:00
Snowram
a6d5d87bbc Fix animations regressions for biped_large 2020-11-04 02:12:43 +01:00
jshipsey
fb1aae22dd manifests 2020-11-04 01:48:06 +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
28cde31bbb setup for staff, more anim conversions 2020-11-04 01:48:05 +01:00
Joshua Barretto
6331ad9455 Implemented Flight 2020-11-03 22:46:07 +00:00
Fausk
3679701ebf Grammar and length reduction, Lucerne and Pike Hammer swap names for consistency 2020-11-01 13:29:35 -07:00
Kelly Monroe
47adb2f1d1 Fixing up further grammar and length issues, Lucerne and Spike Hammer swap names 2020-11-01 13:29:35 -07:00
Fausk
477b575f4e fixup improved item descriptions for most items (no swords) 2020-11-01 13:29:35 -07:00
Joshua Barretto
0aca8ee0f7 Better minimal clouds 2020-10-30 15:43:51 +00:00