Fixed import paths

This commit is contained in:
Essenceia 2018-07-05 20:25:34 +00:00
parent 8a772c3de1
commit c1b6305dba
14 changed files with 33 additions and 58 deletions

View File

@ -1,9 +0,0 @@
run:
./build_assets.sh
go run main.go
build_mac:
./build_mac.sh
build_assets:
./build_assets.sh

View File

@ -1,7 +1,7 @@
# ASharedJourney # ASharedJourney
This is a fork of a project originally developed during the SFR game jam along side Pierre, Gabriel, Aurore & Fabio. This is a fork of a project originally developed during the SFR game jam along side Pierre, Gabriel, Aurore & Fabio.
Original repo can be found [here](https://github.com/gandrin/ASharedJourney).
This project uses the go [pixel](https://github.com/faiface/pixel) package for sound management and sprites, go check them out. This project uses the go [pixel](https://github.com/faiface/pixel) package for sound management and sprites, go check them out.
@ -19,27 +19,13 @@ This project uses the go [pixel](https://github.com/faiface/pixel) package for s
## Building and running ## Building and running
### Installation - You will need the `go-bindata` program to build the assets into the binary file
- First, install the game and its dependencies
```bash
go get -u github.com/gandrin/ASharedJourney
```
- You will also need the `go-bindata` program to build the assets into the binary file
```bash ```bash
go get -u github.com/jteeuwen/go-bindata/... go get -u github.com/jteeuwen/go-bindata/...
``` ```
> Make sure your `$GOPATH` is set :wink: > Make sure your `$GOPATH` is set to the root of pixel :wink:
### Run
```
make run
```
### Releasing ### Releasing

View File

@ -4,7 +4,7 @@ import (
"log" "log"
"github.com/gandrin/ASharedJourney/shared" "github.com/faiface/pixel/examples/community/ASharedJourney/shared"
) )
//placeholder //placeholder

View File

@ -6,8 +6,8 @@ import (
"log" "log"
"time" "time"
"github.com/gandrin/ASharedJourney/mechanics" "github.com/faiface/pixel/examples/community/ASharedJourneymechanics"
"github.com/gandrin/ASharedJourney/shared" "github.com/faiface/pixel/examples/community/ASharedJourney/shared"
) )
type Animator struct { type Animator struct {

View File

@ -3,17 +3,16 @@ package main
import ( import (
"time" "time"
"github.com/gandrin/ASharedJourney/supervisor"
"github.com/faiface/pixel" "github.com/faiface/pixel"
"github.com/faiface/pixel/pixelgl" "github.com/faiface/pixel/pixelgl"
"github.com/gandrin/ASharedJourney/tiles" "github.com/faiface/pixel/examples/community/ASharedJourney/tiles"
"golang.org/x/image/colornames" "golang.org/x/image/colornames"
"github.com/gandrin/ASharedJourney/mechanics" "github.com/faiface/pixel/examples/community/ASharedJourney/mechanics"
"github.com/gandrin/ASharedJourney/menu" "github.com/faiface/pixel/examples/community/ASharedJourney/music"
"github.com/gandrin/ASharedJourney/music" "github.com/faiface/pixel/examples/community/ASharedJourney/shared"
"github.com/gandrin/ASharedJourney/shared" "github.com/faiface/pixel/examples/community/ASharedJourney/menu"
"github.com/faiface/pixel/examples/community/ASharedJourney/supervisor"
) )
const frameRate = 60 const frameRate = 60

View File

@ -6,12 +6,12 @@ import (
"log" "log"
"time" "time"
"github.com/gandrin/ASharedJourney/shared" "github.com/faiface/pixel/examples/community/ASharedJourney/shared"
"github.com/gandrin/ASharedJourney/supervisor" "github.com/faiface/pixel/examples/community/ASharedJourney/supervisor"
"github.com/gandrin/ASharedJourney/tiles" "github.com/faiface/pixel/examples/community/ASharedJourney/tiles"
"github.com/gandrin/ASharedJourney/menu" "github.com/faiface/pixel/examples/community/ASharedJourney/menu"
"github.com/faiface/pixel" "github.com/faiface/pixel"
"github.com/gandrin/ASharedJourney/music" "github.com/faiface/pixel/examples/community/ASharedJourney/music"
"image/color" "image/color"
) )

View File

@ -4,10 +4,10 @@ import (
"reflect" "reflect"
"github.com/faiface/pixel" "github.com/faiface/pixel"
"github.com/gandrin/ASharedJourney/menu" "github.com/faiface/pixel/examples/community/ASharedJourney/menu"
"github.com/gandrin/ASharedJourney/music" "github.com/faiface/pixel/examples/community/ASharedJourney/music"
"github.com/gandrin/ASharedJourney/supervisor" "github.com/faiface/pixel/examples/community/ASharedJourney/supervisor"
"github.com/gandrin/ASharedJourney/tiles" "github.com/faiface/pixel/examples/community/ASharedJourney/tiles"
) )
//move function receives as input the data from a player direction channel //move function receives as input the data from a player direction channel

View File

@ -7,13 +7,13 @@ import (
"log" "log"
"time" "time"
"github.com/gandrin/ASharedJourney/assets_manager" "github.com/faiface/pixel/examples/community/ASharedJourney/assets_manager"
"github.com/faiface/pixel" "github.com/faiface/pixel"
"github.com/faiface/pixel/pixelgl" "github.com/faiface/pixel/pixelgl"
"github.com/faiface/pixel/text" "github.com/faiface/pixel/text"
"github.com/gandrin/ASharedJourney/music" "github.com/faiface/pixel/examples/community/ASharedJourney/music"
"github.com/gandrin/ASharedJourney/shared" "github.com/faiface/pixel/examples/community/ASharedJourney/shared"
"golang.org/x/image/colornames" "golang.org/x/image/colornames"
"golang.org/x/image/font/basicfont" "golang.org/x/image/font/basicfont"
) )

