Commit Graph

1173 Commits

Author SHA1 Message Date
gravestench 1409166bf0
Merge pull request #1026 from gravestench/ecs
merge upstream master into ecs branch
2021-01-11 04:32:51 +00:00
gravestench 48cefd5aef Merge branch 'master' of http://github.com/OpenDiablo2/OpenDiablo2 into ecs 2021-01-10 20:24:23 -08:00
gravestench 5a8ba5dee7
Merge pull request #1025 from essial/master
Fixed various bugs, crashes, and slowdowns.
2021-01-10 09:17:18 +00:00
Tim Sarbin c99810ad0e Fixed various bugs, crashes, and slowdowns. 2021-01-10 02:44:42 -05:00
gravestench 31d8343fd6
Merge pull request #1023 from ianling/ecs
Backmerge master into ecs
2021-01-09 20:13:07 +00:00
Ian Ling 8ad9444da4 Merge master into ecs branch, fix merge conflicts 2021-01-09 01:13:29 -08:00
gravestench 99c7e2e754
Revert "Backmerge master into ecs (#1021)" (#1022)
This reverts commit 9121209f86.
2021-01-09 00:52:06 -08:00
Ian 9121209f86
Backmerge master into ecs (#1021)
* quest log disabled icon

* removed unused functions for text colorizing

* terminal printing

* fixed saving key change bug

* help overlay text

* removed unused issue comments

* Update Ebiten to v2.0.2

* changed terminal color separator & changed logLevelNone to logLevelDefault in app.go

* status and screens update

* quest animation initial.

* escape menu hotkeys

* hero save file

* add-buttons init

* add-buttons actions

* stats changing: hero stats panel

* skill tre - remaining points label

* revert:hero save file (app.go)

* escape menu hotkeys

* hero save file

* updated d2hero.HeroStatsState

* corrected grammar errors

* animation is played and last frame is completedFrame

* animation stops playing, when quest log is closed & quest socket gets highlighted, when animation is playing & fixed highlight bug

* fixed quest descr bug & added code description

* level-up buttons tooltips

* Replaced kingping with flag package

* Cleanup d2records logging

* Renamed CharStatRecord

* Renamed SoundDetailRecord

* Renamed MonStatRecord

* Renamed ObjectDetailRecord

* Renamed MonStat2Record

* fixed onHover bug in d2ui.Sprite (#992)

Co-authored-by: M. Sz <mszeptuch@protonmail.com>

* added static checks to d2ui (#990)

Co-authored-by: M. Sz <mszeptuch@protonmail.com>

* fixed onHover bug in d2ui.Label (#991)

Co-authored-by: M. Sz <mszeptuch@protonmail.com>

* Revert "fixed onHover bug in d2ui.Sprite"

This reverts commit 8b557062fb.

* tip-labels in tcpip menu

* skill select menu dependencies (when we open skillselect menu, other panels are closed)

* Cleaned up d2term

* A wild } appeared

* Fixed linter issues

* ckecked value of italian modifier

* game-controls refactor

* fixed build and lint errors

* removed unnecessary switch-case statments from onKeyUp and onEscKey

* fixed bug with terminal's logLevel

* Refactor StreamWriter

* Refactor StreamReader

* Fixed gocritic linter issues

* Reduce GetTiles slice allocation

* Networking bugfixes and cleanup

Make sure connections close properly, without weird error messages
Remove player map entity when a player disconnects from a multiplayer game
Close server properly when host disconnects, handle ServerClose on remote clients
Don't mix JSON decoders and raw TCP writes
Actually handle incoming packets from remote clients
General code cleanup for simplicity and consistency

* Switched to self hosted build agent

* Removed PR requirement for action

* remove build job requirement

* Fiddling with actions names

* Updated workflows

* Fix yaml errors

* Yet another yaml fix

* Removed improper ebiten dependency in d2interface.

* Add checkboxes, checkbox test scene

* Render HUD before Panels (in this Case 'Panels' only does mean Inventory Panel). This is to avoid Entity Labels to be renderd above the Inventory Panel. Fixes #936

* This DCC frame size calculation seems useless

TBH there some to be some other overcomplicated things going on in
DCCAnimation but too tired to use brain right now.

* De-lint ecs branch

* bugfix: file_handle_resolver

* Add boot state to scenes, fix loading screen scene

* added label-button widget (#989)

Co-authored-by: M. Sz <mszeptuch@protonmail.com>

* removed links to closed issues from code (#1005)

Co-authored-by: M. Sz <mszeptuch@protonmail.com>
Co-authored-by: gravestench <dknuth0101@gmail.com>

* removed unused fields from d2player.GameControl.actionableRegions (#997)

Co-authored-by: M. Sz <mszeptuch@protonmail.com>
Co-authored-by: gravestench <dknuth0101@gmail.com>

* d2ui.Frame refactor (#994)

* d2ui.Frame refactor

* removed unneccessery d2asset.AssetManager argument from d2ui.NewUIFrame

* d2ui.Frame refactor

* removed unneccessery d2asset.AssetManager argument from d2ui.NewUIFrame

Co-authored-by: M. Sz <mszeptuch@protonmail.com>
Co-authored-by: Tim Sarbin <tim.sarbin@gmail.com>
Co-authored-by: gravestench <dknuth0101@gmail.com>

* d2mpq refactored (#1020)

* d2mpq refactor

* d2mpq refactor last standing lint error

* d2mpq refactor: less linter noise

* d2mpq refactor: more linter issues

Co-authored-by: M. Sz <mszeptuch@protonmail.com>
Co-authored-by: Tim Sarbin <tim.sarbin@gmail.com>
Co-authored-by: Hajime Hoshi <hajimehoshi@gmail.com>
Co-authored-by: gucio321 <73652197+gucio321@users.noreply.github.com>
Co-authored-by: Intyre <intyre@gmail.com>
Co-authored-by: ThomasChr <thomaschristlieb@hotmail.com>
Co-authored-by: Ziemas <ziemas@ziemas.se>
Co-authored-by: gravestench <dknuth0101@gmail.com>
2021-01-09 00:25:44 -08:00
Ian Ling 7980de3fa3 Merge branch 'ecs' of github.com:ianling/OpenDiablo2 into ecs 2021-01-08 23:00:01 -08:00
Ian Ling c019476d08 Merge master into ecs 2021-01-08 22:56:41 -08:00
Ian Ling 1cd45cf939 Merge master into ecs 2021-01-08 22:43:45 -08:00
Intyre db83814527
d2mpq refactored (#1020)
* d2mpq refactor

* d2mpq refactor last standing lint error

* d2mpq refactor: less linter noise

* d2mpq refactor: more linter issues
2021-01-08 12:46:11 -08:00
gucio321 5cd404e4a5
d2ui.Frame refactor (#994)
* d2ui.Frame refactor

* removed unneccessery d2asset.AssetManager argument from d2ui.NewUIFrame

* d2ui.Frame refactor

* removed unneccessery d2asset.AssetManager argument from d2ui.NewUIFrame

Co-authored-by: M. Sz <mszeptuch@protonmail.com>
Co-authored-by: Tim Sarbin <tim.sarbin@gmail.com>
Co-authored-by: gravestench <dknuth0101@gmail.com>
2021-01-06 21:53:01 -08:00
gucio321 0e95fd44ce
removed unused fields from d2player.GameControl.actionableRegions (#997)
Co-authored-by: M. Sz <mszeptuch@protonmail.com>
Co-authored-by: gravestench <dknuth0101@gmail.com>
2021-01-06 21:51:36 -08:00
gucio321 6addf7a243
removed links to closed issues from code (#1005)
Co-authored-by: M. Sz <mszeptuch@protonmail.com>
Co-authored-by: gravestench <dknuth0101@gmail.com>
2021-01-06 21:48:12 -08:00
gucio321 b77d793698
added label-button widget (#989)
Co-authored-by: M. Sz <mszeptuch@protonmail.com>
2021-01-06 21:45:05 -08:00
Ian Ling 164d8c93d0 Add boot state to scenes, fix loading screen scene 2021-01-04 01:17:52 -08:00
Ian 0dee6518b4
WIP: Add checkboxes, de-lint ecs branch (#1017)
* Add checkboxes, checkbox test scene

* De-lint ecs branch
2021-01-04 00:43:56 -08:00
Ian 5bc16d336a
Merge pull request #1 from gravestench/ecs-linted
bugfix: file_handle_resolver
2021-01-04 00:42:14 -08:00
gravestench a1e858b4df bugfix: file_handle_resolver 2021-01-04 00:35:49 -08:00
Ian Ling 03855960cd De-lint ecs branch 2021-01-03 12:48:16 -08:00
Tim Sarbin 68d2486fbb
Merge pull request #1016 from Ziemas/useless_dcc_math
This DCC frame size calculation seems useless
2021-01-01 20:03:28 -05:00
Tim Sarbin 9a1e8c67a9
Merge branch 'master' into useless_dcc_math 2021-01-01 20:02:19 -05:00
Tim Sarbin 594d65ea25
Merge pull request #1015 from ThomasChr/npc_label_above_inventory_fix
Render HUD before Panels
2021-01-01 20:00:28 -05:00
Ziemas 826b1224f6 This DCC frame size calculation seems useless
TBH there some to be some other overcomplicated things going on in
DCCAnimation but too tired to use brain right now.
2021-01-02 01:56:09 +01:00
ThomasChr db87175872 Render HUD before Panels (in this Case 'Panels' only does mean Inventory Panel). This is to avoid Entity Labels to be renderd above the Inventory Panel. Fixes #936 2021-01-01 20:49:49 +01:00
Ian Ling 0cf47b9b57 Add checkboxes, checkbox test scene 2020-12-31 20:07:51 -08:00
Tim Sarbin 17fe8f3277
Merge pull request #1014 from essial/master
Removed improper ebiten dependency in d2interface.
2020-12-30 02:12:34 -05:00
Tim Sarbin 92989d6d7a Removed improper ebiten dependency in d2interface. 2020-12-30 02:08:32 -05:00
Tim Sarbin ad1decc813
Merge pull request #1013 from essial/master
Yet another yaml fix
2020-12-29 15:31:05 -05:00
Tim Sarbin d18243102b Yet another yaml fix 2020-12-29 15:29:15 -05:00
Tim Sarbin a4db59931c
Merge pull request #1012 from essial/master
Fix yaml errors
2020-12-29 15:25:23 -05:00
Tim Sarbin 23f05752b3 Fix yaml errors 2020-12-29 15:24:17 -05:00
Tim Sarbin 72f34ea14e
Merge pull request #1011 from essial/master
Fiddling with actions names
2020-12-29 15:21:57 -05:00
Tim Sarbin b18936eed0 Updated workflows 2020-12-29 15:20:24 -05:00
Tim Sarbin edd0cb0aae Fiddling with actions names 2020-12-29 15:16:18 -05:00
Tim Sarbin 2a3b5b143a
Merge pull request #1010 from essial/master
remove build job requirement
2020-12-29 15:11:00 -05:00
Tim Sarbin 97a2923b25 remove build job requirement 2020-12-29 15:05:48 -05:00
Tim Sarbin c8723656c1
Merge pull request #1009 from essial/master
Switched to self hosted build agent
2020-12-29 15:04:02 -05:00
Tim Sarbin 15729b8691 Removed PR requirement for action 2020-12-29 15:01:40 -05:00
Tim Sarbin 936b3d5de5 Switched to self hosted build agent 2020-12-29 11:05:52 -05:00
Tim Sarbin 427170e2e8
Merge pull request #1001 from gucio321/game-control-refactor
Game control refactor
2020-12-28 20:27:33 -05:00
Tim Sarbin 4b870de39e
Merge pull request #1008 from ianling/master
Networking bugfixes and cleanup
2020-12-28 20:26:43 -05:00
Ian Ling 3936e01afb Networking bugfixes and cleanup
Make sure connections close properly, without weird error messages
Remove player map entity when a player disconnects from a multiplayer game
Close server properly when host disconnects, handle ServerClose on remote clients
Don't mix JSON decoders and raw TCP writes
Actually handle incoming packets from remote clients
General code cleanup for simplicity and consistency
2020-12-28 13:33:17 -08:00
Tim Sarbin f3a869c2be
Merge pull request #1006 from Intyre/engine
Reduce GetTiles slice allocation
2020-12-23 22:32:50 -05:00
Intyre 9ce9c2f848 Reduce GetTiles slice allocation 2020-12-23 22:03:57 +01:00
Tim Sarbin a8ebddb917
Merge pull request #1004 from Intyre/linter
Fixed gocritic linter issues
2020-12-23 15:44:11 -05:00
Tim Sarbin 49c54c5fae
Merge pull request #1003 from Intyre/d2datautils
Refactored Stream Writer and Reader
2020-12-23 15:43:20 -05:00
Intyre 5f9e06c09c Fixed gocritic linter issues 2020-12-23 11:02:58 +01:00
Intyre 1e91df996c Refactor StreamReader 2020-12-23 10:43:33 +01:00