Skip to content

Merge develop-satoko -> develop #897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Archez merged 7 commits into from
Dec 20, 2024
Merged

Merge develop-satoko -> develop #897

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5233f27
Add extended culling handling for special actors (#889)
Archez Dec 11, 2024
5a559b4
Log version on boot (#891)
Archez Dec 11, 2024
fb8e876
Handle Great Bay Coast for pause warp with index warp (#892)
Archez Dec 19, 2024
8ed597a
Adds even more interpolation fixes (#894)
Archez Dec 19, 2024
7c7dd8f
Bump Satoko to LUS fork with specific fixes (#895)
Archez Dec 19, 2024
cf63334
Bump Satoko Charlie 1.1.2 (#896)
Archez Dec 20, 2024
0ad27f4
Merge remote-tracking branch 'origin/develop-satoko' into merge-devel…
Archez Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Bump Satoko Charlie 1.1.2 (#896)
  • Loading branch information
@Archez
Archez authored Dec 20, 2024
commit cf63334c28886d1cb168e742ecbaef3a7900f81d
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")

set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")

project(2s2h VERSION 1.1.1 LANGUAGES C CXX)
project(2s2h VERSION 1.1.2 LANGUAGES C CXX)
include(CMake/2ship-cvars.cmake)
include(CMake/lus-cvars.cmake)
set(PROJECT_BUILD_NAME "Satoko Bravo" CACHE STRING "" FORCE)
set(PROJECT_BUILD_NAME "Satoko Charlie" CACHE STRING "" FORCE)
set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "" FORCE)

set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT 2ship)
Expand Down