Skip to content

Commit 29510d1

Browse files
xushiweixushiwei
authored
Merge pull request #755 from goplus/main
v1.1.2
2 parents 1ac28b8 + bf1ae62 commit 29510d1

42 files changed

Lines changed: 121 additions & 84 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ game.txt
66
go.work
77
go.json
88
gop.json
9-
gop_autogen.go
9+
gop_autogen*.go
10+
xgo_autogen*.go
1011
_gsc
1112
_test
1213
haiyang/

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@ spx - A Scratch Compatible 2D Game Engine
44
[![Build Status](https://github.com/goplus/spx/actions/workflows/go.yml/badge.svg)](https://github.com/goplus/spx/actions/workflows/go.yml)
55
[![Go Report Card](https://goreportcard.com/badge/github.com/goplus/spx)](https://goreportcard.com/report/github.com/goplus/spx)
66
[![GitHub release](https://img.shields.io/github/v/tag/goplus/spx.svg?label=release)](https://github.com/goplus/spx/releases)
7-
[![Language](https://img.shields.io/badge/language-Go+-blue.svg)](https://github.com/goplus/gop)
7+
[![Language](https://img.shields.io/badge/language-XGo-blue.svg)](https://github.com/goplus/xgo)
88
[![Scratch diff](https://img.shields.io/badge/compare-Scratch-green.svg)](https://github.com/xushiwei/goplus-spx-vs-scratch/blob/main/scratch-vs-spx-v1.0.0-beta3.pdf)
99

1010
## How to build
1111

12-
How to run games powered by Go+ spx engine?
12+
How to run games powered by XGo spx engine?
1313

14-
* Download Go+ and build it. See https://github.com/goplus/gop#how-to-build.
14+
* Download XGo and build it. See https://github.com/goplus/xgo?tab=readme-ov-file#how-to-install.
1515
* Download spx and build it.
1616
* git clone `https://github.com/goplus/spx.git`
1717
* cd spx
1818
* go install -v ./...
1919
* Build a game and run.
2020
* cd `game-root-dir`
21-
* gop run .
21+
* xgo run .
2222

2323

2424
## Games powered by spx
@@ -169,7 +169,7 @@ var (
169169
gid int
170170
)
171171

172-
run "res", {Title: "Clone and Destory (by Go+)"}
172+
run "res", {Title: "Clone and Destory (by XGo)"}
173173
```
174174

175175
All these three variables in [main.spx](tutorial/03-Clone/main.spx) are shared by all sprites. `Arrow` and `Calf` are sprites that exist in this project. `gid` means `global id`. It is used to allocate id for all cloned `Calf` sprites.

‎audio.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2021 The GoPlus Authors (goplus.org). All rights reserved.
2+
* Copyright (c) 2021 The XGo Authors (xgo.dev). All rights reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎camera.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2021 The GoPlus Authors (goplus.org). All rights reserved.
2+
* Copyright (c) 2021 The XGo Authors (xgo.dev). All rights reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2024 The GoPlus Authors (goplus.org). All rights reserved.
2+
* Copyright (c) 2024 The XGo Authors (xgo.dev). All rights reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎event.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2021 The GoPlus Authors (goplus.org). All rights reserved.
2+
* Copyright (c) 2021 The XGo Authors (xgo.dev). All rights reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎fs/asset/asset_mobile.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// +build android ios
33

44
/*
5-
* Copyright (c) 2021 The GoPlus Authors (goplus.org). All rights reserved.
5+
* Copyright (c) 2021 The XGo Authors (xgo.dev). All rights reserved.
66
*
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.

‎fs/asset/asset_others.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// +build !android,!ios
33

44
/*
5-
* Copyright (c) 2021 The GoPlus Authors (goplus.org). All rights reserved.
5+
* Copyright (c) 2021 The XGo Authors (xgo.dev). All rights reserved.
66
*
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.

‎fs/asset/localfs.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2021 The GoPlus Authors (goplus.org). All rights reserved.
2+
* Copyright (c) 2021 The XGo Authors (xgo.dev). All rights reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎fs/fs.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2021 The GoPlus Authors (goplus.org). All rights reserved.
2+
* Copyright (c) 2021 The XGo Authors (xgo.dev). All rights reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)