Commits · c72f501042e3bb412329e8638ee04c677bbd3e68 · STJr / SRB2

Nov 30, 2019
- Merge branch 'sandtnoflip' into 'master' · c72f5010
  MascaraSnake authored 5 years ago
  
  S&T no flip See merge request STJr/SRB2Internal!571
  c72f5010
- Merge branch 'finalcountdown' into 'master' · 6bbc412e
  MascaraSnake authored 5 years ago
  
  The final countdown (resolves #400). Closes #400 See merge request STJr/SRB2Internal!574
  6bbc412e
- Merge branch 'mapinter' into 'master' · 8a3c7da1
  MascaraSnake authored 5 years ago
  
  Intermission Buffer Clear On Map Command (no funny name today) See merge request STJr/SRB2Internal!570
  8a3c7da1
- Merge branch 'newintro' into 'master' · 3bddd436
  MascaraSnake authored 5 years ago
  
  New intro graphics See merge request STJr/SRB2Internal!524
  3bddd436
- Merge branch 'flagreturncomplete' into 'master' · 526a75d2
  MascaraSnake authored 5 years ago
  
  Flag return completion (resolve #396). Closes #396 See merge request STJr/SRB2Internal!572
  526a75d2
- Make INTRO4 display at high res · 916fec2c
  lachwright authored 5 years ago
  
  916fec2c
- Merge branch 'master' into newintro · d88eef3e
  lachwright authored 5 years ago
  
  d88eef3e
Nov 29, 2019
- Actually, wait; this is way better and cleaner. · fdcc8c91
  toaster authored 5 years ago
  
  fdcc8c91
- Match final countdown timer to timer (resolves #400 ). · ed0529b9
  toaster authored 5 years ago
  
  ed0529b9
- Prevent exit sectors having any effect whatsoever outside of platform gametypes (resolve #396 ). · 92f8c002
  toaster authored 5 years ago
  
  92f8c002
- Don't flip P1 of a two-character save card, for aesthetique reasons. · 960ee7fe
  toaster authored 5 years ago
  
  960ee7fe
- Fix screen buffer not being cleared if a map command is used during the intermission. · cbc49882
  toaster authored 5 years ago
  
  cbc49882
Nov 28, 2019
- Merge branch 'endelinger' into 'master' · bc00380a
  MascaraSnake authored 5 years ago
  
  Endelinger (resolves #384). Closes #384 See merge request STJr/SRB2Internal!569
  bc00380a
- Merge branch 'sleepwalkin' into 'master' · ebcb17d6
  MascaraSnake authored 5 years ago
  
  Sleepwalkin (resolves most of #382) Closes #382 See merge request STJr/SRB2Internal!567
  ebcb17d6
- Holy shit · ccbb1221
  James R. authored 5 years ago
  
  ccbb1221
- Merge branch 'campokes' into 'master' · 2495e58b
  MascaraSnake authored 5 years ago
  
  Camera pokes (resolves #359, #363, and #383). Closes #359, #363, and #383 See merge request STJr/SRB2Internal!566
  2495e58b
- Update ending cutscene(s) to linger for an additional two seconds, so that the... · f5dd0c5c
  toaster authored 5 years ago
  
  Update ending cutscene(s) to linger for an additional two seconds, so that the music can properly fade out (resolves #384).
  f5dd0c5c
- Merge branch 'mpspecfix2' into 'master' · 546c54b3
  MascaraSnake authored 5 years ago
  
  Counting spheres (resolves #378). Closes #378 See merge request STJr/SRB2Internal!564
  546c54b3
Nov 27, 2019
- Merge branch 'exit-move-fixes' into 'master' · 9146888c
  LJ Sonic authored 5 years ago
  
  Keep counting players as finished even after dying See merge request STJr/SRB2Internal!568
  9146888c
- Keep counting players as finished even after dying · ec69195f
  LJ Sonic authored 5 years ago
  
  ec69195f
- Change required for Tails' tails to behave like falling sprite. · 803b22a3
  toaster authored 5 years ago
  
  803b22a3
- Change SPR_NFLT default to superised SPR2_FALL (resolves code side of #382 ). · 7ff218ef
  toaster authored 5 years ago
  
  7ff218ef
- Fix camera not being flipped when camera is stopped due to game design hack... · ae842467
  toaster authored 5 years ago
  
  Fix camera not being flipped when camera is stopped due to game design hack reasons (resolves #383).
  ae842467
- Merge branch 'exit-move-lj' into 'master' · c29540a2
  LJ Sonic authored 5 years ago
  
  No more drowning with exitmove now. See merge request STJr/SRB2Internal!563
  c29540a2
- Correct tutorialmode case doubling up on camerascale. · bcbf5e7c
  toaster authored 5 years ago
  
  bcbf5e7c
- Make camerascale have no effect in 2D mode (resolves #359 and resolves #363 ). · 7ff4a9b1
  toaster authored 5 years ago
  
  7ff4a9b1
- Resolve #378 , because I knew as soon as I saw that issue name that it was my fault. · a3050063
  toaster authored 5 years ago
  
  a3050063
Nov 26, 2019

Merge branch 'continuequestionmark' into 'master' · 9a1dd067
MascaraSnake authored 5 years ago
```
Continue?

See merge request STJr/SRB2Internal!562
```
9a1dd067
Merge branch 'burningpoint' into 'master' · c8c52315
MascaraSnake authored 5 years ago
```
Burning points (resolves #373).

Closes #373

See merge request STJr/SRB2Internal!561
```
c8c52315

Merge branch 'ballstuck' into 'master' · 3aa72c55

MascaraSnake authored 5 years ago

BALL STUCK!! BALL!!!! STUCK!!!!!! (Resolve #374)

Closes #374

See merge request STJr/SRB2Internal!560

3aa72c55

Merge branch 'deadstuff' into 'master' · 07afb52a
MascaraSnake authored 5 years ago
```
Matters of mortality

See merge request STJr/SRB2Internal!558
```
07afb52a
Merge branch 'bottweaks' into 'master' · b98b5667
MascaraSnake authored 5 years ago
```
Bot fixes

See merge request STJr/SRB2Internal!557
```
b98b5667
Merge branch 'unslide' into 'master' · e49e91c3
MascaraSnake authored 5 years ago
```
Unslide (resolves #369).

Closes #369

See merge request STJr/SRB2Internal!556
```
e49e91c3

MascaraSnake is a bully and will make a pariah out of me in front of his... · c55a6cb3

toaster authored 5 years ago

MascaraSnake is a bully and will make a pariah out of me in front of his doctoral student colleagues if I don't change this

c55a6cb3

Now we have mixed case level title font, and since we had a question mark... · d56a117a

toaster authored 5 years ago

Now we have mixed case level title font, and since we had a question mark graphic in that for a while, make the continue screen a tad nicer.

d56a117a

Move the fireball despawn to later so its target/tracer isn't nulled until... · fa01a32a

toaster authored 5 years ago

Move the fireball despawn to later so its target/tracer isn't nulled until AFTER the enemy it touches is killed, allowing for correct point delivery (resolves #373).

fa01a32a

Resolve #374 . · 613ae0c9
toaster authored 5 years ago

613ae0c9
Merge branch 'cc-jingles' into 'master' · e48dea42
MascaraSnake authored 5 years ago
```
Fix stuck closed captioning with no audio

See merge request STJr/SRB2Internal!555
```
e48dea42

Change the default value of cv_coopstarposts (as per #321 ), and make it NOT a... · f50feb16

toaster authored 5 years ago

Change the default value of cv_coopstarposts (as per #321), and make it NOT a cheat to change since the other options are in effect more restrictive. (Leaving cv_cooplives at its current value for now, though.)

f50feb16

* Prevent that GOD AWFUL random camera turn that happens sometimes during the... · b71cf97c

toaster authored 5 years ago

* Prevent that GOD AWFUL random camera turn that happens sometimes during the fade after you die (when you input camera turn stuff after death) by locking the camera during PST_REBORN.
* Remove whitespace in P_DeathThink.

b71cf97c