Commit graph

519 commits

Author SHA1 Message Date
HapaxL 420e506cf0 various minor changes for puppy carry sprites:
- puppy appears immediately when you obtain it
- puppy disappears immediately when you give all puppies to jenka
- puppy is always behind curly when both are carried
- grabbing curly immediately puts her in front
2020-12-15 09:33:25 +01:00
HapaxL dcae310995 removes carried puppy sprite in jenka's house after the all-puppies cutscene 2020-12-13 11:19:55 +01:00
HapaxL fb54ffdef6 removes floating puppy from normal ending 2020-12-13 11:18:11 +01:00
HapaxL f06245f2d3 replaces default Whimsical Star sprites for the Misery MyChar. 2020-12-07 05:36:55 +01:00
Robin 31a65e1e1d Robin contributor icon change 2020-12-06 20:40:49 -05:00
Robin e630e62e02 Chaco mychar added 2020-12-06 19:41:20 -05:00
HapaxL 92c82f20a9 Merge branch 'master' of https://github.com/cave-story-randomizer/cave-story-randomizer.git into sky_dragon_mychar 2020-12-07 01:13:27 +01:00
HapaxL afb6fefb93 replaces default puppy with Smalrog in Misery's MyChar 2020-12-07 01:09:25 +01:00
duncathan salt e4594fbb82
Merge pull request #116 from duncathan/camp
Makes Camp chest accessible from inside Camp in Camp seeds
2020-12-06 18:06:55 -06:00
duncathan salt 7bfeb7952b
Merge pull request #112 from HapaxL/sky_dragon_mychar
adds sky dragon to MyChar (for normal ending)
2020-12-06 18:06:30 -06:00
HapaxL 194641f06d adds sky dragon to MyChar (for normal ending) 2020-12-07 00:57:39 +01:00
duncathan f3d666efef Makes Camp chest accessible from inside Camp in Camp seeds
fixes #105
2020-12-06 17:57:10 -06:00
duncathan salt 2708aef353
Merge pull request #111 from duncathan/hints
improves hints, fixes #109
2020-12-06 17:43:35 -06:00
duncathan salt b589934e71
Merge pull request #103 from Robinnium/master
Added <WAI0040 to reservoir -> waterway confirmation
2020-12-06 17:43:10 -06:00
duncathan 75a69441fe improves hints, fixes #109 2020-12-06 17:40:54 -06:00
Robin 4aa35092a3 Added <WAI to waterway -> labyrinth confirmation, stopped relevant sparkly from vanishing 2020-12-06 17:35:53 -05:00
duncathan salt 3c71d0ac9b
Merge pull request #104 from Robinnium/puppy-side-room
Side room dog exists again
2020-12-06 16:29:38 -06:00
duncathan salt d85e02a06b
Merge pull request #100 from HapaxL/master
add option to remove falling blocks in Hell B2
2020-12-06 16:26:41 -06:00
duncathan salt 65b4d76a45
Merge pull request #110 from duncathan/oneliners
a few one-line fixes
2020-12-06 16:26:16 -06:00
duncathan 382fffdca9 a few one-line fixes 2020-12-06 16:07:48 -06:00
Robin c443f33dad Side room dog exists again 2020-12-06 16:22:20 -05:00
Robin 09eae80dfb Added <WAI0040 to reservoir -> waterway confirmation 2020-12-04 01:37:16 -05:00
HapaxL 4ca549f1e7 Merge branch 'master' of https://github.com/cave-story-randomizer/cave-story-randomizer.git
# Conflicts:
#	pre-edited-cs/data/Stage/Hell2.pxe
2020-12-02 09:17:25 +01:00
duncathan salt b71cf74e73
Merge pull request #99 from Fayti1703/patch-cse2
Fix mrmap.bin
2020-10-18 05:53:32 -06:00
duncathan salt 4b14645fb9
Merge pull request #98 from Fayti1703/patch-puppies
Allow puppies to be visibly carried everywhere
2020-10-18 05:53:15 -06:00
HapaxL 900992db5f add option to remove falling blocks in Hell B2
thank god
2020-07-16 22:39:32 +02:00
Kayo 0213e35cb4 Fix mrmap.bin 2020-03-15 22:49:38 +01:00
Kayo 657670737c Add Puppy entities to all maps 2020-03-15 22:48:46 +01:00
Kayo 68aa8ec09d Add Puppies to MyChars 2020-03-15 22:47:44 +01:00
Kayo 4ef9558ea1 Modify carried puppy to use MyChar.bmp 2020-03-15 22:45:37 +01:00
duncathan 2c5ad7dafb adds misery mychar courtesy of hiino 2020-03-14 00:06:46 -06:00
duncathan salt f8eedf4e28
Merge pull request #97 from cave-story-randomizer/dail
fix dailies
2020-03-13 03:48:00 -06:00
duncathan 8fb4630a62 cron only 2020-03-13 03:46:03 -06:00
duncathan b4c3799999 fix inconsistencies between dailies 2020-03-13 03:42:12 -06:00
duncathan 67e3154b97 fix 2020-03-13 03:31:02 -06:00
duncathan 4e697ff787 oop 2020-03-13 03:26:02 -06:00
duncathan 4c0b005e18 idk what i broke lol 2020-03-13 03:25:12 -06:00
duncathan 9a7dac435d go back to what worked 2020-03-13 03:01:43 -06:00
duncathan e1b24f451d what happened to travis 2020-03-13 02:46:23 -06:00
duncathan bc8dbbd627 travis issue? 2020-03-13 02:37:44 -06:00
duncathan 77ee541c56 increase version number 2020-03-13 02:23:17 -06:00
duncathan 763d43cd4b turns peri's image into a cs edit 2020-03-13 02:19:16 -06:00
duncathan salt 0606e54105
Merge pull request #95 from duncathan/linux
fix linux cse2
2020-03-13 02:05:13 -06:00
duncathan 2efcf8e911 fix linux cse2 2020-03-13 02:03:31 -06:00
duncathan 5645fe3064 update travis for release deployment (mac and linux only)
fix travis... again


