Gabriel Ravier
|
929adaabf0
|
Merge branch 'master' into makeFlagsMacros
|
2019-05-10 08:49:26 +02:00 |
|
Gabriel Ravier
|
38114d2fee
|
Merge branch 'master' into improveGToK
|
2019-05-10 08:46:46 +02:00 |
|
Gabriel Ravier
|
b706209bd1
|
Correct some orthograph and some formatting
I hope "cliprect" isn't actually a word or something
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
|
2019-05-10 08:46:41 +02:00 |
|
Gabriel Ravier
|
82dc512539
|
Merge pull request #16 from Clownacy/master
Merge Clownacy/master into master
|
2019-05-10 08:38:21 +02:00 |
|
Clownacy
|
25085ca6de
|
Fix DoConfig's gamepad button mapping
It didn't match the real DoConfig at all
|
2019-05-09 19:21:18 +01:00 |
|
Clownacy
|
e4b120959c
|
Merge pull request #26 from Moocow9m/patch-1
Fix DoConfig read
|
2019-05-09 17:59:09 +00:00 |
|
Clownacy
|
db96e7de94
|
Useless #include
|
2019-05-09 18:46:41 +01:00 |
|
Clownacy
|
b5699d9760
|
SDL's docs specifically calls these 'scancodes' not 'scan codes'
|
2019-05-09 18:45:28 +01:00 |
|
Moocow9m
|
bb829bfc82
|
Fix DoConfig read
DoConfig shifts all joypad variables up by one each save. This fixes that.
|
2019-05-08 11:46:46 -07:00 |
|
Clownacy
|
9f181c1864
|
Merge pull request #25 from GabrielRavier/improveM
Improve files starting with M
|
2019-05-08 18:40:00 +00:00 |
|
Gabriel Ravier
|
2578302bb5
|
Reverted formatting change Clownacy didn't like
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
|
2019-05-08 19:42:24 +02:00 |
|
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 |
|
Clownacy
|
e925880f5b
|
Fixed VS 2017 WinXP builds when using local libs
Turns out vcpkg enables this for its build too.
|
2019-05-08 15:06:51 +01: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
|
46d4d1b095
|
Merge branch 'master' into addBetterMakefileDebugFlags
|
2019-05-08 10:49:47 +02:00 |
|
Gabriel Ravier
|
216fa2d3f7
|
Merge branch 'master' into addCommentsToBosses
|
2019-05-08 10:49:21 +02:00 |
|
Gabriel Ravier
|
d70ab6045d
|
Merge branch 'master' into improveGToK
|
2019-05-08 10:46:51 +02:00 |
|
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 |
|