1
1
mirror of https://github.com/OpenDiablo2/OpenDiablo2 synced 2024-11-15 08:46:08 -05:00
Commit Graph

964 Commits

Author SHA1 Message Date
Tim Sarbin
0ef943a673
Merge pull request #952 from Ziemas/blendfix
Fix draweffect blending selection
2020-11-25 20:43:04 -05:00
Ziemas
31a21b50dd Fix draweffect blending selection
The blending mode picked by handleStateEffect was being overriden.

CompositeModeSourceOver is the default selection, we do not need to
initialise opts with this.
2020-11-26 02:35:10 +01:00
Tim Sarbin
31934b62c7
Merge pull request #950 from gucio321/hotfix
Hotfix: necromancer animation in select hero class menu
2020-11-25 19:32:09 -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
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
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
Tim Sarbin
b2a9477816
Merge pull request #947 from gucio321/square-button-types
Square button names
2020-11-23 20:18:15 -05:00
M. Sz
a3b82f036b added squelch button description 2020-11-23 18:28:11 +01:00
M. Sz
5e0b28c09e "fixed" lint error 2020-11-23 18:16:56 +01:00
M. Sz
569608295c fixed build errors 2020-11-23 18:07:51 +01:00
M. Sz
c9ad3741ae Fixed name error 2020-11-23 17:43:24 +01:00
M. Sz
b5fa294e07 Added button type cancel description 2020-11-23 17:41:32 +01:00
M. Sz
3a0895bfd1 Added button type cancel description 2020-11-23 17:41:01 +01:00
M. Sz
cf6761a50c Square button names 2020-11-23 15:35:10 +01:00
M. Sz
4bb305ea65 d2networking logger 2020-11-23 14:18:30 +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
gucio321
36c92dc433
resolved build errors (#939)
Co-authored-by: M. Sz <mszeptuch@protonmail.com>
2020-11-21 03:19:13 -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
Tim Sarbin
34f9538afb
Merge pull request #933 from ThomasChr/#865_save_mana
save player: level, health, mana, experience
2020-11-19 23:55:38 -05: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
Tim Sarbin
f6410f8961
Merge pull request #932 from gucio321/building
update build.sh
2020-11-18 09:39:39 -05:00
M. Sz
196627a283 fixed some errors 2020-11-18 09:13:16 +01:00
M. Sz
a2bfa92692 updated build script 2020-11-18 09:07:00 +01:00
Michał Mrówka
2a36c956a4
Label fix (#931) 2020-11-17 23:50:31 -08:00
gravestench
28a16a36e0
updating lint workflow (#930)
lint workflow had begun to throw errors because something was deprecated in the github action. this fixes that issue.
2020-11-17 00:30:04 -08:00
Tim Sarbin
cefea41810
Merge pull request #929 from PushUpek/charset_support
Added support for charset
2020-11-16 17:07:51 -05:00
Michał Mrówka
bbba67487d
Added support for charset 2020-11-16 21:39:48 +01:00
Tim Sarbin
9ab89a59d4
Merge pull request #927 from PushUpek/remove_lang_option
Remove language option from config file
2020-11-16 08:38:26 -05:00
Michał Mrówka
5d5e10f229
Remove language option from config file 2020-11-16 12:47:11 +01: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
gravestench
7a75dbc284
updating git workflow to use golangci-lint version 1.32 (#922) 2020-11-13 10:59:38 -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
Tim Sarbin
5b167df66d
Merge pull request #919 from gucio321/readme-update
readme screenshots update
2020-11-13 09:42:12 -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
M. Sz
ab7705e835 readme screenshots update 2020-11-13 11:37:47 +01:00