Commit graph

601 commits

Author SHA1 Message Date
Gabriel Ravier
0e5bcf26e0 Revert MapName.cpp to Shift-JIS
Also "optimised" is valid english lol

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-08 19:38:11 +02:00
Gabriel Ravier
c6bcbeab2f Revert "corrections" of "colour" to "color", makes style inconsistent though :(
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-08 18:01:15 +02:00
Gabriel Ravier
953b2990ce Corrected new line mistake
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-08 17:43:27 +02:00
Gabriel Ravier
70818bd58c Some orthograph corrections
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-08 12:19:15 +02:00
Gabriel Ravier
052e018063 Corrected formatting for MycParam.cpp
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-08 11:29:44 +02:00
Gabriel Ravier
ee5f3e3ef7 Corrected formatting for MycHit.cpp
Also changed regex to "((//|\;)[^ \t]|(for|while|if|while|do|void|int|bool)\(|(for|while|if|while|do)\ \(.*\)\;|\(\ |\ \)|//\ [a-z]|\ \ )"

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-08 11:25:17 +02:00
Gabriel Ravier
66a4805ceb Corrected formatting in MyChar.cpp
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-08 11:19:03 +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
Clownacy
260d245e4c Made NpcTbl.cpp ASM-accurate 2019-05-07 20:59:25 +01: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
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
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