Journey to the Center of Hawkthorne v0.0.82 #1628

Merged
merged 178 commits into from Jul 6, 2013

Conversation

Projects
None yet
7 participants
Member

danhp commented Jul 5, 2013

People of Hawkthorne, We are here today with yet another release!

What's new:

  • 11 new costumes
  • Updated the Shopping to resemble the one in the show. Also allows the buying and selling of item in bulk.
  • Updated Valley of Laziness. New colors, level design and new enemies!
  • No longer get stuck when climbing ladders.
  • You can now drop projectiles and the drop button has been changed to your INTERACT key.

Known Issues:

  • Picking up the white crystal can in some cases cause the game to crash. With the help of Protuhj's work, we know that this can be fixed in some cases by updating the graphics card driver. If this does or did fix the problem, please comment below as we're lacking feedback on this matter.
  • Dropping stacked items is currently funky at best.

Sorry, this is a bit off of the usual schedule but I (DaNiwa) blame the nice summer weather, Canada Day and Independence Day for the delay... Mega credits goes to edisonout for the new shopping and to didory123 for his massive new level.

I know we say this each time, but expect potions in the next release. It's no longer in the "there's someone working on it" stage of things, it's nearly here! So get pumped.

didory123 and others added some commits Apr 26, 2013

@didory123 didory123 valley tileset change bb05cf4
@didory123 didory123 tileset 527a351
@didory123 didory123 Merge branch 'master' into valley-redux 6e8e5ac
@didory123 didory123 version 1 c584a3e
@didory123 didory123 first floors laid out 33f6a2d
@didory123 didory123 Merge branch 'master' into valley-redux 6b5b881
@didory123 didory123 valley WIP 6e2fa4d
@didory123 didory123 WIP 2 2b5e353
@didory123 didory123 still WIP 0f1cd87
@didory123 didory123 first prototype 707e58f
@didory123 didory123 tileset changes da623af
@didory123 didory123 va2 268fd29
@didory123 didory123 va2 done 8d14f19
@didory123 didory123 valley, valley 2, and tacotown levels 17c0f1e
@didory123 didory123 Valley levels redux prototype 256aa19
@didory123 didory123 Merge branch 'master' into valley-redux
Conflicts:
	src/maps/valley.tmx
46c91e1
@didory123 didory123 chili fields WIP e2aea4e
@danhp danhp Use of block instead of wall for consistency. 9aa44e3
@danhp danhp Black magic fix! 89be4c4
@danhp danhp Removes timer requirement a11209b
@danhp danhp Small change 1eef1b6
@didory123 didory123 chili fields almost done 421d690
@didory123 didory123 Merge branch 'master' into valley-redux 2641cbd
@didory123 didory123 sant pits entrance 302815d
@didory123 didory123 sand pits entrnace 95eb1b1
@didory123 didory123 many cosmetic changes as per edisonout's suggestions b47f879
@didory123 didory123 still a WIP 4ea997e
@didory123 didory123 Merge branch 'master' into valley-redux 3f90192
@didory123 didory123 chili fields kind of done 6549f02
@didory123 didory123 WIP 539de1e
@didory123 didory123 spider bf1fa2f
@didory123 didory123 Merge branch 'valley-redux' of https://github.com/didory123/hawkthorn…
…e-journey into valley-redux
1e5a0b0
@didory123 didory123 sand pits WIP 76bdb14
@didory123 didory123 valley 3 WIP daa6a39
@edisonout edisonout redesign shopping 0a69b03
@didory123 didory123 stashing changes 607ee18
@edisonout edisonout move window & grey out text 613e862
@danhp danhp Answer to stuck on block nodes and ladders c23359a
@didory123 didory123 Merge branch 'master' into valley-redux
Conflicts:
	src/maps/valley.tmx
