Commit Graph

333 Commits

Author SHA1 Message Date
Tim Sarbin 0f658d5dec
Merge pull request #999 from Intyre/term
Cleaned up d2term
2020-12-21 20:21:20 -05:00
Tim Sarbin f86365694b
Merge pull request #996 from gucio321/skill-icons
skill select menu dependencies
2020-12-21 19:25:49 -05:00
Intyre 570ec238ff Fixed linter issues 2020-12-21 22:22:27 +01:00
Intyre 04ec879035 Cleaned up d2term 2020-12-21 21:46:58 +01:00
M. Sz 0c04e9b3d5 skill select menu dependencies (when we open skillselect menu, other panels are closed) 2020-12-21 17:37:59 +01:00
M. Sz 2869aea4f5 tip-labels in tcpip menu 2020-12-21 12:48:59 +01:00
M. Sz 178703f280 level-up buttons tooltips 2020-12-17 18:58:12 +01:00
Tim Sarbin c79c2a8c89
Merge pull request #983 from gucio321/quest-log-part2
Quest Log - quest completion animation
2020-12-17 11:35:25 -05:00
M. Sz d58ed6202f fixed quest descr bug & added code description 2020-12-17 12:04:37 +01:00
M. Sz 8a027eb48d animation stops playing, when quest log is closed & quest socket gets highlighted, when animation is playing & fixed highlight bug 2020-12-17 11:02:39 +01:00
M. Sz 856138daca animation is played and last frame is completedFrame 2020-12-16 19:06:12 +01:00
M. Sz cf439ede2f skill tre - remaining points label 2020-12-16 16:49:50 +01:00
M. Sz be8b3e3157 stats changing: hero stats panel 2020-12-16 16:49:50 +01:00
M. Sz 3220cc93f4 add-buttons actions 2020-12-16 16:49:50 +01:00
M. Sz 7e346bd039 add-buttons init 2020-12-16 16:49:50 +01:00
M. Sz 60a3e66c95 escape menu hotkeys 2020-12-16 16:49:50 +01:00
M. Sz 08e590f3e4 quest animation initial. 2020-12-16 15:08:39 +01:00
Tim Sarbin ea3a66c17d
Merge pull request #972 from gucio321/help-overlay
HelpOverlay's text
2020-12-14 19:57:39 -05:00
M. Sz 4aa3c9420a removed unused issue comments 2020-12-14 18:32:56 +01:00
M. Sz 8186ecd55a help overlay text 2020-12-14 18:29:54 +01:00
M. Sz 208f2feed5 fixed saving key change bug 2020-12-14 16:47:13 +01:00
M. Sz 25f405838a terminal printing 2020-12-14 13:45:06 +01:00
M. Sz c6ab79c388 quest log disabled icon 2020-12-14 11:25:37 +01:00
gucio321 5b4e23eb8c
Merge branch 'master' into hotfix 2020-12-12 19:29:12 +01:00
gucio321 2e31f3d1ec
Move Gold Panel (#962)
* move gold panel
2020-12-12 01:39:26 -08:00
M. Sz 8f1aadc223 error handling in d2gamescreen.CreateNewGame 2020-12-11 10:26:49 +01:00
M. Sz 509dfda5e5 clean up error handling in d2game/d2player/inventory.go and d2core/d2item/diablo2item/ 2020-12-10 13:18:26 +01:00
M. Sz d302263ac1 code cleanup 2020-12-08 09:18:27 +01:00
Tim Sarbin cf069de879
Merge pull request #960 from gucio321/quest-log-part2
Quest log part2
2020-12-07 14:35:23 -05:00
M. Sz cbe4466fea added max player act support in quest log 2020-12-07 19:17:46 +01:00
M. Sz 1d5516c374 code clean up 2020-12-07 19:07:20 +01:00
M. Sz 5c9d4a80e2 Optymalized tab placing 2020-12-07 15:29:52 +01:00
M. Sz dffa8ff865 moved max quests acts to d2enum 2020-12-04 10:43:33 +01:00
M. Sz ed89d91ae4 code cleanup 2020-12-04 09:20:38 +01:00
M. Sz 708ee12182 removed unused table 2020-12-03 12:53:27 +01:00
M. Sz 9f112f6c12 code optimalisation 2020-12-03 11:56:54 +01:00
M. Sz 2c303d74f2 quest status init 2020-12-03 10:40:01 +01:00
M. Sz b40627ad3e some useful functions for quest log 2020-12-02 17:16:16 +01:00
Tim Sarbin e6d5c8b9fd
Merge pull request #957 from gucio321/hotfix
Hotfix: minor bugs in quest log
2020-12-02 08:12:13 -05:00
M. Sz 013264cb8e socket highlight init 2020-12-02 13:42:40 +01:00
juander 7ca113eed3 d2player/game_controls: Fix skilltree event opening inventory 2020-12-02 12:32:16 +01:00
M. Sz 5804cd2c23 quest description init 2020-12-02 11:47:46 +01:00
M. Sz 7462a6c0a3 KeyAlt in help_overlay 2020-12-02 11:08:36 +01:00
M. Sz c7a841fe5a Merge branch 'hotfix' of https://github.com/gucio321/OpenDiablo2 into hotfix 2020-12-02 09:41:52 +01:00
M. Sz f02ccd86c4 hotfix: fixed errors in quest log & code cleanup 2020-12-02 09:24:14 +01:00
M. Sz 104177279e hotfix: fixed errors in quest log & code cleanup 2020-12-02 09:23:25 +01:00
gucio321 96916863ff
Quest log initial (#956)
* Adding character quest panel
2020-12-01 23:19:15 -08:00
M. Sz b0af051f4c d2resource - escape menu labels 2020-11-28 19:58:22 +01:00
Tim Sarbin 73d381215e
Merge pull request #951 from gucio321/multi-language-labels
Multi language labels
2020-11-27 11:47:54 -05:00
M. Sz 6a0512d0fe colored credits 2020-11-27 09:27:06 +01:00
M. Sz 2daf857b54 when both panels (e.g. inventory and hero stats) are open, mini panel will not be opened 2020-11-26 19:11:00 +01:00
M. Sz 77b915f471 fixed #949 2020-11-26 17:25:21 +01:00
M. Sz 3964d4f6f2 exit button in credits 2020-11-26 15:28:06 +01:00
M. Sz 52ace1ecb3 minipanel label 2020-11-26 14:16:55 +01:00
M. Sz 2dab48a2ee Updated some labels 2020-11-26 13:51:39 +01:00
M. Sz 640a9e043d code cleanup 2020-11-26 12:25:47 +01:00
M. Sz 862951e440 code cleanup 2020-11-26 11:48:49 +01:00
M. Sz 76257ca351 moved some stuff 2020-11-26 11:13:35 +01:00
M. Sz e5bab6660b modification of comments 2020-11-26 10:17:56 +01:00
Tim Sarbin 3d00a0fd17
Merge pull request #942 from ThomasChr/#866_save_act_and_difficulty
save act and difficulty. Fixes #866
2020-11-25 20:44:00 -05:00
gucio321 0ab3d70952
Merge pull request #10 from gucio321/master
update
2020-11-25 20:00:29 +01:00
M. Sz 74cdc3913a fixed necromancer animation in select her class menu 2020-11-25 19:55:18 +01:00
M. Sz 91f28516ff fixed lints 2020-11-25 19:25:19 +01:00
M. Sz 122b49b1cf Adds translatable labels in most part of main menu 2020-11-25 18:40:56 +01:00
M. Sz 56787b13b8 Opimalisation 2020-11-25 12:37:16 +01:00
Thomas Christlieb 320583b5d4 save act and difficulty. Fixes #866 2020-11-25 11:51:20 +01:00
gucio321 a4ded26038
Merge pull request #9 from gucio321/master
update
2020-11-25 11:38:40 +01:00
M. Sz 03a2664675 function translateLabel is now global function of d2gamescreen 2020-11-25 11:06:05 +01:00
M. Sz d87e4a846a init of multi-language main menu 2020-11-25 10:03:50 +01:00
Tim Sarbin 19e3053c0a
Merge pull request #946 from gucio321/d2networking-logger2
d2networking logger
2020-11-25 03:09:36 -05:00
gucio321 33bc9fe434
locale strings for character select & hero stat panel (#948)
* character select screen's hero descriptions & hero stat panel

* cinematics names

* buttons on character select screen and "resistances" labels on hero stats panel

Co-authored-by: M. Sz <mszeptuch@protonmail.com>
2020-11-24 23:45:30 -08:00
M. Sz 80a1eb8eab fixed lints 2020-11-24 17:52:27 +01:00
M. Sz 0f2c5cecb1 fixed lints 2020-11-24 17:50:31 +01:00
M. Sz 0d6e8ac0be Merge branch 'multi-language-labels' into hotfix 2020-11-24 17:45:28 +01:00
M. Sz c704cc4c45 buttons on character select screen and "resistances" labels on hero stats panel 2020-11-24 17:44:15 +01:00
M. Sz 9e0a5d2df9 cinematics names 2020-11-24 12:11:53 +01:00
M. Sz ac6846b0ec Fixed lints 2020-11-24 11:50:58 +01:00
M. Sz 5a6f0c2dcb character select screen's hero descriptions & hero stat panel 2020-11-24 10:47:11 +01:00
M. Sz 569608295c fixed build errors 2020-11-23 18:07:51 +01:00
gucio321 f9c607b734
Hotfix: gold button in left corner of game screen (#945)
* hotfix: remove gold button in 0,0
2020-11-23 02:29:35 -08:00
gucio321 7919b742bd
gold (#943)
* Init for gold button and label

* gold button and label in inventory menu

* gold value saved/loaded from player save file

Co-authored-by: M. Sz <mszeptuch@protonmail.com>
2020-11-22 14:53:33 -08:00
gucio321 24affd785c
close button label in help overlay (#941)
* resolved build errors

* fixed close button label in help overlay

Co-authored-by: M. Sz <mszeptuch@protonmail.com>
2020-11-21 21:38:09 -08:00
gucio321 518a667a84
modification of the logger (#940)
Co-authored-by: M. Sz <mszeptuch@protonmail.com>
2020-11-21 21:36:59 -08:00
juander-ux 1f49df62d1
Ui hud polishing (#938)
* d2ui/tooltip: Make it invisible by default

* d2ui/button: Add GetToggled() method

* d2player/HUD: Add tooltip for minipanel button

* d2ui/button: Add disabled frame to minipanel buttons

* d2ui/widget_group: Add SetEnable method for clickable widgets

* d2player/mini_panel: move menu button here from HUD

* d2ui/button: toggled buttons take preference over disabled buttons

* d2player/help_overlay: Make panel only use widgets

* d2player/hud: Group most widgets into widget group

* d2ui/custom_widget: Allow tooltip to be attached

* d2player/hud: Attach staminaBar tooltip to staminaBar

* d2player/hud: Attach experienceBar tooltip to experienceBar widget

* d2ui/ui_manager: Always draw tooltips last

* d2player/help_overlay: It should be drawn over the HUD

* d2player/globeWidget: Move tooltip here from HUD

* d2core/tooltip: Automatically add tooltips to the uiManager

* d2core/ui_manager: Remove special handling of widgetGroups for rendering

* d2player/help_overlay: Add button to widget group

* d2player/hud: Attack runwalk tooltip to button

* d2player/mini_panel: Add panelButton to its own widget group

* d2core/widget_group: When a clickable is added, it's also added to uiManager

* d2player/globeWidget: make tooltip un/lock on click

* d2player/hud: Add runbutton to widget group

* d2player/mini_panel: Add group for tooltips

this allows us to move the tooltip with the panelbuttons. They can't be
in the general panelGroup as they would all become visible when the
panel is opened.

* d2core/button: Remove debug log when a button with tooltip is hovered
2020-11-21 02:35:32 -08:00
Thomas Christlieb e89450daf1
Getting your local IP should not depend on an Internet connection (#937)
* Fixes #917 - Getting your local IP should not depend on an Internet connection
2020-11-21 02:34:46 -08:00
gucio321 9ffbf1320c
D2core logger (#934)
* logger for d2audio & d2map

* logger for d2ui e.t.c

* d2inventory now passes on error messages

* no more importing log in d2core

* implemented #925

* added logger to part of d2networking & fixed "need to be changed" comments

* fixed lints

* fixed errors

Co-authored-by: M. Sz <mszeptuch@protonmail.com>
2020-11-21 02:33:22 -08:00
Thomas Christlieb 0b76e1a561 save player: level, health, mana, experience
Fixes #865
2020-11-19 20:12:31 +01:00
gucio321 2153f5ce64
implemented logger in d2gamescreen (#925)
* implemented logger in d2gamescreen

* logger in d2game/d2player

* logger for app.go
2020-11-18 13:02:49 -08:00
juander-ux ba5ea334cc
Ui minipanel refactor (#926)
* d2player/hud: Make minipanel button a real ui/button

* d2ui/button: Add implicit tooltips

for now it is only for close buttons.

* d2ui/frame: Add size caluclation

now frame.GetSize() returns meaningful values.

* d2ui/button: Add minipanel button types

* d2ui/hero_stats_panel: Fix cached image being way to big

* d2ui/widget_group: Fix widget groups size calculation

* d2ui/widget_group: Add debug rendering

* d2ui/widget_group: SetVisible() now sets the visibility of the group object

* d2player: Refactor mini_panel

we converted all elements to widgets. Thus rendering from game_controls
is no longer neccessary.

* d2ui/button: Add disabled color to layouts

* d2player/gamecontrols: temp hide minipanel when in esc menu

* d2ui/widget_group: Add OffsetPosition() method

* d2player/mini_panel: Implement moving of minipanel

this only occours when other panels are opened.

* d2player/minipanel: Fix inv/skilltree/char closebuttons

these would screw up the moving of the mini panel.

* Fix linter

* d2player/minipanel: Add tooltips to buttons

* d2player/skilltree: Fix icon rendering
2020-11-16 01:41:01 -08:00
juander-ux 12821147ce
Ui panel refactor part 2 (#921)
* d2ui/skilltree: Don't render availSPLabel

this is handled by the ui_manager now.

* d2ui/custom_widget: Allow them to be cached into static images

* d2player/hero_stats_panel: Remove render() function from game_controls

all ui elements are now grouped into a WidgetGroup, thus rendering is
done by the ui manager.

* d2player/hero_stats_panel: Remove unnecessary widgets from struct

we don't need to store them in the HeroStatsPanel struct anymore as they
are completly handled by the uiManager.

* d2ui/widget_group: Remove priority member

this is already defined by the BaseWidget.

* d2ui/widget: Move uiManager.contains() to the baseWidgets

this method makes more sense on a widget anyways.

* d2ui/widget: Add methods to handle widget hovering

* d2ui/custom_widget: Require define width/height

since the custom render() method can do whatever, we need the user to specify
the width/height such that GetSize() calls are meaningful.

* d2ui/widget: Allow widgets to return the uiManager

* d2player/HUD: Refactor health/mana globe into its own widget

* d2player/hud: Refactor load()

seperate each type of loading into its own method.

* d2player/HUD: Move stamina/exp bar into widgets

* d2player/HUD: Refactor left/right skills into widget

* d2ui/custom_widget: cached custom widgets should use widget.x/y

since we render to an image, we use widget.x/y to position the cached
image.

* d2player/HUD: User cached custom widget for all static images
2020-11-13 12:08:43 -08:00
Julien Ganichot 0d691dbffa
Key binding menu (#918)
* Feat(KeyBindingMenu): Adds dynamic box system with scrollbar

* Feat(Hotkeys): WIP Adds a lot of things

* Feat(KeyBindingMenu): WIP Adds logic to binding

* Feat(KeyBindingMenu): Fixes assignment logic

* Feat(KeyBindingMenu): Adds buttons logic

* Feat(KeyBindingMenu): Fixes sprites positions+add padding to Box

* Feat(KeyBindingMenu): Adds label blinking cap

* Feat(KeyBindingMenu): Removes commented func

* Feat(KeyBindingMenu): Fixes lint errors and refactors a bit

* Feat(KeyBindingMenu): Corrects few minor things from Grave

* Feat(KeyBindingMenu): removes forgotten key to string mapping
2020-11-13 12:03:30 -08:00
Tim Sarbin ef6f90c01c
Merge pull request #920 from juander-ux/fix-singleplayer-button-crash
d2gamescreen/char_select: Fix crash on double clicking singleplayer
2020-11-13 09:43:25 -05:00
juander dbbfdd6acf d2gamescreen/char_select: Fix crash on double clicking singleplayer
if we clicked twice on the single player button of the main menu, then
the first click would set the current screen to the
character_select. The second click directly after that will be
handled by the character_select screen. It's OnLoad() method was not
called yet, which initialized all widgets. The click handler of
character_select screen referenced the nil scrollbar and crashes.
2020-11-13 13:46:40 +01:00
gucio321 40dcd18487
added user IP in TCPIP menu (#916)
* added user IP in TCPIP menu
2020-11-12 02:43:05 -08:00
juander 976431c8e5 Revert "d2ui/sprite: Refactor Render() to RenderNoError()"
This reverts commit 77cd538c2f.

Since we removed the return of errors from the Render() method, we no
longer require the RenderNoError() method.
2020-11-11 15:05:04 +01:00
juander 606fc028ac Revert "d2ui/label: Refactor Render() to RenderNoError()"
This reverts commit f2a55312e4.

Since we removed the return of errors from the Render() method, we no
longer require the RenderNoError() method.
2020-11-11 15:01:36 +01:00
juander c148941194 d2ui/drawable: Refactor render() method to not return error
this simplifies error handling statements all over the ui code. Before
we had to write:

if err := foo.Render(target); err != nil {
    return err
}

which simplifies now to foo.Render(target)
2020-11-11 14:55:59 +01:00
M. Sz 60566b3b0d fixed lint errors 2020-11-10 15:09:25 +01:00
M. Sz 3e6ec4c1cc removed some unused lines 2020-11-10 15:00:40 +01:00
M. Sz a19d83ca7b fixed black screen in IPServer menu 2020-11-10 15:00:40 +01:00