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:
parent
039a96a077
commit
1afd86005e
|
@ -0,0 +1,7 @@
|
|||
root = true
|
||||
[*]
|
||||
end_of_line = lf
|
||||
insert_final_newline = true
|
||||
charset = utf-8
|
||||
indent_style = tab
|
||||
indent_size = 4
|
|
@ -1,6 +1,6 @@
|
|||
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
|
||||
type FileProvider interface {
|
||||
|
|
|
@ -4,7 +4,7 @@ import (
|
|||
"log"
|
||||
"strings"
|
||||
|
||||
"github.com/essial/OpenDiablo2/ResourcePaths"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/ResourcePaths"
|
||||
)
|
||||
|
||||
type LevelPresetRecord struct {
|
||||
|
|
|
@ -4,7 +4,7 @@ import (
|
|||
"log"
|
||||
"strings"
|
||||
|
||||
"github.com/essial/OpenDiablo2/ResourcePaths"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/ResourcePaths"
|
||||
)
|
||||
|
||||
type LevelTypeRecord struct {
|
||||
|
|
|
@ -4,7 +4,7 @@ import (
|
|||
"log"
|
||||
"strings"
|
||||
|
||||
"github.com/essial/OpenDiablo2/PaletteDefs"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/PaletteDefs"
|
||||
)
|
||||
|
||||
// PaletteRGB represents a color in a palette
|
||||
|
|
|
@ -4,7 +4,7 @@ import (
|
|||
"log"
|
||||
"strings"
|
||||
|
||||
"github.com/essial/OpenDiablo2/ResourcePaths"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/ResourcePaths"
|
||||
)
|
||||
|
||||
// SoundEntry represents a sound entry
|
||||
|
|
|
@ -4,7 +4,7 @@ import (
|
|||
"log"
|
||||
"strconv"
|
||||
|
||||
"github.com/essial/OpenDiablo2/ResourcePaths"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/ResourcePaths"
|
||||
)
|
||||
|
||||
type textDictionaryHashEntry struct {
|
||||
|
|
|
@ -32,7 +32,7 @@ package Compression
|
|||
import (
|
||||
"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)
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package Compression
|
||||
|
||||
import (
|
||||
"github.com/essial/OpenDiablo2/Common"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Common"
|
||||
)
|
||||
|
||||
var sLookup = []int{
|
||||
|
|
|
@ -10,15 +10,15 @@ import (
|
|||
"strings"
|
||||
"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/essial/OpenDiablo2/MPQ"
|
||||
"github.com/essial/OpenDiablo2/ResourcePaths"
|
||||
"github.com/essial/OpenDiablo2/Scenes"
|
||||
"github.com/essial/OpenDiablo2/UI"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Common"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/MPQ"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/ResourcePaths"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Scenes"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/UI"
|
||||
|
||||
"github.com/hajimehoshi/ebiten"
|
||||
"github.com/mitchellh/go-homedir"
|
||||
|
|
|
@ -8,7 +8,7 @@ import (
|
|||
"path"
|
||||
"strings"
|
||||
|
||||
"github.com/essial/OpenDiablo2/ResourcePaths"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/ResourcePaths"
|
||||
)
|
||||
|
||||
// MPQ represents an MPQ archive
|
||||
|
|
|
@ -9,8 +9,8 @@ import (
|
|||
"strings"
|
||||
|
||||
"github.com/JoshVarga/blast"
|
||||
"github.com/essial/OpenDiablo2/Common"
|
||||
"github.com/essial/OpenDiablo2/Compression"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Common"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Compression"
|
||||
)
|
||||
|
||||
// Stream represents a stream of data in an MPQ archive
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package Map
|
||||
|
||||
import (
|
||||
"github.com/essial/OpenDiablo2/Common"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Common"
|
||||
)
|
||||
|
||||
var dirLookup = []int32{
|
||||
|
|
|
@ -3,7 +3,7 @@ package Map
|
|||
import (
|
||||
"log"
|
||||
|
||||
"github.com/essial/OpenDiablo2/Common"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Common"
|
||||
)
|
||||
|
||||
// https://d2mods.info/forum/viewtopic.php?t=65163
|
||||
|
|
|
@ -4,8 +4,8 @@ import (
|
|||
"image"
|
||||
"math/rand"
|
||||
|
||||
"github.com/essial/OpenDiablo2/Common"
|
||||
"github.com/essial/OpenDiablo2/Sound"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Common"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Sound"
|
||||
"github.com/hajimehoshi/ebiten"
|
||||
)
|
||||
|
||||
|
|
|
@ -7,11 +7,11 @@ import (
|
|||
"math/rand"
|
||||
"strconv"
|
||||
|
||||
"github.com/essial/OpenDiablo2/PaletteDefs"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/PaletteDefs"
|
||||
|
||||
"github.com/hajimehoshi/ebiten"
|
||||
|
||||
"github.com/essial/OpenDiablo2/Common"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Common"
|
||||
)
|
||||
|
||||
type TileCacheRecord struct {
|
||||
|
|
10
README.md
10
README.md
|
@ -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)\
|
||||
[Development Live stream](https://www.twitch.tv/essial/)
|
||||
|
@ -19,9 +19,9 @@ ALL OTHER TRADEMARKS ARE THE PROPERTY OF THEIR RESPECTIVE OWNERS.
|
|||
|
||||
## 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.
|
||||
|
||||
|
@ -31,10 +31,10 @@ You can also open the root folder in VSCode. Make sure you have the `ms-vscode.g
|
|||
|
||||
## 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:
|
||||
```
|
||||
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!
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
package Scenes
|
||||
|
||||
import (
|
||||
"github.com/essial/OpenDiablo2/Common"
|
||||
"github.com/essial/OpenDiablo2/Video"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Common"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Video"
|
||||
"github.com/hajimehoshi/ebiten"
|
||||
)
|
||||
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
package Scenes
|
||||
|
||||
import (
|
||||
"github.com/essial/OpenDiablo2/Common"
|
||||
"github.com/essial/OpenDiablo2/PaletteDefs"
|
||||
"github.com/essial/OpenDiablo2/ResourcePaths"
|
||||
"github.com/essial/OpenDiablo2/Sound"
|
||||
"github.com/essial/OpenDiablo2/UI"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Common"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/PaletteDefs"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/ResourcePaths"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Sound"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/UI"
|
||||
"github.com/hajimehoshi/ebiten"
|
||||
)
|
||||
|
||||
|
|
|
@ -4,11 +4,11 @@ import (
|
|||
"image/color"
|
||||
"strings"
|
||||
|
||||
"github.com/essial/OpenDiablo2/Common"
|
||||
"github.com/essial/OpenDiablo2/PaletteDefs"
|
||||
"github.com/essial/OpenDiablo2/ResourcePaths"
|
||||
"github.com/essial/OpenDiablo2/Sound"
|
||||
"github.com/essial/OpenDiablo2/UI"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Common"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/PaletteDefs"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/ResourcePaths"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Sound"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/UI"
|
||||
"github.com/hajimehoshi/ebiten"
|
||||
)
|
||||
|
||||
|
|
|
@ -8,12 +8,12 @@ import (
|
|||
"os/exec"
|
||||
"runtime"
|
||||
|
||||
"github.com/essial/OpenDiablo2/Common"
|
||||
"github.com/essial/OpenDiablo2/PaletteDefs"
|
||||
"github.com/essial/OpenDiablo2/Sound"
|
||||
"github.com/essial/OpenDiablo2/UI"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Common"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/PaletteDefs"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Sound"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/UI"
|
||||
|
||||
"github.com/essial/OpenDiablo2/ResourcePaths"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/ResourcePaths"
|
||||
"github.com/hajimehoshi/ebiten"
|
||||
)
|
||||
|
||||
|
@ -199,7 +199,7 @@ func (v *MainMenu) onSinglePlayerClicked() {
|
|||
}
|
||||
|
||||
func (v *MainMenu) onGithubButtonClicked() {
|
||||
openbrowser("https://www.github.com/essial/OpenDiablo2")
|
||||
openbrowser("https://www.github.com/OpenDiablo2/OpenDiablo2")
|
||||
}
|
||||
|
||||
func (v *MainMenu) onExitButtonClicked() {
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
package Scenes
|
||||
|
||||
import (
|
||||
"github.com/essial/OpenDiablo2/Common"
|
||||
"github.com/essial/OpenDiablo2/Map"
|
||||
"github.com/essial/OpenDiablo2/Sound"
|
||||
"github.com/essial/OpenDiablo2/UI"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Common"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Map"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Sound"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/UI"
|
||||
"github.com/hajimehoshi/ebiten"
|
||||
)
|
||||
|
||||
|
|
|
@ -3,11 +3,11 @@ package Scenes
|
|||
import (
|
||||
"image"
|
||||
|
||||
"github.com/essial/OpenDiablo2/Common"
|
||||
"github.com/essial/OpenDiablo2/PaletteDefs"
|
||||
"github.com/essial/OpenDiablo2/ResourcePaths"
|
||||
"github.com/essial/OpenDiablo2/Sound"
|
||||
"github.com/essial/OpenDiablo2/UI"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Common"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/PaletteDefs"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/ResourcePaths"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Sound"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/UI"
|
||||
"github.com/hajimehoshi/ebiten"
|
||||
)
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ package Sound
|
|||
import (
|
||||
"log"
|
||||
|
||||
"github.com/essial/OpenDiablo2/Common"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Common"
|
||||
"github.com/hajimehoshi/ebiten/audio"
|
||||
"github.com/hajimehoshi/ebiten/audio/wav"
|
||||
)
|
||||
|
|
|
@ -5,7 +5,7 @@ import (
|
|||
|
||||
"github.com/hajimehoshi/ebiten/audio/wav"
|
||||
|
||||
"github.com/essial/OpenDiablo2/Common"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Common"
|
||||
|
||||
"github.com/hajimehoshi/ebiten/audio"
|
||||
)
|
||||
|
|
|
@ -4,9 +4,9 @@ import (
|
|||
"image"
|
||||
"image/color"
|
||||
|
||||
"github.com/essial/OpenDiablo2/Common"
|
||||
"github.com/essial/OpenDiablo2/PaletteDefs"
|
||||
"github.com/essial/OpenDiablo2/ResourcePaths"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Common"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/PaletteDefs"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/ResourcePaths"
|
||||
"github.com/hajimehoshi/ebiten"
|
||||
)
|
||||
|
||||
|
|
|
@ -4,8 +4,8 @@ import (
|
|||
"image/color"
|
||||
"strings"
|
||||
|
||||
"github.com/essial/OpenDiablo2/Common"
|
||||
"github.com/essial/OpenDiablo2/PaletteDefs"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Common"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/PaletteDefs"
|
||||
"github.com/hajimehoshi/ebiten"
|
||||
)
|
||||
|
||||
|
|
|
@ -3,8 +3,8 @@ package UI
|
|||
import (
|
||||
"image/color"
|
||||
|
||||
"github.com/essial/OpenDiablo2/Common"
|
||||
"github.com/essial/OpenDiablo2/PaletteDefs"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Common"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/PaletteDefs"
|
||||
"github.com/hajimehoshi/ebiten"
|
||||
)
|
||||
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
package UI
|
||||
|
||||
import (
|
||||
"github.com/essial/OpenDiablo2/Common"
|
||||
"github.com/essial/OpenDiablo2/PaletteDefs"
|
||||
"github.com/essial/OpenDiablo2/ResourcePaths"
|
||||
"github.com/essial/OpenDiablo2/Sound"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Common"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/PaletteDefs"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/ResourcePaths"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Sound"
|
||||
"github.com/hajimehoshi/ebiten"
|
||||
)
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package UI
|
||||
|
||||
import (
|
||||
"github.com/essial/OpenDiablo2/Common"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Common"
|
||||
)
|
||||
|
||||
// Widget defines an object that is a UI widget
|
||||
|
|
|
@ -3,7 +3,7 @@ package Video
|
|||
import (
|
||||
"log"
|
||||
|
||||
"github.com/essial/OpenDiablo2/Common"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Common"
|
||||
)
|
||||
|
||||
type BinkVideoMode uint32
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
OPENDIABLO 2
|
||||
<span>An open-source implementation of Diablo2</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>
|
||||
</h1>
|
||||
<div class="paragraph">
|
||||
|
|
2
go.mod
2
go.mod
|
@ -1,4 +1,4 @@
|
|||
module github.com/essial/OpenDiablo2
|
||||
module github.com/OpenDiablo2/OpenDiablo2
|
||||
|
||||
go 1.13
|
||||
|
||||
|
|
6
main.go
6
main.go
|
@ -6,10 +6,10 @@ import (
|
|||
|
||||
"github.com/hajimehoshi/ebiten/ebitenutil"
|
||||
|
||||
"github.com/essial/OpenDiablo2/Common"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Common"
|
||||
|
||||
"github.com/essial/OpenDiablo2/Core"
|
||||
"github.com/essial/OpenDiablo2/MPQ"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/Core"
|
||||
"github.com/OpenDiablo2/OpenDiablo2/MPQ"
|
||||
"github.com/hajimehoshi/ebiten"
|
||||
)
|
||||
|
||||
|
|
Loading…
Reference in New Issue