1
1
mirror of https://github.com/OpenDiablo2/OpenDiablo2 synced 2024-11-07 10:47:19 -05:00
Commit Graph

1085 Commits

Author SHA1 Message Date
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
570d71845e fixed build error 2020-11-26 11:50:00 +01:00
M. Sz
862951e440 code cleanup 2020-11-26 11:48:49 +01:00
M. Sz
1dcd63a238 fixed lint errors 2020-11-26 11:30:11 +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
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
M. Sz
6f6516ae33 a bit updated comments 2020-11-25 20:57:52 +01: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
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