Commit graph

1216 commits

Author SHA1 Message Date
Gabriel Ravier
fcc1e3cc23
Added some common macro utilities used by most NPCs
I'm pretty sure Pixel didn't actually use macros for this but I don't think just having this kind of stuff copied around everywhere is really great either

Forgot to commit and push this yesterday

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-15 10:48:18 +02:00
Gabriel Ravier
041bd0e5f9
Used doubles for TILES_TO_UNITS weirdly written stuff
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-14 20:47:28 +02:00
Gabriel Ravier
ac498c2be4
After intense debate with Cucky and BLink, ended up changing "PIXELS_TO_UNITS(3) - 1" to "0x5FF"
🙄

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-14 20:07:35 +02:00
Gabriel Ravier
e2c57e6dbc
Alphabetized macros in BossFrog and re-ordered some stuff to go along with Clownacy's coding standards
Also changed NPC_NULL_DELETES_ITSELF to NPC_DAMAGE_TEXT_HOLDER as Fayti pointed out the misnomer

Note to self : Make a PR with coding standards

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-13 20:35:37 +02:00
Gabriel Ravier
aeb1e292b7
Merge branch 'accurate' into commentBalfrog 2019-09-13 19:01:03 +02:00
Gabriel Ravier
8329ec2d16
Merge branch 'accurate' of https://github.com/GabrielRavier/Cave-Story-Engine-2 into accurate 2019-09-13 19:00:32 +02:00
Gabriel Ravier
9bef4b1d49
Commented BossFrog entirely
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-13 18:49:17 +02:00
Clownacy
69292f99f6 Add a new bugfix 2019-09-12 14:50:06 +00:00
Gabriel Ravier
861064bf12
Started improving on balfrog.cpp
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-12 16:47:14 +02:00
Clownacy
5c040608cb
Merge pull request #53 from GabrielRavier/betterCMakeMessages
Improve some comments and the option message for the renderer in the CMakeLists.txts
2019-09-11 18:03:37 +01:00
Clownacy
182f11f017 Fix controller support
Pressing up or down wouldn't work.
2019-09-11 17:51:20 +00:00
Gabriel Ravier
c9b248ba64
Removed space before ':' and re-added comma before or
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-11 19:01:36 +02:00
Clownacy
09ed7a9a9f Capitalise the readme's title suffix 2019-09-11 13:10:19 +00:00
Clownacy
8e8f18a1ee Having second thoughts about this style change 2019-09-11 13:07:55 +00:00
Clownacy
1f5d37a938 Merge branch 'accurate' into portable 2019-09-11 13:03:53 +00:00
Gabriel Ravier
dd190bd276
Remove option change, wrote "cross-gcc" as "cross-GCC" and "mingw" as "MinGW"
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-11 14:32:48 +02:00
Gabriel Ravier
d686152e84
Fixed question not being a question, "Emscriptem" and saying "cross-compiled" twice
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-11 14:11:01 +02:00
Gabriel Ravier
7176bcab9e
Added more detail to the cross-compile comment
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-11 13:37:34 +02:00
Gabriel Ravier
d4ce0839bb
Forgot endif() in bin2h/CMakeLists.txt
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-11 13:33:09 +02:00
Clownacy
5fd6d3dd60
Merge pull request #52 from GabrielRavier/improveDoConfig
Improve DoConfig
2019-09-11 11:11:15 +01:00
Gabriel Ravier
b10d895334
Changed public-private indentation
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-11 12:02:57 +02:00
Gabriel Ravier
69cb6b75c7
Reformatted DoConfig
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-11 11:49:58 +02:00
Gabriel Ravier
2b2db48588
Some slight formatting
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-11 09:35:50 +02:00
Gabriel Ravier
47fbf3ece7
Refactored DoConfig a bit
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-11 09:27:54 +02:00
Gabriel Ravier
a9f95ed1a2
Changed some comments and messages in CMakeLists.txt
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-11 08:24:00 +02:00
Clownacy
949bfd129b Allow SDL2 to change the audio frequency
The mixer can handle arbitrary frequencies, so there's no point in
forcing SDL2 to use 44100Hz.
2019-09-10 22:11:31 +00:00
Clownacy
88f22510ee Fix crash when AudioBackend_Init fails
Similar checks existed in the original code (see the accurate
branch), but they were removed in the Organya source code release, so
I figured they were useless. Turns out they're not.

