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,691 Commits 151 Branches 18 Tags
Commit Graph

1994 Commits

Author SHA1 Message Date
Monty Marz
fb0984efa1 address comments 2020-08-08 00:13:00 -04:00
Monty Marz
4a1ee6edd3 Change to social window selection visuals 2020-08-08 01:16:35 +02:00
Imbris
10ad130712 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
50858245d9 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
9869b2a8d7 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
a0dd070daf timeout visuals, various small fixes and two new items 2020-08-08 01:15:58 +02:00
Monty Marz
53fa9e451a overhead info improvements 
overhead improvements
 2020-08-08 01:15:58 +02:00
Monty Marz
64acb03083 Update CHANGELOG.md, german locale 2020-08-08 01:15:58 +02:00
Imbris
8d1715f7dd Don't show own char in group menu, handle accept/decline key events 2020-08-08 01:15:58 +02:00
Monty Marz
fb40666831 Social window assets 2020-08-08 01:14:19 +02:00
Imbris
3c66e786dd Distribute exp evenly and make it easier to target entities 2020-08-08 01:14:19 +02:00
Monty Marz
b7e7cdbf94 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
320cbc9b3c New group UI functions 2020-08-08 01:14:19 +02:00
Monty Marz
658d2acca1 colors 2020-08-08 01:12:35 +02:00
Imbris
7f641498ff Integrate groups with chat groups 2020-08-08 01:12:35 +02:00
Imbris
71917f9964 Make entity targeting easier, add EXP sharing 2020-08-08 01:12:35 +02:00
Imbris
03a1c7cd13 Fixes and tweaks for groups 2020-08-08 01:12:35 +02:00
Monty Marz
c5720c02c9 Basic UI 
Basic ui for groups and group window
 2020-08-08 01:12:35 +02:00
Imbris
ef43cc0030 Add key to select entities 2020-08-08 01:09:02 +02:00
Imbris
fe8eeb1dd9 Add entity targeting 2020-08-08 01:09:01 +02:00
Marcel Märtens
5c764cd933 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
c996626181 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
f656bfaddf Avoid cloning armor/tool in tooltip generation, add temporary case for legacy item descriptions 2020-08-07 01:25:51 -04:00
nepo
b8cb8ec68b nepo/dullahan 2020-08-07 03:56:59 +00:00
Imbris
8f813a3773 Revert "Merge branch 'BottledByte/ability_design' into 'master'" 
This reverts merge request !1264
 2020-08-06 08:04:03 +00:00
Imbris
703da622bb 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
8cbb43ac30 Add ability IDs and use them in GUI 2020-08-05 23:00:43 +02:00
BottledByte
b8199542e0 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
64185584b4 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
4a19f1dacc De-enumerized armor variants 2020-08-03 03:41:32 +00:00
Joshua Yanovski
8d43b0b828 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
24a675802b 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
c91dc994f9 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
2307d54101 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
6c4210f0a5 Prevent keyholds for collect (e) 2020-08-02 15:25:57 +10:00
BottledByte
c7a5161b43 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
6f73713c79 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
3211472a3b 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
1fe795839f changelog 2020-08-01 02:28:57 -04:00
jshipsey
030f29d102 cleanup, last tweaks 2020-08-01 02:19:45 -04:00
jshipsey
0eaa41f5ba arming the cyclops 2020-08-01 02:19:45 -04:00
Snowram
b37c0962af Add frog npc, tweak pig model 2020-08-01 02:19:45 -04:00
jshipsey
2645f9e631 cyclops run anim 2020-08-01 02:19:45 -04:00
Snowram
d7bafe7fb5 Bonerattler tweaks 2020-08-01 02:19:45 -04:00
jshipsey
654088820c maneater and feed anim 2020-08-01 02:19:45 -04:00
Snowram
1b7cb8cde6 Add troll, truffler and wendigo npcs 2020-08-01 02:19:45 -04:00
jshipsey
9a4415509c catoblepas, bonerattler, rabbit, improved anims 2020-08-01 02:19:44 -04:00
jshipsey
8251fcfa55 new models, anim tweaks 2020-08-01 02:19:44 -04:00
Snowram
eb5ebdce12 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
18546d0ba5 Skeleton rework with rough offsets 2020-08-01 02:19:43 -04:00