1
1
mirror of https://github.com/OpenDiablo2/OpenDiablo2 synced 2024-06-16 12:35:22 +00:00
Commit Graph

1146 Commits

Author SHA1 Message Date
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
Tim Sarbin
b936608651
Merge pull request #955 from gucio321/escape-menu
d2resource - escape menu labels
2020-11-29 16:57:18 -05:00
M. Sz
fa1e86acc3 added quest log items to d2resources and modified player movement speed 2020-11-29 17:08:46 +01: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
Tim Sarbin
b27f169c8a
Merge pull request #954 from gucio321/credits-color
colored credits
2020-11-27 11:46:45 -05:00
M. Sz
6a0512d0fe colored credits 2020-11-27 09:27:06 +01:00
Tim Sarbin
301a9698c8
Merge pull request #953 from gucio321/hotfix
Hotfix: minipanel bugs
2020-11-26 14:58:51 -05: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
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