View File

@ -7,7 +7,7 @@ import (
"path/filepath" "path/filepath"
"time" "time"
"github.com/gandrin/ASharedJourney/assets_manager" "github.com/faiface/pixel/examples/community/ASharedJourney/assets_manager"
"github.com/faiface/beep" "github.com/faiface/beep"
"github.com/faiface/beep/mp3" "github.com/faiface/beep/mp3"

View File

@ -2,7 +2,7 @@ package supervisor
import ( import (
"github.com/faiface/pixel" "github.com/faiface/pixel"
"github.com/gandrin/ASharedJourney/tiles" "github.com/faiface/pixel/examples/community/ASharedJourney/tiles"
) )
//call motion //call motion

View File

@ -4,7 +4,7 @@ import (
"log" "log"
"github.com/faiface/pixel/pixelgl" "github.com/faiface/pixel/pixelgl"
"github.com/gandrin/ASharedJourney/shared" "github.com/faiface/pixel/examples/community/ASharedJourney/shared"
) )
type Event string type Event string

View File

@ -4,7 +4,7 @@ package supervisor
import ( import (
"time" "time"
"github.com/gandrin/ASharedJourney/shared" "github.com/faiface/pixel/examples/community/ASharedJourney/shared"
) )
type PlayerDirections struct { type PlayerDirections struct {

View File

@ -2,7 +2,7 @@ package supervisor
import ( import (
"github.com/faiface/pixel/pixelgl" "github.com/faiface/pixel/pixelgl"
"github.com/gandrin/ASharedJourney/shared" "github.com/faiface/pixel/examples/community/ASharedJourney/shared"
) )
//transition Direction in x , y coordinates //transition Direction in x , y coordinates

View File

@ -7,11 +7,9 @@ import (
"image" "image"
"os" "os"
"github.com/gandrin/ASharedJourney/assets_manager" "github.com/faiface/pixel/examples/community/ASharedJourney/assets_manager"
tiled "github.com/lafriks/go-tiled" tiled "github.com/lafriks/go-tiled"
"github.com/gandrin/ASharedJourney/shared"
_ "image/png" _ "image/png"
"log" "log"
@ -20,8 +18,9 @@ import (
"github.com/faiface/pixel" "github.com/faiface/pixel"
"github.com/faiface/pixel/pixelgl" "github.com/faiface/pixel/pixelgl"
"github.com/gandrin/ASharedJourney/menu" "github.com/faiface/pixel/examples/community/ASharedJourney/menu"
"github.com/gandrin/ASharedJourney/music" "github.com/faiface/pixel/examples/community/ASharedJourney/music"
"github.com/faiface/pixel/examples/community/ASharedJourney/shared"
) )
// Level names // Level names