1
0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-25 17:48:50 -05:00
Commit Graph

64 Commits

Author SHA1 Message Date
David Chavez
083ceb4423
Feature: Crowd Control Integration ()
* Start effects

* Disable input to game when typing in console

* Add gravity support

* noUI placeholder

* Add rest of effects to console

* Remove z_play code

* Add rupee modification

* Add OneHit KO ()

* few fix and paper Link

* Better method and now use the reset flag

* Revert "Better method and now use the reset flag"

This reverts commit 2aafcc1df2.

* Revert "few fix and paper Link"

This reverts commit 65e76dcfee.

* Paper Link & few fixes ()

* Implement pacifist mode ()

* Implement cucco storm ()

* Add no UI functionality ()

* Enable CrowdControl on windows ()

* Use std::format and implement wallmaster

* Implement defense modifier

* Implement no_z and clean up

* Implement reverse controls

* Some fixes while testing CC connection

* Implement speed modifier and fix defese modifier

* Fail magic effects if magic is not acquired

* Fix queue system

* Implement rainstorm

* Some cleanup

* Use IS_ZERO to handle very low near zero values

* Split some effects

* Fix emptying magic

* Don’t run cucco on pre-rendered backgrounds

* Use correct method for updating ruppees

* Fix decreasing speed

* Remove old SDL stuff

* Remove old fixes

* Enable Crowd Control for both debug and release

* Add missing returns

* Cleanup event firing

* Further clean up on event firing

* Fix some bugs

* CC fixes and enemy spawning ()

* Fix icetraps

* Fix title screen

* Fix pause screen

* Fix death screen timer & Code cleanup

* Fix timer during textboxes

* Code cleanup

* Add: Multiple enemy spawning

* More enemies + more code cleanup ()

* Enums for returning effect states

* Add more enemies

* Update CrowdControl.cpp

* Remove enums from enemies

* Fix up flow for events ()

# Conflicts:
#	soh/soh/Enhancements/crowd-control/CrowdControl.cpp

* Fix spawn position of likelike

* CC temp enemy fixes ()

* Check for pause in pacifist and allow button presses ()

* Fix Pacifist mode ()

* First attempt pacifier fix

* Real fix for pacifist mode

* Comment

* Remove cutscene and long delay from cucco_storm ()

* Some PR Fixes

* Use standard types

* Handle JSON parsing error and free memory

* Add CC configuration file

* Add: Giving deku shield option. Fix: Giant Lonk ()

* Small stalfos fix ()

* Syntax Improvements ()

* Revert bools to uint32_t

* Add comment about bools

* Fix cucco storm, fix empty heart ()

* Protect commands vector with mutex

* prefix effects with chaosEffect ()

Co-authored-by: briaguya <briaguya@alice>

Co-authored-by: Baoulettes <perlouzerie@hotmail.fr>
Co-authored-by: aMannus <mannusmenting@gmail.com>
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Co-authored-by: briaguya <briaguya@alice>
2022-09-27 22:41:17 -04:00
David Chavez
11b6ce819d
Update version in other remaining spots () 2022-09-25 12:13:23 -04:00
David Chavez
00fb12134a
Fix macOS minimum deployment target () 2022-09-22 07:58:42 +02:00
th-2021
d39a1a0bdf
[macos] Embed dependencies for ZAPD in bundle () 2022-08-22 10:43:50 +02:00
qurious-pixel
9bc6aac81e
MacOS OTR () 2022-08-18 19:40:41 +02:00
Zaxus125
b7f9960a60
[cmake] Improve OTRExporter asset extraction script, Lower required CMake to 3.16 ()
* supply ZAPD.out path as an argument to extract_assets.py rather than regenerating the script

Generating an entirely new script file to change a string is excessive.
Instead, extract_assets.py takes in one optional positional argument that
contains the path to ZAPD.out, the original purpose for the string
replacement.

This also removes the need for the file(CHMOD ...) command, which bumps
the minimum cmake version all the way up to 3.19.

Additionally, there was an extra script being generated in
OTRExporter/CMakeLists.txt that used the same CHMOD logic, but did not
accurately declare its minimum version to 3.19, this removes that unused
logic.

* OTRExporter: accept a rom path as an argument to extract_assets.py
2022-08-16 09:34:30 +02:00
th-2021
b46c7a0607
[cmake] Use SDL2, GLEW and GLFW from vcpkg (Windows) () 2022-08-16 09:29:45 +02:00
GaryOderNichts
68e7f2e6c1
Wii U support ()
* Wii U support

* [WiiU] Combined Dockerfile

* [WiiU] Combined Dockerfile

* [WiiU] Combined Dockerfile

* Add Jenkins support

* wiiu: fix scissor clamp

* wiiu: improve button remapping

* wiiu: fix scaling issues

* Update Dockerfile after merge

* Pull assets before build

* Only stop container once

* Adjust logging sinks

* wiiu: Change button mapping to match PC version

* wiiu: Implement controller changes

* wiiu: Update BUILDING.md

Co-authored-by: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com>
Co-authored-by: David Chavez <david@dcvz.io>
2022-08-14 22:57:24 -04:00
th-2021
c803ff65ce
fix path to ZAPD () 2022-08-08 19:58:43 -04:00
David Chavez
9afbe42720
Use -O2 for Release config builds () 2022-08-08 12:01:45 +02:00
Christopher Leggett
7f233de502
Fixes CMake to explicity launch python interpreter on Windows. () 2022-08-08 10:31:47 +02:00
th-2021
ed9378375d
[cmake] Use static libraries with vcpkg on Windows () 2022-08-07 18:23:20 +02:00
briaguya
7f58ef14ee add a command to copy the otr to the build dir 2022-08-06 21:06:21 -04:00
th-2021
1ebca42f46
Move to cmake across all platforms () 2022-08-05 07:59:19 +02:00