627536e
@didory123 didory123 fix platforms deb86e5
@danhp danhp Revert "Answer to stuck on block nodes and ladders"
This reverts commit c23359a.
4b12dc2
@didory123 didory123 sand pits entrance 2c5d60f
@didory123 didory123 sand pits entrance 84c2b86
@danhp danhp Fix added to breakable blocks b81b2e4
@didory123 didory123 sand pits entrance complete 52ee9fb
@didory123 didory123 Merge branch 'master' into valley-redux 95c83a2
@didory123 didory123 complete entrance af673b4
@didory123 didory123 commit 141006a
@didory123 didory123 weird offset 9d1d6c5
@didory123 didory123 sand pits tileset e8523d5
@edisonout edisonout sort out info messages cd8f1cf
@edisonout edisonout add chloroform troy costume 670ce70
@didory123 didory123 valley e08bbe9
@CalebJohn CalebJohn adds new font small.png e3e16b8
@Protuhj Protuhj Ensure health is in bounds
This ensures the health value is in bounds for the array. Addresses
#1544.
d5b68c9
@CalebJohn CalebJohn changes doors to fix looping door a66e5d6
@CalebJohn CalebJohn git bow some properties so that it can be dropped 7fa043b
@CalebJohn CalebJohn fixes comment typo 6285d4a
@CalebJohn CalebJohn destroys arrows on drop d568643
@CalebJohn CalebJohn Merge remote-tracking branch 'origin/bow-drop' into bow-drop f718dba
@CalebJohn CalebJohn this gives support for dropping projectiles and scrolls ea19ce0
@didory123 didory123 Merge pull request #1578 from CalebJohn/main-door
Fixes looping doors
426a64a
@reddfawks reddfawks Adds Help The Gulf costume for Britta d8b46af
@CalebJohn CalebJohn Merge pull request #1420 from DaNiwa/block-nodes
Fix to release from block nodes. (Ladders)
fca5440
@didory123 didory123 tileset 20c2c4d
@edisonout edisonout Merge pull request #1582 from reddfawks/pelicany
Adds Help The Gulf costume for Britta
ad14732
@CalebJohn CalebJohn allows droppping of throwing axe e354609
@didory123 didory123 sandpits 20bc30c
@didory123 didory123 sandpits tileset 0db9926
@didory123 didory123 Merge branch 'master' into valley-redux
Conflicts:
	src/maps/valley.tmx
