mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-29 04:42:18 -05:00
Code Issues Projects Releases Wiki Activity
b57e44afc9
Shipwright/soh
History
David Chavez b57e44afc9 Merge remote-tracking branch 'upstream/develop-zhora' into feature/crowd-control 
# Conflicts:
#	libultraship/libultraship/Lib/SDL/lib/x86/SDL2.lib
#	libultraship/libultraship/Lib/SDL/lib/x86/SDL2main.lib
#	soh/soh/Enhancements/debugconsole.cpp
2022-08-22 16:14:38 +02:00
..
assets Merge branch 'develop' into z64-devmerge 2022-06-17 00:39:07 -04:00
CMake Move to cmake across all platforms (#363) 2022-08-05 07:59:19 +02:00
include Merge remote-tracking branch 'upstream/develop-zhora' into feature/crowd-control 2022-08-22 16:14:38 +02:00
macosx MacOS OTR (#973) 2022-08-18 19:40:41 +02:00
platform Wii U support (#1097) 2022-08-14 22:57:24 -04:00
soh Merge remote-tracking branch 'upstream/develop-zhora' into feature/crowd-control 2022-08-22 16:14:38 +02:00
soh.xcodeproj Use tex sizes from texture rather than hardcoded values (#610) 2022-07-31 21:32:40 -04:00
src Merge remote-tracking branch 'upstream/develop-zhora' into feature/crowd-control 2022-08-22 16:14:38 +02:00
.clang-format git subrepo clone https://github.com/HarbourMasters/soh.git 2022-03-22 02:51:23 +01:00
.clang-tidy git subrepo clone https://github.com/HarbourMasters/soh.git 2022-03-22 02:51:23 +01:00
.gitattributes git subrepo clone https://github.com/HarbourMasters/soh.git 2022-03-22 02:51:23 +01:00
.gitignore Add Support for macOS (#441) 2022-06-22 14:59:21 -04:00
.gitrepo git subrepo push soh 2022-07-14 20:47:48 -04:00
CMakeLists.txt Merge remote-tracking branch 'upstream/develop-zhora' into feature/crowd-control 2022-08-22 16:14:38 +02:00
fixbaserom.py git subrepo clone https://github.com/HarbourMasters/soh.git 2022-03-22 02:51:23 +01:00
format.sh git subrepo clone https://github.com/HarbourMasters/soh.git 2022-03-22 02:51:23 +01:00
icon.jpg Nintendo switch support (#935) 2022-07-25 21:11:53 -04:00
resource.h git subrepo clone https://github.com/HarbourMasters/soh.git 2022-03-22 02:51:23 +01:00
Resource.rc git subrepo clone https://github.com/HarbourMasters/soh.git 2022-03-22 02:51:23 +01:00
SHIPOFHARKINIAN.ico git subrepo clone https://github.com/HarbourMasters/soh.git 2022-03-22 02:51:23 +01:00