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
5,179 Commits 151 Branches 18 Tags 2.1 GiB
3512898c2b
Commit Graph

651 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
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
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
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
BottledByte
a167ee98ee De-enumerized armor variants 2020-08-03 03:41:32 +00: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
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
Imbris
f589564760 Fix glyph to large panic 2020-07-31 01:13:31 -04:00
Monty Marz
31cfc05123 lots of things 
animation fixes by slipped
new cultist item
settings option for loading screen tips
loot table adjustments
 2020-07-23 12:10:13 +00:00
Monty Marz
e353bd3cfc Fix cut off chat 2020-07-18 21:56:45 +00:00
Imbris
0275cc9523 Tweak pausing code to reduce duplication 2020-07-17 21:26:21 -04:00
Imbris
28e00a0f6e Fix singleplayer feature and rebase related stuff 2020-07-17 21:24:28 -04:00
Samuel Keiffer
6cce09be85 Added protection stat to admin armor hidden in debug folder. Removed blue cultist armor set from drop table as it is an admin set. 2020-07-18 00:05:28 +00:00
Joshua Barretto
8d6b442193 Crafting 2020-07-14 20:11:39 +00:00
Joshua Barretto
446923f7d8 Merge branch 'zesterer/small-fixes' into 'master' 
Zesterer/small fixes

See merge request veloren/veloren!1190
 2020-07-14 09:54:17 +00:00
Joshua Barretto
3e5c3de2ac Neater compass 2020-07-13 23:23:44 +01:00
Kai
8e523364ac Prevent GameInputs from being bound to multiple keys unless explicitly allowed. Add a Reset to Defaults button for controls. 2020-07-12 11:59:55 -07:00
Joshua Barretto
3c72022c81 Nicer north colour 2020-07-10 18:21:34 +01:00
Joshua Barretto
cf69d0c5d8 Added minimap compass 2020-07-10 15:00:20 +01:00
Samuel Keiffer
fe47a14ba5 Spin attack for axe 2020-07-08 19:58:41 +00:00
Joshua Barretto
43f75f2f54 Removed bomb timeout 2020-07-05 16:15:51 +01:00
Joshua Barretto
fd39ee97bc Added training dummies 2020-07-05 16:15:51 +01:00
Joshua Barretto
2f6a618d5a Added bombs, throwable items, more block kinds, weaker explosions 2020-07-05 16:15:48 +01:00
Samuel Keiffer
85d1d4b3ff Leap now actually works. In addition, leaping while next to an entity no longer interrupts the leap. 2020-07-03 15:40:12 +00:00
Monty Marz
95a799cf85 fix artifacts, cleanup 2020-07-03 12:17:55 +02:00
Monty Marz
89400264dc Loot ChatType, Update german translation, map zooming 2020-07-01 19:05:44 +00:00
scott-c
d53b51954b Added ability to use 2 x 1h weapons or shields 2020-07-01 17:51:06 +08:00
Forest Anderson
201f513737 Fixed meta chattype error on master 2020-06-28 17:10:01 +00:00
CapsizeGlimmer
883d9acf30 cargo fmt 2020-06-27 17:43:46 -04:00
CapsizeGlimmer
3d29c3254a Add setting for displaying character names in chat. Placate cargo clippy. 2020-06-27 17:43:46 -04:00
CapsizeGlimmer
59db2fcd3b Admin status added when registering; cargo fmt 2020-06-27 17:43:45 -04:00
CapsizeGlimmer
92127292d4 Added option to disable speech bubble icons. Aligned settings>gameplay menu again. 2020-06-27 17:40:03 -04:00
Monty Marz
a204072e78 fix 2020-06-27 17:40:03 -04:00
Monty Marz
3ed646b512 icon frame 2020-06-27 17:40:03 -04:00
Monty Marz
0969c236d6 fix dark bubble tail not being displayed correctly 2020-06-27 17:40:03 -04:00
CapsizeGlimmer
2d2aba3a5d Chat bubble text shadows. Fix panic when re-joining a group or faction 2020-06-27 17:40:03 -04:00
CapsizeGlimmer
b04810cae5 misc chat mode changes 2020-06-27 17:40:03 -04:00
CapsizeGlimmer
5ad212b7ed Add chat types for offline, online. Implement Pfau's fixes 2020-06-27 17:40:03 -04:00
Pfauenauge90
a497fb92d3 icons 2020-06-27 17:20:26 -04:00
Pfauenauge90
f83c58498f bubble colors 2020-06-27 17:20:26 -04:00
CapsizeGlimmer
b7d7696d89 Implement MR!1043 changes suggested by Imbris 2020-06-27 17:20:26 -04:00
CapsizeGlimmer
34acc4ddf3 Players are removed from social menu when logged out. 2020-06-27 17:20:26 -04:00
CapsizeGlimmer
aabf9d7b21 fix chat-cli name formatting. 2020-06-27 17:20:26 -04:00
CapsizeGlimmer
2a0f0053d4 Added chat mode icons to speech bubbles 2020-06-27 17:03:30 -04:00
CapsizeGlimmer
35ed03aa18 Implement chat mode icons in chat window 2020-06-27 17:03:30 -04:00
CapsizeGlimmer
5cbecb29e6 Implement /join_group and /join_faction commands 2020-06-27 16:42:26 -04:00
CapsizeGlimmer
289ef5d6b2 Move message processing and chat bubbles to the client 2020-06-27 16:42:26 -04:00
CapsizeGlimmer
0b2a3ebe8b Re-implement names in chat. It is done client-side now and /alias changes are retroactive. 2020-06-27 16:42:25 -04:00
CapsizeGlimmer
b08d717eac Rework chat processing 2020-06-27 16:29:03 -04:00
CapsizeGlimmer
702a21302c Base implementation of /group /faction /say /region 2020-06-27 16:26:02 -04:00
Monty Marz
32f6d42ed9 alpha disclaimer 2020-06-24 13:44:39 +00:00
Shane Handley
304e06cbce Fix clippy warnings after toolchain update 2020-06-23 16:52:04 +10:00
Marcel Märtens
9485b45e70 switch to tracing stlye and enhance logs with usefull information 
- Updated CHANGELOG
- reduce dependencies
- found out that we have alot of duplicate coding... alot...
 2020-06-22 09:53:15 +02:00
