Skip to content

Commit

Permalink
Journey to the Center of Hawkthorne v1.1.0 (#2599)
Browse files Browse the repository at this point in the history
* love 0.10.0

everything except stencils

* Set CharacterStrip stencil to act as a mask

* Update travis.yml to trusty beta
also switch to language general instead of erlang

* LoubiTek sfx

* LoubiTek turkey sfx

* Blackjack bug fixes

-Fixed bet increment/decrement logic. Will allow player to max out bet to available money. When decrementing the bet, will remove the portion not part of the standard decrement, if not a multiple of that decrement.

-Fixed the gameMenu logic regarding when to allow splits and double downs, as related to player money and the current wager. Existing logic would not allow a double down or split under certain conditions (e.g., when trying to double down after splitting, could not double down if player money was not at least 4x greater than the current bet, logic should actual check if player is capable of adding another currentBet to wager).

-Fixed dealer winning on blackjack even if player has blackjack. Now it's a push if player also has blackjack.

* Update blackjackgame.lua

* Fat neil was misspelled and would crash the Cornelius boss fight

* ⬆️ love @ 0.10.1

* ⬆️ love for win32 @ 0.10.1

* ⬆️ love @ 0.10.1

* Add loubitek as contributor

* add-pankobro

* Add custom battle music to the benzalk fight, thanks to
/u/incredible-ninja

* contain benzalk battle music to just the battle

* Add incredible-ninja to credits (real name)

* Update inputcontroller to LÖVE >0.9.2 space key

* Fix misspelling of bubblegum ("bubblgum") (#2570)

* Fixes Misspelling in potion_recipes.lua

'Bubblegum' was previously misspelled 'bubblgum'.
The current spelling was causing issues: https://www.reddit.com/r/hawkthorne/comments/95clnx/i_found_a_glitch_in_the_cheats_menu_this_message/

* Fixes misspelling in cheat.lua

'Bubblegum' was previously misspelled 'bubblgum'.
The current spelling was causing issues: https://www.reddit.com/r/hawkthorne/comments/95clnx/i_found_a_glitch_in_the_cheats_menu_this_message/

* fix type causing #2572

* Update CONTRIBUTORS

add @thisIsTheFoxe to contributors

* #2580 Update to find correct versions. (#2581)

* Update download URLs

Also added try/catch mechanisms so the script fails if a download fails.

* Addresses two common collision issues (#2584)

The first is when you attack soon after crouching. If you timed it just right, attacking just before you went under a low ceiling would cause you to stand up and clip into the ceiling.

The second, which is related to the first, would happen if you stood up right at the edge of a ceiling. The code would find a tile above the character instead of below, since even when standing still, gravity causes the collision code to run assuming you're falling down.

Both of these situations are easiest to reproduce when on a moving platform.

* Update README.md (#2586)

Deleted "Update every 2 weeks."

* Update to Love 11.3 (with some minor bugfixes) (#2589)

* Love 11.3

* Update conf.lua

* Update i18n.lua

* Update application.lua

* commit

* Update Makefile

* Update .travis.yml

* Update conf.lua

* Fix for run

* fix version

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* fix color

* little fixe

* fix color more

* fix more

* fix color again

* fix color...

* fix

* Little fix

* fix

* fix color again

* fix

* fix

* fix

* update

* fix

* update

* Update make.ps1

* More color fixes and minor cleanup

---------

Co-authored-by: liberodark <[email protected]>

* Fix mismatched collision tile in black caverns (#2590)

* Epic weapon fixes (#2591)

* Lower epic weapon so Annie can pick it up without jumping

* Align epic projectile with tile floor always

* Bugfixes (#2592)

* Fix CLI arg parsing and other minor bugfixes

* Improve utils.require with error handling

* If player is already frozen, don't allow them to interact with NPC (#2593)

* More LÖVE v11 fixes and love.js support (#2594)

* More LOVE v11 bugfixes

* Game in the browser with Love.js

* README image links to projecthawkthorne.com

* Minor style fixes to web

* Code Cleanup (#2595)

* Cleanup unused/broken parts

* Move PSDs and cleanup packaged game contents

* Linux AppImage binary

* Remove love binary from linux AppImage

* Update macOS app build

* Remove more unused template files

* Remove unusude Travis CI references

* Remove unused gif script

* Update Makefile .PHONY targets

* Build and Deploy Workflows (#2598)

---------

Co-authored-by: 8bitgentleman <[email protected]>
Co-authored-by: Caleb John <[email protected]>
Co-authored-by: DakkJaniels <[email protected]>
Co-authored-by: Daniel Pham <[email protected]>
Co-authored-by: LoubiTek <[email protected]>
Co-authored-by: skovsgaard <[email protected]>
Co-authored-by: jaketheda <[email protected]>
Co-authored-by: Henrik Storch <[email protected]>
Co-authored-by: Henry <[email protected]>
Co-authored-by: uiradev <[email protected]>
Co-authored-by: Protuhj <[email protected]>
Co-authored-by: John <[email protected]>
Co-authored-by: liberodark <[email protected]>
  • Loading branch information
14 people authored Nov 22, 2024
1 parent 01e35e5 commit 942f998
Show file tree
Hide file tree
Showing 230 changed files with 1,213 additions and 3,030 deletions.
19 changes: 19 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Build

on:
pull_request:
branches:
- master

jobs:
build:
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v4

- name: Install dependencies
run: sudo apt-get install -y curl desktop-file-utils file libfuse2t64 lua5.4 make python3-pip python3-venv xvfb zip zsync

- name: Build
run: xvfb-run make clean validate test
28 changes: 28 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Deploy

on:
push:
branches:
- release

jobs:
deploy:
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v4

- name: Install dependencies
run: sudo apt-get install -y curl desktop-file-utils file libfuse2t64 lua5.4 make python3-pip python3-venv xvfb zip zsync

- name: Deploy
run: xvfb-run make binaries

- name: Tar build artifacts
run: tar -cvf build/builds.tar build/hawkthorne-macos.zip build/hawkthorne-win32.zip build/hawkthorne-win64.zip build/hawkthorne-linux.AppImage build/hawkthorne.love

- uses: actions/upload-artifact@v4
with:
name: builds.zip
path: build/builds.tar
retention-days: 7
11 changes: 6 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
build
bin/
build/
.DS_Store
__*
full_soundtrack.ogg
hawkthorne
win32/*
win64/*
hawkthorne/
win32/
win64/
redditors.txt
src/maps/*.lua
venv
tmx2lua*
bin/*
dsa_priv.pem
release.md
post.md
Expand All @@ -22,3 +22,4 @@ save
src/test/fixtures/Fake.app
Journey\ to\ the\ Center\ of\ Hawkthorne.app
sparkle/appcast.json
node_modules/
21 changes: 0 additions & 21 deletions .travis.yml

This file was deleted.

8 changes: 0 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,6 @@ in the repository.
* No trailing whitespace. Blank lines should not have any space.
* Follow the conventions you see used in the source already.

### Handy Code Templates:
[Node Template][node]: used for making objects in the game

[Gamestate Template][gamestate]: used for making a new gamescreen(e.g the pause menu)

[node]: https://github.com/hawkthorne/hawkthorne-journey/blob/master/docs/codetemplates/node.lua
[gamestate]: https://github.com/hawkthorne/hawkthorne-journey/blob/master/docs/codetemplates/state.lua

[gameplay]: https://github.com/hawkthorne/hawkthorne-journey/issues?labels=gameplay&state=open
[bugs]: https://github.com/hawkthorne/hawkthorne-journey/issues?labels=bug&state=open

Expand Down
42 changes: 42 additions & 0 deletions CONTRIBUTORS
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@

6sutters
8bitgentleman
a8252359
aaronpetykowski
academania
Expand All @@ -9,6 +11,7 @@ afiveseven
afuturepresident
ajay182
akobrandon
alfonz42
alkhava
alpenghandi
andcat7
Expand All @@ -30,12 +33,15 @@ bagofswagg
barry.se
beebes
beforemonsters
ben3555
benfranklinchang
benlew
bigchangtheory
bigpet
bluecalx2
bobkanob
boobatron4000
bucketh3ad
buckybrewer
cabbo
calebjohn
Expand All @@ -50,35 +56,44 @@ childish_gambino3
childishgambino93
chrissawyers
ciocori
ciziu
clairelabear
clairelebear
claywin
clogan1
cmdoptesc
communityfan1107
condoreo
coolcoolcoolabed
coolman1081
coray8
coreyander
covertpz
cptbooyah
creedogv
creekee
curtis81
cyberpie118
cynical_redditor
dakkjaniels
dancingshadow
daniwa
dano1163
dard12
daspectre
davidgumberg
de3ertf0x
deadpoolismyhomeboy
deckhipstername
delicioussoma
derferman
derynator
didory123
diegothegnome
dont do
dontgochinatownme
dr. awesome
duncan de heusden
durrel
dyan654
easilyremember
Expand Down Expand Up @@ -119,6 +134,7 @@ greetingsadm
guyinhat
gvx
gyaruson
habbie
hbjudo17
heikon
hisfavouriteflavour
Expand All @@ -128,6 +144,7 @@ icanhas
idontusereddit
igotaxmastime4me
ihumanable
inspector-space-time
ironsyndicate
jackim
james92498
Expand All @@ -138,10 +155,13 @@ jcoleondabeat
jedi_idiot
jewporn
jgyori29
jhoff
jiggpig
jjangu
jjfresh814
jollygoodshowoldbean
jorbob
josh1238
joshcorr
jpole1
jrbossack
Expand All @@ -153,13 +173,16 @@ kastian
kaworus_lover
kazook
kcig
keviouk
kevwasam
kickpuncher08
kidcudiwins
kiharder
kilakev
kkris
klosec12
konyismydad
lafncow
lamboman10
lasternom
lavenenosa
Expand All @@ -168,27 +191,34 @@ letharg
lifedreamcreate
liwaldo
lmol99
logsiscute
loubitek
lvl5lazorlotus
lyhome
m_a_d
maathewdavis
majestic_moose
malarchymike
marbly
mario3d
masonnixon
matthewbauer
matthewdelacruz15
max100101
maxerj
mcclellan
mckriet
megatruck
metaridleyx
mexicanace
midnightbarber
mikedem
mikevin
miltage
mister_spider
mminson
mtwstudios
muplah
muugin
myers78
mystro256
Expand All @@ -197,8 +227,11 @@ nbieter
necral
necromanteion
nerdsavvy
niamu
nicko21
niksn
niles_smiles
nimbusbp1729
nimnams
nonisredael
notablyconventional
Expand All @@ -212,18 +245,22 @@ operia
ormagoden
outlandishflamingo
paintyfilms
pankobro
paperplatemasks
paragon19
period blood
petter_w
philoctitties
piratejesus
pmaynard
prene7
profbauer
professorianduncan
protuhj
rahmeeroh
rainfly_x
ramblinfirefox
reddfawks
redecho
renako
retromation
Expand All @@ -243,10 +280,13 @@ sillyboots
simmonsisfinished
simsoy
sirdregan
skipants
slamindingo
smilingkevin
smoorejunk
snokone
sowhy
spartyfan
spla08
spritefan
sprneon
Expand All @@ -264,6 +304,7 @@ thegreenhat
thejordyd
thekurtin
thewill2live
thisisthefoxe
thomasmb
tigeris
tjvezina
Expand All @@ -281,6 +322,7 @@ vilhelmsmurphy
vintagefuture
viper61989
vontd
vrachno
wandersfar
wilburwright
wubbledaddy
Expand Down
Loading

0 comments on commit 942f998

Please sign in to comment.