Commit graph

609 commits

Author SHA1 Message Date
Clownacy
f8d4ae7014 Made Stage.cpp ASM-accurate 2019-05-07 13:52:50 +01:00
Gabriel Ravier
2fd3ed2245 Fix declarations formatting (to be consistent)
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-07 14:49:35 +02:00
Gabriel Ravier
c7c40fa24a Fixed comments and spacing in boss files
Add spaces for comments
Remove spaces in "( expr )" things

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-07 14:31:06 +02:00
Clownacy
666269029d Made Config.cpp ASM-accurate 2019-05-07 13:18:32 +01:00
Gabriel Ravier
1ed1597c07 Properly made .out files be filtered (and some other stuff)
Changed a few notes (such as for exes or for converted res files
Removed VS Code stuff because this is the kind of stuff that should go into people's global .gitignore and not in local ones

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-07 14:14:06 +02:00
Gabriel Ravier
0e4319a333 Fixed bad .gitignore ignores
(It ignored outdated executables)

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-07 14:09:41 +02:00
Gabriel Ravier
1790f74857 Removed bad parentheses spacing
Basically for all "( expr )" I removed the spaces to be consistent with the rest
Also I used this enormous regex here : "((//|\;)[^ \t]|(for|while|if|while|do|void|int|bool)\(|(for|while|if|while|do)\ \(.*\)\;|\(\ |\ \))"

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-07 14:07:07 +02:00
Gabriel Ravier
0f7afa7401 Fixed comment formatting in BossOhm.cpp
(intended to do this for all bosses but found nothing lol)

(btw changed my regex to "((//|\;)[^ \t]|(for|while|if|while|do|void|int|bool)\(|(for|while|if|while|do)\ \(.*\)\;)")

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-07 12:54:21 +02:00
Gabriel Ravier
4f208b3b8e Make comment style consistent
Just added a space if there was no space after "//"

Also I changed my regex to "((//|\;)[^ ]|(for|while|if|while|do|void|int|bool)\(|(for|while|if|while|do)\ \(.*\)\;)"

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-07 12:44:32 +02:00
Gabriel Ravier
79d9abe002 Merge branch 'master' into addSomeMoreStuffToGitIgnore 2019-05-07 12:15:37 +02:00
Gabriel Ravier
44edb7d26e
Merge pull request #11 from Clownacy/master
Merge Clownacy/master into master
2019-05-07 12:08:40 +02:00
Clownacy
f204e14291
Merge pull request #18 from GabrielRavier/fixTrailingSpacesAndAddNewLinesAtEndOfFile
Fix trailing spaces and add newlines at end of file
2019-05-07 10:03:00 +00:00
Gabriel Ravier
960fa6f456 Removed all trailing spaces and added newline at EOF (when not present)
Also changed a "linux" to "Linux"

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-07 11:55:42 +02:00
Clownacy
243942c016
Merge pull request #17 from GabrielRavier/armsItemImprove
Improve ArmsItem.cpp
2019-05-07 09:27:36 +00:00
Gabriel Ravier
0ed6891879 Added a few comments and corrected a few things
Also removed a few trailing spaces
Also added spaces after // and ; where it improves readability (also yes I used a regex for this : "(//|\;)[^\ ]")

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-07 11:06:53 +02:00
Gabriel Ravier
2e02e8b8e2 Merge branch 'master' into addSomeMoreStuffToGitIgnore 2019-05-06 21:29:53 +02:00
Gabriel Ravier
1f055ccfe8
Merge pull request #9 from Clownacy/master
Merge Clownacy/master into master
2019-05-06 21:27:06 +02:00
Clownacy
25e68bfb9d Mark string pointers as const 2019-05-06 20:18:24 +01:00
Clownacy
421a3c46cd Made signed chars explicit
The default sign varies between hardware.

Text seems to always be ambiguously 'char', so I've left those
2019-05-06 20:04:47 +01:00
Clownacy
6816f92b6d Fix error 2019-05-06 18:13:22 +01:00
Clownacy
c9ac9d446d Made Shoot.cpp ASM-accurate 2019-05-06 18:09:19 +01:00
Clownacy
75e062c775 Made Caret.cpp ASM-accurate 2019-05-06 17:23:18 +01:00
Clownacy
0eaca9966c Made Bullet.cpp ASM-accurate 2019-05-06 16:49:52 +01:00
Gabriel Ravier
45b64a9a03 Merge branch 'addSomeMoreStuffToGitIgnore' of https://github.com/GabrielRavier/Cave-Story-Engine-2 into addSomeMoreStuffToGitIgnore
# Conflicts:
#	.gitignore

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-06 13:07:43 +02:00
Gabriel Ravier
c4fec6596c Merge master into addSomeMoreStuffToGitIgnore
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-06 13:06:16 +02:00
Gabriel Ravier
45cde7e4a3
Merge pull request #7 from Clownacy/master
Merge Clownacy/master into master
2019-05-06 10:07:10 +02:00
Clownacy
a8c4955b75 Made BulHit.cpp ASM-accurate 2019-05-06 00:00:10 +01:00
Clownacy
dea995ffe6 Made Boss.cpp ASM-accurate 2019-05-05 19:16:09 +01:00
Clownacy
626dcdf34e Remove disclaimer
Last I checked, 'guilty until proven innocent' is a bad thing.
I shouldn't have to explain something you can figure out with some
basic research.
2019-05-05 15:01:30 +01:00
Clownacy
2c9d04d439 Point out that dependencies will be built if they're not present 2019-05-05 15:00:50 +01:00
Clownacy
f60e5cbf47
Merge pull request #9 from GabrielRavier/correctGitIgnore
Correct errors in .gitignore
2019-05-05 13:48:11 +00:00
Clownacy
6ef6f0f5c0 Tweak how FORCE_LOCAL_LIBS works 2019-05-05 14:19:40 +01:00
Clownacy
ef8618d446 .gitignore the converted resource files 2019-05-05 14:09:18 +01:00
Gabriel Ravier
74f8a12632
Merge pull request #6 from Clownacy/master
Merge Clownacy/master into master
2019-05-05 15:08:07 +02:00
Clownacy
a6ac6787d3 Embed the fonts in the EXE
Now CSE2.exe should be drop-in replacement for Doukutsu.exe, with
no extra files needed.
2019-05-05 14:03:16 +01:00
Gabriel Ravier
b3cb19f70c Slight comment correction
"direcory" to "directory"
Add "Include" note to be consistent (for exclusions)

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-05 14:43:42 +02:00
Clownacy
1f179f9287 Remove some clutter from the .gitignore
Only Cucky ever used this
2019-05-05 03:20:11 +01:00
Clownacy
6dc85875ff Changed output executable naming scheme
Now the Makefile and CMake build systems are identical:

Release builds are named CSE2, and debug builds are named CSE2d.

Language no longer has an effect on filename for the Makefile.
2019-05-05 03:14:58 +01:00
Clownacy
36119082d2 Remove CMAKE_BUILD_TYPE defaulting
It's annoying, but vcpkg *really* didn't agree with it (it would just
build Debug anyway). The instructions provided with the repo already
tell you to manually define Release builds anyway.
2019-05-05 02:55:54 +01:00
Clownacy
1d064204d5 This #include is needless 2019-05-05 02:38:38 +01:00
Clownacy
ddf61dd791 Added Wave.dat's original file extension
beebd77d73/source/Sound.cpp (L477)

Thank goodness for the Org2 source release
2019-05-05 02:20:37 +01:00
Clownacy
f7c1ca86c3 Remove Resource.cpp's dependence on SDL2
This also makes its API a lot more similar to Windows'
2019-05-05 01:57:23 +01:00
Clownacy
58a3974e1a Added an accuracy improvement
It affects portability though, so it's hidden behind the NONPORTABLE
flag.
2019-05-04 21:39:16 +00:00
Clownacy
dc0f242f25 Made clamp macro safer 2019-05-04 21:37:06 +00:00
Clownacy
d2f1b2c1a9 Renamed some of the resource files
The Linux port's get_resource function seems to be using the original
filenames, rather than the 8.3 filenames used by the Windows EXE's
resource system. Too bad it doesn't tell us the original file extensions.
2019-05-04 18:26:41 +01:00
Clownacy
b83365f09b
Merge pull request #4 from GabrielRavier/autoNormalizeLineEndings
Automatically normalize line endings
2019-05-03 13:37:20 +01:00
Gabriel Ravier
6d624396ff Added *.out files to executable formats that are filtered out
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-03 13:54:43 +02:00
Gabriel Ravier
d854004463 Added .gitattributes for normalisation and normalized a few sources files to LF (from CRLF)
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-03 12:27:11 +02:00
Gabriel Ravier
94ed000beb
Merge pull request #4 from Clownacy/master
Merge Clownacy/master into master
2019-05-03 11:56:49 +02:00
Clownacy
c52004a1b3 Add a missing #include 2019-05-03 01:40:52 +01:00