Kevin Glasson
af3af6c169 Convert voxygen to use tracing 
There are several noteable changes in this commit that mean that logging
will behave differently to how it did previously.

- There are now no separate filter levels for terminal and file output.
This is a feature that is lacking in `tracing` but is set to be resolved
by https://github.com/tokio-rs/tracing/pull/508. At which point we MAY
include it.

- The default log level was previously `WARN` - it is now `INFO`.
 2020-06-21 23:17:25 +08:00
Kevin Glasson
19c2bf1181 Add hotbar state persistence. 
Persist the hotbar state to disk by writing it out to a `profile.ron`
situated next to the existing `settings.ron`. There are individual
profiles for every character on every server. On creation of a new
character the default hotbar state will be `[None; 10]` i.e. the hotbar
will be empty.

Resolves: https://gitlab.com/veloren/veloren/-/issues/577
 2020-06-19 08:00:21 +08:00
Ben Wallis
6da7a11d33 Fixed suppressed clippy warnings for #587 - clone_on_copy 2020-06-18 22:25:48 +01:00
Ben Wallis
4a4a106232 Voxygen: Fixed weird window movement caused by moving the window with the cursor grabbed (#588) 2020-06-17 12:40:11 +01:00
Imbris
26e53409d8 Merge branch 'xvar/clippy-globally-suppress-option_map_unit_fn' into 'master' 
Globally suppressed clippy lint option_map_unit_fn for #587

See merge request veloren/veloren!1071
 2020-06-14 16:48:07 +00:00
Ben Wallis
c1c968f479 Globally suppressed clippy lint option_map_unit_fn for #587 2020-06-14 16:48:07 +00:00
Justin Shipsey
688f917308 asset 
missing fix
 2020-06-14 09:22:21 +00:00
Ben Wallis
8ed2109bcf Fixed suppressed clippy warnings for #587 - collapsible_if 2020-06-12 20:34:54 +01:00
Ben Wallis
950c62efc6 Suppressed all existing clippy warnings in preparation for fixes as part of #587 2020-06-10 22:01:42 +01:00
Joey Maher
458ac4af5e Adds simple auto walk functionality. Toggleable or push to hold 2020-06-06 13:09:01 -05:00
Monty Marz
6c0587393e update german translation 2020-06-03 19:32:54 +00:00
Monty Marz
b34da9b07b More item drops 2020-06-03 17:59:09 +00:00
scott-c
136bf271b8 Fix social list having incorrect player count 2020-06-01 22:04:44 +08:00
scott-c
c23183b1ca Add character name and level to social window 2020-06-01 22:04:44 +08:00
scott-c
66f6368e83 Handle out of bounds panic 2020-06-01 21:56:46 +08:00
scott-c
288c7cdbfa fix #562 Confusing chat alias 2020-06-01 21:36:39 +08:00
Monty Marz
f7d6f76a04 Added 36 Swords 
I added 36 sword models to the code.
 2020-05-29 18:23:00 +00:00
CapsizeGlimmer
d5216cc8f3 Redraw dark mode bubbles. Add padding to light mode bubbles. 2020-05-27 13:49:19 +02:00
CapsizeGlimmer
3cea76b82f NPCs now call for help when you hit them. Redraw speech bubble dark mode. 2020-05-27 13:49:18 +02:00
CapsizeGlimmer
3c07d02218 Add a dark mode to speech bubbles; consistantly use 'speech bubble' instead of 'chat bubble' 2020-05-27 13:49:17 +02:00
CapsizeGlimmer
c65967ccdb Chatting now creates speech bubbles 2020-05-27 13:49:14 +02:00
CapsizeGlimmer
73a29b339c Added chat bubbles. Refactored bubble+name+hp+energy into new overhead widget 2020-05-27 13:49:13 +02:00
Treeco
ec2ed4da2c Change a bunch of settings defaults, fix sprite looting key 2020-05-25 15:44:27 +01:00
Joshua Barretto
2f47d09af4 Comment fixes and fmt 2020-05-19 00:35:58 +01:00