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
4,692 Commits 151 Branches 18 Tags 2.1 GiB
7aebff26e0
Commit Graph

1994 Commits

Author SHA1 Message Date
Monty Marz
142b386628 address comments 2020-08-08 00:13:00 -04:00
Monty Marz
74ace74d5a Change to social window selection visuals 2020-08-08 01:16:35 +02:00
Imbris
2608217e83 Make clippy happy, fmt even though it is set to fmt on save in my 
editor...."
 2020-08-08 01:16:35 +02:00
Imbris
390d289d35 Add timeout's to group invites, and configurable limit to group size 
Fix a few group bugs, enable invite timeout and group limits in ui
 2020-08-08 01:16:35 +02:00
Monty Marz
14b0d9a7fe group leader colouring, offset fix when debug menu is open, 
fixed social tab visuals

text width limit

group interaction wording, group window adjustments
 2020-08-08 01:15:58 +02:00
Monty Marz
28a8f847cc timeout visuals, various small fixes and two new items 2020-08-08 01:15:58 +02:00
Monty Marz
3da7e27a7c overhead info improvements 
overhead improvements
 2020-08-08 01:15:58 +02:00
Monty Marz
1eb671e1a6 Update CHANGELOG.md, german locale 2020-08-08 01:15:58 +02:00
Imbris
1d69e85a50 Don't show own char in group menu, handle accept/decline key events 2020-08-08 01:15:58 +02:00
Monty Marz
58df00d80c Social window assets 2020-08-08 01:14:19 +02:00
Imbris
03d9992b9f Distribute exp evenly and make it easier to target entities 2020-08-08 01:14:19 +02:00
Monty Marz
f2ed7efced group button and menu logic changes 
group member panels

health bar text

text shadows and scaling

cleanup, don't show the player panel

social window assets
 2020-08-08 01:14:19 +02:00
Imbris
3a22b3694d New group UI functions 2020-08-08 01:14:19 +02:00
Monty Marz
9cffb61429 colors 2020-08-08 01:12:35 +02:00
Imbris
d856c20225 Integrate groups with chat groups 2020-08-08 01:12:35 +02:00
Imbris
ef4b221706 Make entity targeting easier, add EXP sharing 2020-08-08 01:12:35 +02:00
Imbris
0a8f148559 Fixes and tweaks for groups 2020-08-08 01:12:35 +02:00
Monty Marz
d9e3937a82 Basic UI 
Basic ui for groups and group window
 2020-08-08 01:12:35 +02:00
Imbris
6aba810517 Add key to select entities 2020-08-08 01:09:02 +02:00
Imbris
1741384d00 Add entity targeting 2020-08-08 01:09:01 +02:00
Marcel Märtens
599a9a76fc add a translation test that verifys that all language RON files are parseable (without any git involved) 2020-08-07 21:31:34 +02:00
Imbris
bdd255beb6 Tooltips now disappear when hovered and no longer appear on top of the mouse position (e.g. in the bottom of the inventory) 2020-08-07 03:30:17 -04:00
Imbris
d74a1d371e Avoid cloning armor/tool in tooltip generation, add temporary case for legacy item descriptions 2020-08-07 01:25:51 -04:00
nepo
cb65070aba nepo/dullahan 2020-08-07 03:56:59 +00:00
Imbris
c2f3e1b47f Revert "Merge branch 'BottledByte/ability_design' into 'master'" 
This reverts merge request !1264
 2020-08-06 08:04:03 +00:00
Imbris
a0b1259b7e Merge branch 'BottledByte/ability_design' into 'master' 
Add ability IDs and use them in GUI

See merge request veloren/veloren!1264
 2020-08-06 04:44:51 +00:00
BottledByte
34c87d7a86 Add ability IDs and use them in GUI 2020-08-05 23:00:43 +02:00
BottledByte
ab1c43be84 Dehardcoded LanternKind, Consumable and Ingredient, fixed Sceptre hotbar 
Also fixed two wrong asset references and did some .ron formatting
 2020-08-05 01:21:42 +02:00
Imbris
c118765477 Merge branch 'sharp/os-x-resize' into 'master' 
Fix window resizing on OS X.

See merge request veloren/veloren!1256
 2020-08-03 03:47:48 +00:00
BottledByte
a167ee98ee De-enumerized armor variants 2020-08-03 03:41:32 +00:00
Joshua Yanovski
4e99a3d142 Fix window resizing on OS X. 
Not really clear why this was working on any platform...
 2020-08-03 04:40:36 +02:00
Imbris
7d524f6062 Merge branch 'w3yden/overitem_hud' into 'master' 
Voxygen/HUD: Display item name over dropped items

See merge request veloren/veloren!1240
 2020-08-02 19:54:33 +00:00
w3yden
3e9cfa45bb Voxygen/HUD: Display item name over dropped items 
Fix clippy warning: Removed unneeded () in fn style

Fix formatting for fn style
 2020-08-02 09:49:39 +02:00
Imbris
aced5f9797 Merge branch 'shandley/collect-block-keyup-fix' into 'master' 
Prevent inventory collect events from firing on keyup

See merge request veloren/veloren!1252
 2020-08-02 06:49:14 +00:00
Shane Handley
1ae02244bc Prevent keyholds for collect (e) 2020-08-02 15:25:57 +10:00
BottledByte
dc91209a7b Removed fine-grained Item enums and replaced them with Strings 
This change allows to introduce new weapons and pair them
with graphical assets without need to recompile.
 2020-08-02 01:21:32 +00:00
Samuel Keiffer
f930f52df5 Allows for weapons to have different stats. Seperates healing staff out from staffs into its own weapon type: sceptre. Splits bow weapon type into shortbow and longbow. 2020-08-01 20:08:30 +00:00
Shane Handley
f34894087a Prevent inventory collect events from firing on keyup, which is causing item pickup actions to be called twice. 2020-08-01 20:26:44 +10:00
jshipsey
f167026889 changelog 2020-08-01 02:28:57 -04:00
jshipsey
bcc257f893 cleanup, last tweaks 2020-08-01 02:19:45 -04:00
jshipsey
aa3bdc42d7 arming the cyclops 2020-08-01 02:19:45 -04:00
Snowram
1421517f84 Add frog npc, tweak pig model 2020-08-01 02:19:45 -04:00
jshipsey
487131efb8 cyclops run anim 2020-08-01 02:19:45 -04:00
Snowram
990762ba76 Bonerattler tweaks 2020-08-01 02:19:45 -04:00
jshipsey
5d2be2240e maneater and feed anim 2020-08-01 02:19:45 -04:00
Snowram
90d7485c38 Add troll, truffler and wendigo npcs 2020-08-01 02:19:45 -04:00
jshipsey
8991b60929 catoblepas, bonerattler, rabbit, improved anims 2020-08-01 02:19:44 -04:00
jshipsey
baf67f303e new models, anim tweaks 2020-08-01 02:19:44 -04:00
Snowram
3524d644f5 Various changes to npcs animations 
- Improved dragon run with tilting
- New run animation for quadsmall, added tilting
 2020-08-01 02:19:43 -04:00
Snowram
a0da059676 Skeleton rework with rough offsets 2020-08-01 02:19:43 -04:00