58e3297
@didory123 didory123 sandpits 6323191
@didory123 didory123 warning sign e6223e1
@didory123 didory123 connect levels 2f9a4fc
@didory123 didory123 sandpits wip 265ed4f
@didory123 didory123 fix movingplatform wall bug e2d2ed2
@didory123 didory123 sandpits WIP dfbf178
@didory123 didory123 npcs 6285eca
@didory123 didory123 mayorjuan 8ed9da3
@didory123 didory123 wip 09f2a7e
@didory123 didory123 sandpits2 9164980
@didory123 didory123 sandpits 1 almost dnoe d487aff
@didory123 didory123 add savepointto sandpits dab2b26
@didory123 didory123 conect levels temporarily 6d6fe93
@didory123 didory123 fix spiders 02e013d
@didory123 didory123 conect tacotown properly a4687aa
@edisonout edisonout Merge pull request #1571 from CalebJohn/new-font
Adds a new font
a1111b3
@edisonout edisonout Merge branch 'master' into shopping 5a94e77
@didory123 didory123 sandpits2 WIP a6a8588
@CalebJohn CalebJohn drop weapons, materials, consumables 28d1220
@edisonout edisonout adds small font bfef805
@didory123 didory123 sandpits2 b9a0916
@danhp danhp Merge pull request #1576 from Protuhj/expected_userdata_1544
Ensure health is in bounds
74b42dc
@didory123 didory123 blacksmit initial commit a61c347
@didory123 didory123 juanita 2d56bd3
@didory123 didory123 Sandpits2 68155fe
@edisonout edisonout adds camera for different level sizes efb5898
@didory123 didory123 chili fields 2 initial commit 30379bd
@edisonout edisonout shifts categories & adds inventory note a7f982c
@didory123 didory123 chilifields 2 WIP e6d8235
@didory123 didory123 add hidden entrance, finish chili fields 2 40e7010
@edisonout edisonout put Troy in a suit bfa87fb
@edisonout edisonout Merge pull request #1567 from edisonout/chloroform
Adds chloroform troy costume
2a538ce
@edisonout edisonout fix parking lot door 98f187b
@didory123 didory123 finish sandpits 2 997ce14
@didory123 didory123 image file deletion e456865
@didory123 didory123 small change to chili fields b8b1159
@edisonout edisonout any button exits message window ff7036a
@edisonout edisonout shift save point and lock door f8491e0
@didory123 didory123 add exit to sandpits 8a7aeb5
@edisonout edisonout remove ferry ride save point caa7950
@didory123 didory123 Merge pull request #1608 from edisonout/gaysave
Removes ferry ride save point
27a81f3
@didory123 didory123 add savepoints c77d333
@didory123 didory123 add drop false property to platforms, add two new weapons bonebow and…
… crimson sword as well as consumbable superhealthpotion
7e99771
@didory123 didory123 finish up valley-3 c99bf32
@didory123 didory123 fix bonebow 14aa638
@didory123 didory123 get rid of the bonebow 0a426bb
@didory123 didory123 add waves to oceans in levels, change tileset to have better looking …
…ocean tiles
89cde4b
@didory123 didory123 FINALLY FINISHED -- connect valley to gay island and vilage-forest d41ff35
@didory123 didory123 final touches to smooth out the levels 95d5fe5
@didory123 didory123 add mention of sandpits, put up sandpits sign 8143e6c
@didory123 didory123 Fix wonky platforms a22d32f
@didory123 didory123 fix wonky platforms 2 04d3c51
@CalebJohn CalebJohn Merge pull request #1606 from edisonout/townsave
Re-position save point in town
3b3f34a
@CalebJohn CalebJohn stops picking up projectiles after thrown 59b4167
@Protuhj Protuhj Commented out the inspect call
I left the code in there (just commented out) in case the drop needs to
be debugged in the future.
cbe40b4
@edisonout edisonout adds dean train costume e37f847
@edisonout edisonout fix jeff train costume ccbc3db
@danhp danhp Change keybindings ca8f149
@NicolausVanSchie NicolausVanSchie Change hallway's tileset to new one c2a6fc5
@NicolausVanSchie NicolausVanSchie Seats in wrong place.
Went from memory.
a9a0237
@didory123 didory123 Merge pull request #1618 from DaNiwa/keybind
Change Inventory keybindings
d1e458c
@didory123 didory123 Merge pull request #1619 from Nicko21/tileset_fix
Hallway tileset fix
0c6c206
@didory123 didory123 Merge pull request #1579 from CalebJohn/bow-drop
This fixes a crash when dropping the bow
f37ca1c
@didory123 didory123 Merge pull request #1589 from edisonout/parking
Parking lot door
4860700
@didory123 didory123 add overworldname values to levels, change enemies token amount, spid…
…ers no longer jumpkillable
d3230d2
@didory123 didory123 fix merge conflicts, add overworld names eb35166
@didory123 didory123 make spiders not jumpkillable c038a74
@CalebJohn CalebJohn Merge remote-tracking branch 'upstream/master' into drop-projectiles
Conflicts:
	src/inventory.lua

