Commit graph

848 commits

Author SHA1 Message Date
Clownacy
f9b498c51c
Merge pull request #37 from GabrielRavier/feature/improveOToR
Improve O to R
2019-06-17 15:48:46 +00:00
Clownacy
a60e9b4ff2
Merge pull request #36 from GabrielRavier/feature/improveNonNpcCharNpcFiles
Improved N files
2019-06-17 15:44:31 +00:00
Clownacy
e9c42c6c30 Put back those dashes removed in the last commit
Whitespace selection apparently selects more than whitespace.
Thanks, Geany.
2019-06-16 20:29:38 +00:00
Clownacy
3f36bf52de CMake formatting cleanup 2019-06-16 19:36:59 +00:00
Clownacy
86c3c3f7db Fix mystery CMake error
It never happened for me, so maybe it's something that only happens
on older CMake versions? I haven't tested on my Raspberry Pi in a
while.
2019-06-16 19:33:30 +00:00
Gabriel Ravier
a89d97846c
Fixed brace initilizers to not have spaces at the start and end
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-06-14 21:22:45 +02:00
Gabriel Ravier
11e25b5aa5
Fixed indentation by using spaces instead of tabs when appropriate
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-06-14 20:56:48 +02:00
Gabriel Ravier
00fdea492f
Merge branch 'master' into feature/improveOToR 2019-06-14 20:33:26 +02:00
Gabriel Ravier
4ab849f4ef
Merge branch 'master' into feature/improveNonNpcCharNpcFiles 2019-06-14 20:33:23 +02:00
Gabriel Ravier
6a9f2cc1ff
Merge branch 'master' of https://github.com/Clownacy/Cave-Story-Engine-2 2019-06-14 18:11:05 +02:00
Clownacy
078da6ccf7 Correct fmod usage 2019-06-14 17:06:42 +01:00
Gabriel Ravier
fd83c08c9c
Added newline at end of NpcHit.cpp
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-06-14 17:50:07 +02:00
Gabriel Ravier
16e66971d5
Reformatted Profile.cpp
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-06-14 16:54:43 +02:00
Gabriel Ravier
5ccb7dfa93
Reformatted Pixtone.cpp
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-06-14 16:52:53 +02:00
Gabriel Ravier
473bd43ca7
Reformatted Organya.cpp
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-06-14 16:51:49 +02:00
Gabriel Ravier
3a80d8f4fb
Did initial sweep with regexes
Changed regex to "((//|\;)[^ \t\n]|(for|while|if|while|do|void|int|bool)\((for|while|if|while|do)\ \(.*\)\;|\(\ |\ \)|//\ [a-z]|\ \ )|break;\n[\t]*[^\n\t\}(\/\/ Fallthrough]|[^\t\n]\{[^\n]|[^\n\t]\}[^\n]|\,[^\ ]"

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-06-14 16:49:32 +02:00
Gabriel Ravier
620401b671
Merge branch 'master' of https://github.com/GabrielRavier/Cave-Story-Engine-2 2019-06-14 16:22:10 +02:00
Gabriel Ravier
e8c7daca35
Reverted capitalization of struct member names
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-06-14 08:37:49 +02:00
Gabriel Ravier
06e65cad6e
Revamped NpChar, NpcHit and NpcTbl
Also changed regex to "((//|\;)[^
\t\n]|(for|while|if|while|do|void|int|bool)\((for|while|if|while|do)\
\(.*\)\;|\(\ |\ \)|//\ [a-z]|\ \ )|break;\n[\t]*[^\n\t\}(\/\/
Fallthrough]|[^\t\n]\{[^\n]|[^\n\t]\}[^\n]"

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-06-13 20:39:46 +02:00
Gabriel Ravier
f9d62f38ef
Merge pull request #23 from Clownacy/master
Merge Clownacy/master into master
2019-06-12 19:44:23 +02:00
Clownacy
75f585a727 Made CMakeLists.txt cross-compile-friendly
bin2h is built natively
2019-06-08 18:27:57 +00:00
Clownacy
082ffeb04d Make CMake bin2h installable
Working towards making CMake CSE2 cross-compilation-friendly
2019-06-08 17:43:21 +00:00
Clownacy
73b99b6d78 Makefile cleanup, and improve cross-compilation support
bin2h should run on the host system, not the target
2019-06-08 17:42:12 +00:00
Clownacy
44094b103e <SDL.h> -> "SDL.h"
The SDL devs recommend this:
https://wiki.libsdl.org/FAQDevelopment#Do_I_.23include_.3CSDL.h.3E_or_.3CSDL.2FSDL.h.3E.3F
2019-06-06 18:51:44 +00:00
Clownacy
c80b593a3f Some #include fixes
Finally figured out how to get include-what-you-use working
2019-06-06 18:44:28 +00:00
Clownacy
0fb147aa0d Change the sound buffer size to a power of 2
Turns out giving SDL2 a non-power-of-2 buffer size crashes it in
Emscripten.
2019-05-29 18:49:09 +00:00
Cucky
d84c25062c
Merge pull request #80 from Clownacy/master
Improved accuracy and added a CMake build setup
2019-05-26 19:55:09 -04:00
Clownacy
d2b5872c95 Weeded out some bool usage
Cave Story was written in C89. No bools. I've left in Sound.cpp's
though, since that's written in C++98 currently.
2019-05-24 10:07:30 +01:00
Clownacy
5933a1201e Shut up a warning GCC was giving bin2h 2019-05-24 09:34:55 +01:00
Clownacy
50897e8ceb Move DoConfig_debug naming to the root CMakeLists.txt 2019-05-23 21:29:32 +01:00
Clownacy
5b89a31976 Split bin2h to its own CMake file
Also added warnings to its part of the Makefile
2019-05-23 19:42:52 +01:00
Clownacy
43958d2771 ...For real, this time 2019-05-23 14:28:44 +00:00
Clownacy
a4248b13e2 Fix broken stage centring 2019-05-23 14:15:30 +00:00
Clownacy
d1b71b9fce Add some more widescreen/tallscreen fixes to Frame.cpp
Like I said in the TODO, this *really* needs to be moved to the
enhanced branch
2019-05-23 14:04:21 +00:00
Clownacy
7db42b0b72 Set bin2h to C90 in the CMake file
Done to match the Makefile
2019-05-23 11:36:41 +00:00
Clownacy
21cef10e4b Fixed incorrect debug executable names 2019-05-23 11:10:11 +00:00
Clownacy
609d54916b Renamed debug builds to 'CSE2_debug' and 'DoConfig_debug'
Makes a bit more sense than 'CSE2d' and 'DoConfigd'
2019-05-22 00:29:16 +00:00
Clownacy
aa44e7ca49 Reduce the size of bin2h-generated .h files
The Japanese font went from 50MB to 25MB.
2019-05-21 16:56:44 +01:00
Clownacy
fcaddc6252 Added a missing #include to Draw.cpp 2019-05-20 15:03:15 +01:00
Gabriel Ravier
7578abafc5
Merge pull request #22 from Clownacy/master
Merge Clownacy/master into master
2019-05-18 20:38:26 +02:00
Clownacy
57b37e84de
Merge pull request #35 from GabrielRavier/feature/improveNpcAct
Improve NpcAct files
2019-05-16 10:31:52 +00:00
Gabriel Ravier
a312be2b4b
Cleaned up NpcAct340.cpp 2019-05-16 08:25:53 +02:00
Gabriel Ravier
c247de7686
Cleaned up NpcAct320.cpp 2019-05-16 08:21:52 +02:00
Gabriel Ravier
e5b499ee67
Cleaned up NpcAct300.cpp 2019-05-16 08:18:12 +02:00
Gabriel Ravier
f1048b21aa
Cleaned up NpcAct280.cpp 2019-05-16 08:11:17 +02:00
Gabriel Ravier
1e6ee2d6ba
Corrected stupid error in NpcAct260.cpp
Also changed regex to "((//|\;)[^ \t\n]|(for|while|if|while|do|void|int|bool)\((for|while|if|while|do)\ \(.*\)\|//\ [a-z]|\ \ )|break;\n[\t]*case|\ \)|\(\ "

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-16 08:03:45 +02:00
Gabriel Ravier
c64110cf05
Cleaned up NpcAct260.cpp
Also changed regex to "((//|\;)[^ \t\n]|(for|while|if|while|do|void|int|bool)\((for|while|if|while|do)\ \(.*\)\|\ \)|\(\ |//\ [a-z]|\ \ )|break;\n[\t]*case"
2019-05-16 07:20:01 +02:00
Gabriel Ravier
33071564a3
Started cleaning up NpcAct260.cpp 2019-05-15 21:42:20 +02:00
Gabriel Ravier
461d1cfda9
Merge pull request #21 from Clownacy/master
Merge Clownacy/master into master
2019-05-15 21:31:50 +02:00
Gabriel Ravier
1588fab110
Clean up NpcAct240.cpp 2019-05-15 21:28:38 +02:00