gravestench
/
OpenDiablo2
mirror of https://github.com/OpenDiablo2/OpenDiablo2
1
1
Fork 0
Code Issues Releases Wiki Activity

Changes necessary for migration to org account (#67) 

* Replaced old repo path with org path.

* Added editorconfig. Fixed line endings to LF.

* Fixed travis build badge path
This commit is contained in:
Tim Sarbin 2019-11-02 17:38:39 -04:00 committed by GitHub
parent 039a96a077
commit 1afd86005e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 83 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.editorconfig Normal file
View File

@ -0,0 +1,7 @@
root = true
[*]
end_of_line = lf
insert_final_newline = true
charset = utf-8
indent_style = tab
indent_size = 4

2
Common/FileProvider.go
View File

@ -1,6 +1,6 @@
package Common package Common
import "github.com/essial/OpenDiablo2/PaletteDefs" import "github.com/OpenDiablo2/OpenDiablo2/PaletteDefs"
// FileProvider is an instance that can provide different types of files // FileProvider is an instance that can provide different types of files
type FileProvider interface { type FileProvider interface {

2
Common/LevelPresets.go
View File

@ -4,7 +4,7 @@ import (
"log" "log"
"strings" "strings"
"github.com/essial/OpenDiablo2/ResourcePaths" "github.com/OpenDiablo2/OpenDiablo2/ResourcePaths"
) )
type LevelPresetRecord struct { type LevelPresetRecord struct {

2
Common/LevelTypes.go
View File

@ -4,7 +4,7 @@ import (
"log" "log"
"strings" "strings"
"github.com/essial/OpenDiablo2/ResourcePaths" "github.com/OpenDiablo2/OpenDiablo2/ResourcePaths"
) )
type LevelTypeRecord struct { type LevelTypeRecord struct {

2
Common/Palette.go
View File

@ -4,7 +4,7 @@ import (
"log" "log"
"strings" "strings"
"github.com/essial/OpenDiablo2/PaletteDefs" "github.com/OpenDiablo2/OpenDiablo2/PaletteDefs"
) )
// PaletteRGB represents a color in a palette // PaletteRGB represents a color in a palette

2
Common/Sounds.go
View File

@ -4,7 +4,7 @@ import (
"log" "log"
"strings" "strings"
"github.com/essial/OpenDiablo2/ResourcePaths" "github.com/OpenDiablo2/OpenDiablo2/ResourcePaths"
) )
// SoundEntry represents a sound entry // SoundEntry represents a sound entry

2
Common/TextDictionary.go
View File

@ -4,7 +4,7 @@ import (
"log" "log"
"strconv" "strconv"
"github.com/essial/OpenDiablo2/ResourcePaths" "github.com/OpenDiablo2/OpenDiablo2/ResourcePaths"
) )
type textDictionaryHashEntry struct { type textDictionaryHashEntry struct {

2
Compression/Huffman.go
View File

@ -32,7 +32,7 @@ package Compression
import ( import (
"log" "log"
"github.com/essial/OpenDiablo2/Common" "github.com/OpenDiablo2/OpenDiablo2/Common"
) )
// linkedNode is a node which is both hierachcical (parent/child) and doubly linked (next/prev) // linkedNode is a node which is both hierachcical (parent/child) and doubly linked (next/prev)

2
Compression/Wav.go
View File

@ -1,7 +1,7 @@
package Compression package Compression
import ( import (
"github.com/essial/OpenDiablo2/Common" "github.com/OpenDiablo2/OpenDiablo2/Common"
) )
var sLookup = []int{ var sLookup = []int{

14
Core/Engine.go
View File

@ -10,15 +10,15 @@ import (
"strings" "strings"
"sync" "sync"
"github.com/essial/OpenDiablo2/PaletteDefs" "github.com/OpenDiablo2/OpenDiablo2/PaletteDefs"
"github.com/essial/OpenDiablo2/Sound" "github.com/OpenDiablo2/OpenDiablo2/Sound"
"github.com/essial/OpenDiablo2/Common" "github.com/OpenDiablo2/OpenDiablo2/Common"
"github.com/essial/OpenDiablo2/MPQ" "github.com/OpenDiablo2/OpenDiablo2/MPQ"
"github.com/essial/OpenDiablo2/ResourcePaths" "github.com/OpenDiablo2/OpenDiablo2/ResourcePaths"
"github.com/essial/OpenDiablo2/Scenes" "github.com/OpenDiablo2/OpenDiablo2/Scenes"
"github.com/essial/OpenDiablo2/UI" "github.com/OpenDiablo2/OpenDiablo2/UI"
"github.com/hajimehoshi/ebiten" "github.com/hajimehoshi/ebiten"
"github.com/mitchellh/go-homedir" "github.com/mitchellh/go-homedir"

2
MPQ/MPQ.go
View File

@ -8,7 +8,7 @@ import (
"path" "path"
"strings" "strings"
"github.com/essial/OpenDiablo2/ResourcePaths" "github.com/OpenDiablo2/OpenDiablo2/ResourcePaths"
) )
// MPQ represents an MPQ archive // MPQ represents an MPQ archive

4
MPQ/MPQStream.go
View File

@ -9,8 +9,8 @@ import (
"strings" "strings"
"github.com/JoshVarga/blast" "github.com/JoshVarga/blast"
"github.com/essial/OpenDiablo2/Common" "github.com/OpenDiablo2/OpenDiablo2/Common"
"github.com/essial/OpenDiablo2/Compression" "github.com/OpenDiablo2/OpenDiablo2/Compression"
) )
// Stream represents a stream of data in an MPQ archive // Stream represents a stream of data in an MPQ archive

2
Map/DS1.go
View File

@ -1,7 +1,7 @@
package Map package Map
import ( import (
"github.com/essial/OpenDiablo2/Common" "github.com/OpenDiablo2/OpenDiablo2/Common"
) )
var dirLookup = []int32{ var dirLookup = []int32{

2
Map/DT1.go
View File

@ -3,7 +3,7 @@ package Map
import ( import (
"log" "log"
"github.com/essial/OpenDiablo2/Common" "github.com/OpenDiablo2/OpenDiablo2/Common"
) )
// https://d2mods.info/forum/viewtopic.php?t=65163 // https://d2mods.info/forum/viewtopic.php?t=65163

4
Map/Engine.go
View File

@ -4,8 +4,8 @@ import (
"image" "image"
"math/rand" "math/rand"
"github.com/essial/OpenDiablo2/Common" "github.com/OpenDiablo2/OpenDiablo2/Common"
"github.com/essial/OpenDiablo2/Sound" "github.com/OpenDiablo2/OpenDiablo2/Sound"
"github.com/hajimehoshi/ebiten" "github.com/hajimehoshi/ebiten"
) )

4
Map/Region.go
View File

@ -7,11 +7,11 @@ import (
"math/rand" "math/rand"
"strconv" "strconv"
"github.com/essial/OpenDiablo2/PaletteDefs" "github.com/OpenDiablo2/OpenDiablo2/PaletteDefs"
"github.com/hajimehoshi/ebiten" "github.com/hajimehoshi/ebiten"
"github.com/essial/OpenDiablo2/Common" "github.com/OpenDiablo2/OpenDiablo2/Common"
) )
type TileCacheRecord struct { type TileCacheRecord struct {

10
README.md
View File

@ -1,4 +1,4 @@
# OpenDiablo2 [![Build Status](https://travis-ci.org/essial/OpenDiablo2.svg?branch=dev)](https://travis-ci.org/essial/OpenDiablo2) # OpenDiablo2 [![Build Status](https://travis-ci.org/OpenDiablo2/OpenDiablo2.svg?branch=master)](https://travis-ci.org/OpenDiablo2/OpenDiablo2)
[Join us on Discord!](https://discord.gg/pRy8tdc)\ [Join us on Discord!](https://discord.gg/pRy8tdc)\
[Development Live stream](https://www.twitch.tv/essial/) [Development Live stream](https://www.twitch.tv/essial/)
@ -19,9 +19,9 @@ ALL OTHER TRADEMARKS ARE THE PROPERTY OF THEIR RESPECTIVE OWNERS.
## Building ## Building
To pull the project down, run `go get https://github.com/essial/OpenDiablo2` To pull the project down, run `go get https://github.com/OpenDiablo2/OpenDiablo2`
On windows this folder will most likely be in `C:\\users\\(you)\\go\\src\\github.com\\essial\\OpenDiablo2` On windows this folder will most likely be in `C:\users\(you)\go\src\github.com\essial\OpenDiablo2`
In the root folder, run `go get -d` to pull down all dependencies. In the root folder, run `go get -d` to pull down all dependencies.
@ -31,10 +31,10 @@ You can also open the root folder in VSCode. Make sure you have the `ms-vscode.g
## Contributing ## Contributing
The imports for this project utilize `github.com/essial/OpenDiablo2`. This means that even if you clone the repo, changes will not be taken as it will The imports for this project utilize `github.com/OpenDiablo2/OpenDiablo2`. This means that even if you clone the repo, changes will not be taken as it will
still pull from the main repo's files. In order to use your local version, add the following to `go.mod` in the base folder: still pull from the main repo's files. In order to use your local version, add the following to `go.mod` in the base folder:
``` ```
replace github.com/essial/OpenDiablo2 => /your/forked/import/path replace github.com/OpenDiablo2/OpenDiablo2 => /your/forked/import/path
``` ```
This will tell go to use your local path instead of the official repo. Be sure to exclude this change from your pull requests! This will tell go to use your local path instead of the official repo. Be sure to exclude this change from your pull requests!

4
Scenes/BlizzardIntro.go
View File

@ -1,8 +1,8 @@
package Scenes package Scenes
import ( import (
"github.com/essial/OpenDiablo2/Common" "github.com/OpenDiablo2/OpenDiablo2/Common"
"github.com/essial/OpenDiablo2/Video" "github.com/OpenDiablo2/OpenDiablo2/Video"
"github.com/hajimehoshi/ebiten" "github.com/hajimehoshi/ebiten"
) )

10
Scenes/CharacterSelect.go
View File

@ -1,11 +1,11 @@
package Scenes package Scenes
import ( import (
"github.com/essial/OpenDiablo2/Common" "github.com/OpenDiablo2/OpenDiablo2/Common"
"github.com/essial/OpenDiablo2/PaletteDefs" "github.com/OpenDiablo2/OpenDiablo2/PaletteDefs"
"github.com/essial/OpenDiablo2/ResourcePaths" "github.com/OpenDiablo2/OpenDiablo2/ResourcePaths"
"github.com/essial/OpenDiablo2/Sound" "github.com/OpenDiablo2/OpenDiablo2/Sound"
"github.com/essial/OpenDiablo2/UI" "github.com/OpenDiablo2/OpenDiablo2/UI"
"github.com/hajimehoshi/ebiten" "github.com/hajimehoshi/ebiten"
) )

10
Scenes/Credits.go
View File

@ -4,11 +4,11 @@ import (
"image/color" "image/color"
"strings" "strings"
"github.com/essial/OpenDiablo2/Common" "github.com/OpenDiablo2/OpenDiablo2/Common"
"github.com/essial/OpenDiablo2/PaletteDefs" "github.com/OpenDiablo2/OpenDiablo2/PaletteDefs"
"github.com/essial/OpenDiablo2/ResourcePaths" "github.com/OpenDiablo2/OpenDiablo2/ResourcePaths"
"github.com/essial/OpenDiablo2/Sound" "github.com/OpenDiablo2/OpenDiablo2/Sound"
"github.com/essial/OpenDiablo2/UI" "github.com/OpenDiablo2/OpenDiablo2/UI"
"github.com/hajimehoshi/ebiten" "github.com/hajimehoshi/ebiten"
) )

12
Scenes/MainMenu.go
View File

@ -8,12 +8,12 @@ import (
"os/exec" "os/exec"
"runtime" "runtime"
"github.com/essial/OpenDiablo2/Common" "github.com/OpenDiablo2/OpenDiablo2/Common"
"github.com/essial/OpenDiablo2/PaletteDefs" "github.com/OpenDiablo2/OpenDiablo2/PaletteDefs"
"github.com/essial/OpenDiablo2/Sound" "github.com/OpenDiablo2/OpenDiablo2/Sound"
"github.com/essial/OpenDiablo2/UI" "github.com/OpenDiablo2/OpenDiablo2/UI"
"github.com/essial/OpenDiablo2/ResourcePaths" "github.com/OpenDiablo2/OpenDiablo2/ResourcePaths"
"github.com/hajimehoshi/ebiten" "github.com/hajimehoshi/ebiten"
) )
@ -199,7 +199,7 @@ func (v *MainMenu) onSinglePlayerClicked() {
} }
func (v *MainMenu) onGithubButtonClicked() { func (v *MainMenu) onGithubButtonClicked() {
openbrowser("https://www.github.com/essial/OpenDiablo2") openbrowser("https://www.github.com/OpenDiablo2/OpenDiablo2")
} }
func (v *MainMenu) onExitButtonClicked() { func (v *MainMenu) onExitButtonClicked() {

8
Scenes/MapEngineTest.go
View File

@ -1,10 +1,10 @@
package Scenes package Scenes
import ( import (
"github.com/essial/OpenDiablo2/Common" "github.com/OpenDiablo2/OpenDiablo2/Common"
"github.com/essial/OpenDiablo2/Map" "github.com/OpenDiablo2/OpenDiablo2/Map"
"github.com/essial/OpenDiablo2/Sound" "github.com/OpenDiablo2/OpenDiablo2/Sound"
"github.com/essial/OpenDiablo2/UI" "github.com/OpenDiablo2/OpenDiablo2/UI"
"github.com/hajimehoshi/ebiten" "github.com/hajimehoshi/ebiten"
) )

10
Scenes/SelectHeroClass.go
View File

@ -3,11 +3,11 @@ package Scenes
import ( import (
"image" "image"
"github.com/essial/OpenDiablo2/Common" "github.com/OpenDiablo2/OpenDiablo2/Common"
"github.com/essial/OpenDiablo2/PaletteDefs" "github.com/OpenDiablo2/OpenDiablo2/PaletteDefs"
"github.com/essial/OpenDiablo2/ResourcePaths" "github.com/OpenDiablo2/OpenDiablo2/ResourcePaths"
"github.com/essial/OpenDiablo2/Sound" "github.com/OpenDiablo2/OpenDiablo2/Sound"
"github.com/essial/OpenDiablo2/UI" "github.com/OpenDiablo2/OpenDiablo2/UI"
"github.com/hajimehoshi/ebiten" "github.com/hajimehoshi/ebiten"
) )

2
Sound/AudioProvider.go
View File

@ -3,7 +3,7 @@ package Sound
import ( import (
"log" "log"
"github.com/essial/OpenDiablo2/Common" "github.com/OpenDiablo2/OpenDiablo2/Common"
"github.com/hajimehoshi/ebiten/audio" "github.com/hajimehoshi/ebiten/audio"
"github.com/hajimehoshi/ebiten/audio/wav" "github.com/hajimehoshi/ebiten/audio/wav"
) )

2
Sound/SoundEffect.go
View File

@ -5,7 +5,7 @@ import (
"github.com/hajimehoshi/ebiten/audio/wav" "github.com/hajimehoshi/ebiten/audio/wav"
"github.com/essial/OpenDiablo2/Common" "github.com/OpenDiablo2/OpenDiablo2/Common"
"github.com/hajimehoshi/ebiten/audio" "github.com/hajimehoshi/ebiten/audio"
) )

6
UI/Button.go
View File

@ -4,9 +4,9 @@ import (
"image" "image"
"image/color" "image/color"
"github.com/essial/OpenDiablo2/Common" "github.com/OpenDiablo2/OpenDiablo2/Common"
"github.com/essial/OpenDiablo2/PaletteDefs" "github.com/OpenDiablo2/OpenDiablo2/PaletteDefs"
"github.com/essial/OpenDiablo2/ResourcePaths" "github.com/OpenDiablo2/OpenDiablo2/ResourcePaths"
"github.com/hajimehoshi/ebiten" "github.com/hajimehoshi/ebiten"
) )

4
UI/Font.go
View File

@ -4,8 +4,8 @@ import (
"image/color" "image/color"
"strings" "strings"
"github.com/essial/OpenDiablo2/Common" "github.com/OpenDiablo2/OpenDiablo2/Common"
"github.com/essial/OpenDiablo2/PaletteDefs" "github.com/OpenDiablo2/OpenDiablo2/PaletteDefs"
"github.com/hajimehoshi/ebiten" "github.com/hajimehoshi/ebiten"
) )

4
UI/Label.go
View File

@ -3,8 +3,8 @@ package UI
import ( import (
"image/color" "image/color"
"github.com/essial/OpenDiablo2/Common" "github.com/OpenDiablo2/OpenDiablo2/Common"
"github.com/essial/OpenDiablo2/PaletteDefs" "github.com/OpenDiablo2/OpenDiablo2/PaletteDefs"
"github.com/hajimehoshi/ebiten" "github.com/hajimehoshi/ebiten"
) )

8
UI/Manager.go
View File

@ -1,10 +1,10 @@
package UI package UI
import ( import (
"github.com/essial/OpenDiablo2/Common" "github.com/OpenDiablo2/OpenDiablo2/Common"
"github.com/essial/OpenDiablo2/PaletteDefs" "github.com/OpenDiablo2/OpenDiablo2/PaletteDefs"
"github.com/essial/OpenDiablo2/ResourcePaths" "github.com/OpenDiablo2/OpenDiablo2/ResourcePaths"
"github.com/essial/OpenDiablo2/Sound" "github.com/OpenDiablo2/OpenDiablo2/Sound"
"github.com/hajimehoshi/ebiten" "github.com/hajimehoshi/ebiten"
) )

2
UI/Widget.go
View File

@ -1,7 +1,7 @@
package UI package UI
import ( import (
"github.com/essial/OpenDiablo2/Common" "github.com/OpenDiablo2/OpenDiablo2/Common"
) )
// Widget defines an object that is a UI widget // Widget defines an object that is a UI widget

2
Video/BinkDecoder.go
View File

@ -3,7 +3,7 @@ package Video
import ( import (
"log" "log"
"github.com/essial/OpenDiablo2/Common" "github.com/OpenDiablo2/OpenDiablo2/Common"
) )
type BinkVideoMode uint32 type BinkVideoMode uint32

2
docs/index.html
View File

@ -23,7 +23,7 @@
OPENDIABLO 2 OPENDIABLO 2
<span>An open-source implementation of Diablo2</span> <span>An open-source implementation of Diablo2</span>
<span> <span>
<a href="https://www.github.com/essial/OpenDiablo2" target="_blank">Github Project Page</a> <a href="https://www.github.com/OpenDiablo2" target="_blank">Github Organization Page</a>
</span> </span>
</h1> </h1>
<div class="paragraph"> <div class="paragraph">

2
go.mod
View File

@ -1,4 +1,4 @@
module github.com/essial/OpenDiablo2 module github.com/OpenDiablo2/OpenDiablo2
go 1.13 go 1.13

6
main.go
View File

@ -6,10 +6,10 @@ import (
"github.com/hajimehoshi/ebiten/ebitenutil" "github.com/hajimehoshi/ebiten/ebitenutil"
"github.com/essial/OpenDiablo2/Common" "github.com/OpenDiablo2/OpenDiablo2/Common"
"github.com/essial/OpenDiablo2/Core" "github.com/OpenDiablo2/OpenDiablo2/Core"
"github.com/essial/OpenDiablo2/MPQ" "github.com/OpenDiablo2/OpenDiablo2/MPQ"
"github.com/hajimehoshi/ebiten" "github.com/hajimehoshi/ebiten"
) )