fixes arrow drop crash and throwing axe
4efd4a0
@CalebJohn CalebJohn fixes landing on platforms 3349eab
@NicolausVanSchie NicolausVanSchie Fixed. 00cd648
@didory123 didory123 add appropriate chest de7164d
@didory123 didory123 add second savepoint to sandpits2 to please daniwa 1364c34
@NicolausVanSchie NicolausVanSchie Added bows and arrows 64435ec
@didory123 didory123 fix a few visual changes, change chest to superhealthpotion 8f3090d
@CalebJohn CalebJohn Merge pull request #1620 from Nicko21/CheatFix
Fix bug with cheats.
1387b13
@edisonout edisonout adds 6 troy & chang costumes 3fe9270
@edisonout edisonout deletes duplicate annie costume 4081c64
@edisonout edisonout adds buying & selling multiple items fc85879
@Protuhj Protuhj Deleted code vs. commenting it out. da35d4a
@Protuhj Protuhj Merge pull request #1616 from Protuhj/inspect_in_master_1591
Removed inspect call from inventory.lua
dc7d0b1
@danhp danhp Merge pull request #1621 from edisonout/250costumes
Lots more costumes
ea513ee
@CalebJohn CalebJohn Merge remote-tracking branch 'upstream/master' into drop-projectiles
Conflicts:
	src/inventory.lua

update to master
46c0c78
@CalebJohn CalebJohn fixed missed merge issue 533193a
@edisonout edisonout iron out multiple purchase bugs 2af91b9
@didory123 didory123 make sandpits easier, get rid of savepoint 400dd17
@didory123 didory123 proper door exit in sandpits d145c15
@CalebJohn CalebJohn drop in 2.5d 1f1950d
@CalebJohn CalebJohn made blade bb skinnier fa7459a
@CalebJohn CalebJohn Merge remote-tracking branch 'upstream/master' into drop-physics
Conflicts:
	src/cheat.lua

upstream merge
c5df9a7
@CalebJohn CalebJohn material dropping 247b8ba
@CalebJohn CalebJohn fixes throwing axe 7a3c486
@danhp danhp Merge pull request #1482 from edisonout/shopping
Redesign of shopping gamestate
6758455
@didory123 didory123 Merge branch 'master' into valley-redux 823a964
@didory123 didory123 fix crimson sword price b1c3b29
@didory123 didory123 fix other item prices 3658087
@reddfawks reddfawks Adds Christmas Brawl costume for Britta e182bd5
@edisonout edisonout adds cookie crisp wizard costume a3bb079
@edisonout edisonout Merge pull request #1625 from edisonout/cookiewand
Adds cookie crisp wizard costume
29d23d1
@edisonout edisonout Merge pull request #1624 from reddfawks/brittabrawl
Adds Christmas Brawl costume for Britta
33fa37f
@danhp danhp Merge pull request #1607 from didory123/valley-redux
Merges Updated Valley.
a1fed22
@didory123 didory123 Merge pull request #1588 from CalebJohn/drop-physics
Inventory Item Gravity
949c30b
@CalebJohn CalebJohn Merge remote-tracking branch 'upstream/master' into drop-projectiles
Conflicts:
	src/inventory.lua

update to master
e9539ce
Member

danhp commented Jul 5, 2013

@edisonout @bucketh3ad @CalebJohn @Protuhj @didory123 @nicko21 and all of you out there, test out master see that there are no gamebreaking bugs

Member

edisonout commented Jul 5, 2013

Valley still doesn't work for me, but that's my problem. Everything else seems to work fine.

Member

danhp commented Jul 5, 2013

@edisonout could you check to see that your tileset image is not corrupted? It's weird that you're the only for who it doesn't work.

Contributor

Protuhj commented Jul 5, 2013

WRT the white crystal, the players should update their graphics card drivers not, their hardware!

Member

edisonout commented Jul 5, 2013

@daniwa Tileset image is fine, I've re-downloaded it & it still just shows up white. All looks fine in Tiled. My computer just doesn't like the size (dimension-wise) of it.

Contributor

Protuhj commented Jul 5, 2013

Dropping stacked weapons (stay a stack of 3) and then picking them up again will result in you picking up a full stack.

Contributor

Protuhj commented Jul 5, 2013

Take a look at #1633 and see if you want to include it in the release.

@danhp danhp added a commit that referenced this pull request Jul 6, 2013

@danhp danhp Merge pull request #1628 from hawkthorne/master
Journey to the Center of Hawkthorne v0.0.82
f5adc80

@danhp danhp merged commit f5adc80 into release Jul 6, 2013

1 check passed

default The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment