Skip to content

Commit d0d9a4b

Browse files
authored
Merge pull request #1550 from heinezen/legacy-remove
Remove legacy subsystem code
2 parents 682aa64 + 10bc91d commit d0d9a4b

File tree

429 files changed

+2343
-36333
lines changed

Some content is hidden

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

429 files changed

+2343
-36333
lines changed

.github/workflows/macosx-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- name: Install environment helpers with homebrew
6060
run: brew install ccache
6161
- name: Install dependencies with homebrew
62-
run: brew install libepoxy freetype fontconfig harfbuzz sdl2 sdl2_image opus opusfile qt6 libogg libpng toml11 eigen
62+
run: brew install libepoxy freetype fontconfig harfbuzz opus opusfile qt6 libogg libpng toml11 eigen
6363
- name: Install nyan dependencies with homebrew
6464
run: brew install flex make
6565
- name: Install python3 packages

.github/workflows/ubuntu-22.04.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
run: mkdir -p /tmp/image
3333
shell: bash
3434
- name: Download devenv image
35-
uses: actions/download-artifact@v2
35+
uses: actions/download-artifact@v3
3636
with:
3737
name: devenv-image-compressed.tar.gz
3838
path: '/tmp/image'

.github/workflows/windows-server-2019.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
mkdir download
2525
cd download
2626
$zipfile = "openage-dep-x64-windows.zip"
27-
Invoke-WebRequest https://github.com/SFTtech/openage-dependencies/releases/download/v0.5.0/openage-dep-x64-windows.zip -OutFile $zipfile
27+
Invoke-WebRequest https://github.com/SFTtech/openage-dependencies/releases/download/v0.5.1/openage-dep-x64-windows.zip -OutFile $zipfile
2828
Expand-Archive -Path $zipfile -DestinationPath . -Force
2929
Remove-Item $zipfile
3030
(Get-ChildItem . -Recurse -File).FullName

.github/workflows/windows-server-2022.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
mkdir download
2525
cd download
2626
$zipfile = "openage-dep-x64-windows.zip"
27-
Invoke-WebRequest https://github.com/SFTtech/openage-dependencies/releases/download/v0.5.0/openage-dep-x64-windows.zip -OutFile $zipfile
27+
Invoke-WebRequest https://github.com/SFTtech/openage-dependencies/releases/download/v0.5.1/openage-dep-x64-windows.zip -OutFile $zipfile
2828
Expand-Archive -Path $zipfile -DestinationPath . -Force
2929
Remove-Item $zipfile
3030
(Get-ChildItem . -Recurse -File).FullName

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ Quickstart
128128
```
129129

130130
* **I compiled everything. Now how do I run it?**
131-
* Execute `./bin/run`.
131+
* Execute `cd bin && ./run main`.
132132
* [The convert script](/doc/media_convert.md) will transform original assets into openage formats, which are a lot saner and more moddable.
133133
* Use your brain and react to the things you'll see.
134134

assets/test/textures/test_animation.sprite

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ version 2
55

66
texture 0 "test_texture.texture"
77

8-
scalefactor 1
8+
scalefactor 1.0
99

1010
layer 0 mode=loop position=20 time_per_frame=0.125
1111

assets/test/textures/test_missing.sprite

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ version 2
55

66
texture 0 "test_missing.texture"
77

8-
scalefactor 1
8+
scalefactor 1.0
99

1010
layer 0 mode=once
1111

assets/test/textures/test_terrain.terrain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ version 2
55

66
texture 0 "test_terrain.texture"
77

8-
scalefactor 1
8+
scalefactor 1.0
99

1010
layer 0
1111

buildsystem/modules/FindSDL2Image.cmake

Lines changed: 0 additions & 29 deletions
This file was deleted.

doc/build_instructions/arch_linux.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
55
This command should provide required packages from the Arch Linux repositories:
66

7-
`sudo pacman -S --needed eigen python python-mako python-pillow python-numpy python-lz4 python-pygments cython libepoxy libogg libpng ttf-dejavu freetype2 fontconfig harfbuzz cmake sdl2 sdl2_image opusfile opus python-pylint python-toml qt6-declarative`
7+
`sudo pacman -S --needed eigen python python-mako python-pillow python-numpy python-lz4 python-pygments cython libepoxy libogg libpng ttf-dejavu freetype2 fontconfig harfbuzz cmake opusfile opus python-pylint python-toml qt6-declarative qt6-multimedia`
88

99
Additionally, you have to install [`toml11`](https://aur.archlinux.org/packages/toml11) from the AUR.
1010
If you have `yay`, you can run this command:

0 commit comments

Comments
 (0)