Commit graph

576 commits

Author SHA1 Message Date
Gabriel Ravier
1d0129e681 Corrected formatting in Map.cpp
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-08 09:28:44 +02:00
Gabriel Ravier
71015da19b
Merge pull request #13 from Clownacy/master
Merge Clownacy/master into master
2019-05-07 20:17:19 +02:00
Clownacy
7918e6067d
Merge pull request #22 from GabrielRavier/improveBullet
Improve Bullet
2019-05-07 18:04:07 +00:00
Gabriel Ravier
4680607e59
Merge pull request #12 from Clownacy/master
Merge Clownacy/master into master
2019-05-07 19:34:12 +02:00
Gabriel Ravier
cc23ef2718 Corrected forgotten RECT formatting and made comment more accurate
Added a TODO note to emphasize the fact we don't actually know what Pixel did here

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-07 19:24:41 +02:00
Clownacy
c06b30c680
Merge pull request #23 from GabrielRavier/improveCToE
Improve files starting with C, D and E
2019-05-07 17:18:19 +00:00
Clownacy
cf6097d873
Merge pull request #21 from GabrielRavier/improveBoss
Improve Boss
2019-05-07 17:15:22 +00:00
Gabriel Ravier
edba2f176c Correct RECT formatting error I missed
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-07 19:07:01 +02:00
Gabriel Ravier
569c2c28b6 Fix bad RECT declaration spacing
Yes I'm that bad at search & replace

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-07 18:48:18 +02:00
Gabriel Ravier
f0e53b87e7 Correct RECT declaration formatting
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-07 18:20:31 +02:00
Gabriel Ravier
1b0ebfe25d Revert RECT formatting changes
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-07 18:10:54 +02:00
Gabriel Ravier
3d42044917 Corrected weird half-commented-out code
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-07 17:52:33 +02:00
Gabriel Ravier
ef00d064ab Reverted RECT formatting changes
That's actually how the code is supposed to be formatted

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-07 17:47:21 +02:00
Clownacy
b062d8af5b Add a missing PATH_LENGTH 2019-05-07 16:47:17 +01:00
Clownacy
cb730ff9d7 Merge branch 'master' of https://github.com/Clownacy/Cave-Story-Engine-2 2019-05-07 16:42:41 +01:00
Clownacy
a5dcebec01 Added some functions to the Devilution list 2019-05-07 16:42:19 +01:00
Clownacy
08de04bad7 Some accuracy-related things for Back.cpp 2019-05-07 16:35:41 +01:00
Clownacy
05949cb772
Merge pull request #20 from GabrielRavier/improveArmsItemAgain
Improve ArmsItem again
2019-05-07 14:27:24 +00:00
Clownacy
ef1164cd38
Merge pull request #19 from GabrielRavier/improveBackCpp
Improve Back
2019-05-07 14:26:56 +00:00
Gabriel Ravier
d75bee4eea Merge branch 'improveCToE' of https://github.com/GabrielRavier/Cave-Story-Engine-2 into improveCToE 2019-05-07 15:40:23 +02:00
Gabriel Ravier
e8875bd051 Redid formatting for files starting with [C-E]
Also fixed potentially erroneous macro MAX_STRIP (would have problems with operation order in operations)
Btw used regex "((//|\;)[^ \t]|(for|while|if|while|do|void|int|bool)\(|(for|while|if|while|do)\ \(.*\)\;|\(\ |\ \)|//\ [a-z])" for this

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-07 15:39:59 +02:00
Gabriel Ravier
7102e02fe2 Redid formatting for files starting with [C-E]
Also fixed potentially erroneous macro MAX_STRIP (would have problems with operation order in operations)

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-07 15:38:21 +02:00
Gabriel Ravier
8c9aac9594 Fixed declaration formatting
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-07 15:11:07 +02:00
Gabriel Ravier
b0ebfd3aa3 Fix RECT declaration indentation
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-07 15:04:45 +02:00
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
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
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
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
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