Fixes #48.
2019-09-10 17:59:54 +00:00
Gabriel Ravier
75baabf934
Merge branch 'accurate' of https://github.com/GabrielRavier/Cave-Story-Engine-2 into accurate 2019-09-10 16:19:08 +02:00
Clownacy
aede7b6069 Restore the FREQUENCY constant
Cave Story at 2000Hz is fun
2019-09-10 14:04:06 +00:00
Clownacy
00d0161832 Make DoConfig use the Config.dat in its directory
This is accurate to how the original DoConfig does it.
2019-09-10 13:48:17 +00:00
Clownacy
7ac0fa91a2
Add a list of branches to the readme 2019-09-10 13:27:32 +00:00
Clownacy
657b586cd1 Add missing #include to audio backend
Another GabrielRavier fix.
2019-09-10 12:36:55 +00:00
Clownacy
d1595d536b Merge branch 'accurate' into portable 2019-09-10 12:35:31 +00:00
Clownacy
5430ccaabf Fix uncommented comment in .gitignore
Thanks again to GabrielRavier.
2019-09-10 12:33:07 +00:00
Clownacy
3889bd9f1d Add missing #include to Draw.cpp
Thanks to GabrielRavier for noticing.
2019-09-10 12:31:38 +00:00
Clownacy
60bc16b161 Make CMake ignore if FLUID can't be found
Fixes #45
2019-09-10 12:23:50 +00:00
Clownacy
c60cdb3610 Make CMake detect static SDL2 installations
Fixes #46
2019-09-10 12:23:09 +00:00
Clownacy
0510e017e1 Merge branch 'accurate' into portable 2019-09-10 02:03:58 +00:00
Clownacy
2cb7bfbd3d Tiny cleanup 2019-09-10 01:59:26 +00:00
Clownacy
355b303635 Shut up some warnings 2019-09-10 01:53:19 +01:00
Clownacy
751daaf42f Ignore another VS2017 file 2019-09-10 01:27:12 +01:00
Clownacy
271f86e009 Add 64-bit targets to VS2017 project 2019-09-10 01:25:47 +01:00
Clownacy
385d7e5844 Clean up Back.cpp a little 2019-09-10 01:04:09 +01:00
Clownacy
9ca503a96e Add Visual Studio 2017 project files
This required hacking-in DirectInput8 support since Visual Studio
hasn't supported DirectInput7 and earlier since 2007.
2019-09-10 00:43:23 +01:00
Clownacy
a81fe10fc7 Move Visual Studio 2003 files to their own folder
We don't want these conflicting with the upcoming Visual Studio 2017
files.
2019-09-10 00:41:32 +01:00
Clownacy
f8c2e17655 Clean up Map.cpp 2019-09-09 23:46:35 +01:00
Clownacy
c368734a5c Fix the resource file in MinGW-w64
I hate all these headers
2019-09-09 23:43:48 +01:00
Clownacy
3eb346ce10 Synchronise the audio callback with Organya
This is the 'perfect' Organya playback I mentioned in the commit
message for 5ea356a3bd
2019-09-09 21:43:33 +00:00
Clownacy
a076274864 Make a clamp macro safer 2019-09-09 20:24:09 +00:00
Gabriel Ravier
c492f9add1
Merge Clownacy/accurate into accurate (#28)
Merge Clownacy/accurate into accurate
2019-09-09 20:53:22 +02:00