Commit graph

708 commits

Author SHA1 Message Date
Gabriel Ravier
e7b2bc0726 Merge branch 'master' into improveF 2019-05-08 10:46:27 +02:00
Gabriel Ravier
992bf692da Merge branch 'master' into makeFlagsMacros 2019-05-08 10:45:58 +02:00
Gabriel Ravier
4998dfa008 Merge branch 'master' of https://github.com/GabrielRavier/Cave-Story-Engine-2 2019-05-08 10:43:53 +02:00
Gabriel Ravier
008c7054a9
Merge pull request #15 from Clownacy/master
Merge Clownacy/master into master
2019-05-08 10:43:47 +02:00
Clownacy
ce3a09ee03
Merge pull request #5 from GabrielRavier/addSomeMoreStuffToGitIgnore
Add .out files to .gitignore, removed VS Code stuff and changed a few comments
2019-05-08 08:25:00 +00:00
Gabriel Ravier
3b1c3d997a Put *.out only for build_en/jp instead of globally
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-08 10:23:49 +02:00
Gabriel Ravier
9ed2cdc9f1 Correct comment spacing and convert MapName.cpp to UTF-8
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-08 09:39:08 +02:00
Gabriel Ravier
2f15c23277 Add note to comment and correct other comment
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-08 09:37:06 +02:00
Gabriel Ravier
846d34eaf1 Corrected formatting in MapName.cpp
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-08 09:35:36 +02:00
Gabriel Ravier
b19733f47e Correct formatting in Main.cpp
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-08 09:30:14 +02:00
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
37e29f330f Fix comments in Input.cpp
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-08 09:03:56 +02:00
Gabriel Ravier
e6e780f3d2 Properly tab pPtpTable
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-08 09:03:56 +02:00
Gabriel Ravier
3d94702bea Fix parentheses and comments in Game.cpp, Generic.cpp
Also fixed formatting for a break (two spaces instead of a tab)

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-08 09:03:56 +02:00
Gabriel Ravier
e294162040 Fixed some comment formatting in Flags.cpp
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-08 09:01:04 +02:00
Gabriel Ravier
182dda4dd9 Correct comment formatting in Frame.cpp
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-08 09:00:41 +02:00
Gabriel Ravier
808df2b720 Added a newline for a weird for and added a space after a comment in Font.cpp
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-08 09:00:41 +02:00
Gabriel Ravier
7a3bea3c0a Change Flags.cpp to use macros
Pixel probably did this tbh

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-08 08:34:22 +02:00
Gabriel Ravier
2990db9622 Added a few comments to some bosses
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-08 08:24:01 +02:00
Clownacy
260d245e4c Made NpcTbl.cpp ASM-accurate 2019-05-07 20:59:25 +01:00
Gabriel Ravier
32b678a9ba Merge branch 'master' into addBetterMakefileDebugFlags 2019-05-07 20:21:30 +02:00
Gabriel Ravier
d3ae0df01a Merge branch 'master' into addSomeMoreStuffToGitIgnore 2019-05-07 20:20:45 +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
54ee8d1347 Merge branch 'master' into addBetterMakefileDebugFlags 2019-05-07 19:43:38 +02:00
Gabriel Ravier
151c51eacb Merge branch 'master' into addSomeMoreStuffToGitIgnore 2019-05-07 19:39:15 +02: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