update travis yml to match spec


skip cleanup


continued travis work for releases


reorder travis


messed up syntax


one day i'll figure this shit out


?


let's walk it back a step


icon replacement for windows


diff wine


seriously


maybe this way?


getting there


wineboot


run wine through xvfb


diff repo


apt-key


xvfb -a


wineprefix?


is sudo killing me


try try try


wineboot


no more xvfb


wineboot again


maybe?


mkdir


im just throwin things at the wall


docker


docker 2


wineconsole


WINDOWS???


fix


package name


is this necessary?


luarocks directory


PROPER proper lua directory


7zip x


debugs


cmd


cmd.exe


escape?


more cmd


bat file


more cmd.exe


hopefully this caches stuff


exact paths


install lua through pacman


mw


different luarocks


ooops


pray for cache


try again


conditionals


trailing semi


verbatim block


better cache


keep tryin


fix extract


use chocolate lua


update env


fafffffff


af


silly


windows style paths


self lua


windows path


this is a hack


this is all magic


hererocks again???


path


bat


ooooops


oops again


more path nonsense


lol


?


i don't understand


hmmm
Auto stash before rebase of "github/master"
afaooigasb


mingw


try try again


manual install libzip


i give up
2020-03-13 01:34:17 -06:00
duncathan 55fda5d4f9 increase version number 2020-03-08 22:31:19 -06:00
duncathan salt 79dcf36934
adds out of the box support for cse2 (#93)
Co-authored-by: duncathan <dunc@duncathan.com>
2020-03-08 22:25:16 -06:00
duncathan salt e77239387c
working on travis builds (#92)
* working on travis builds

* fix

* sudo

* install libzip

* ?

* dev

* hererocks

* idk man

* asda

* reorder

* source?

* sudo again

* etsts

* why won't activate work

* su

* no su

* manual path

* whoops

* use the proper build dir

* set up deployment (hopefully)

* proper release directory

* jk what is it

* should be this

* forgot one

Co-authored-by: duncathan <dunc@duncathan.com>
2020-03-08 22:07:58 -06:00
duncathan 13a503e696 hopefully fixes #87 2020-03-08 17:55:24 -06:00
duncathan 866e9d3ee0 special hints: fixes #89, fixes #83 2020-03-08 17:47:57 -06:00