Alam Ed Arias
|
13e4537dd7
|
Merge branch 'EOL-10' into EOL
|
2018-11-27 20:44:28 -05:00 |
|
Alam Ed Arias
|
351b3385d0
|
fix EOL on src/p_enemy.c
|
2018-11-27 20:41:27 -05:00 |
|
Alam Ed Arias
|
720cefbf69
|
Merge branch 'EOL-9' into EOL
|
2018-11-27 20:40:30 -05:00 |
|
Alam Ed Arias
|
f8aae10064
|
fix EOL on src/p_enemy.c
|
2018-11-27 20:38:59 -05:00 |
|
Alam Ed Arias
|
d89b38a05c
|
Merge branch 'EOL-8' into EOL
|
2018-11-27 20:37:22 -05:00 |
|
Alam Ed Arias
|
b7eda67e07
|
fix EOL on src/p_enemy.c
|
2018-11-27 20:36:00 -05:00 |
|
Alam Ed Arias
|
6ef394aa1a
|
Merge branch 'EOL-7' into EOL
|
2018-11-27 20:28:25 -05:00 |
|
Alam Ed Arias
|
1780ae7611
|
fix EOL on src/p_enemy.c
|
2018-11-27 20:26:42 -05:00 |
|
Alam Ed Arias
|
a8fc90c18a
|
Merge branch 'EOL-6' into EOL
|
2018-11-27 20:25:29 -05:00 |
|
Alam Ed Arias
|
3f09f50f49
|
fix EOL on src/p_enemy.c
|
2018-11-27 20:24:05 -05:00 |
|
Alam Ed Arias
|
246193e81e
|
Merge branch 'EOL-5' into EOL
|
2018-11-27 20:22:22 -05:00 |
|
Alam Ed Arias
|
96192a4f20
|
fix EOL on src/p_enemy.c
|
2018-11-27 20:19:50 -05:00 |
|
Alam Ed Arias
|
2d84877ce4
|
Merge branch 'EOL-4' into EOL
|
2018-11-27 20:17:52 -05:00 |
|
Alam Ed Arias
|
f5b5fb47f3
|
fix EOL on src/p_enemy.c
|
2018-11-27 20:12:53 -05:00 |
|
Alam Ed Arias
|
001b0eb6f3
|
Merge branch 'EOL-3' into EOL
|
2018-11-27 20:12:21 -05:00 |
|
Alam Ed Arias
|
9dfb32602c
|
fix EOL on src/p_enemy.c
|
2018-11-27 20:08:23 -05:00 |
|
Alam Ed Arias
|
5270d1c535
|
Merge branch 'EOL-2' into EOL
|
2018-11-27 20:05:07 -05:00 |
|
Alam Ed Arias
|
634518d7d7
|
fix EOL on p_enemy.c
|
2018-11-27 17:21:18 -05:00 |
|
Alam Ed Arias
|
73d61e8858
|
fix EOL on p_enemy.c
|
2018-11-27 17:15:55 -05:00 |
|
Monster Iestyn
|
e662d6cbf1
|
Since there is only one type of the old spikeball that doesn't rotate, there is no point using A_RotateSpikeBall in its states anymore.
Likewise, A_RotateSpikeBall no longer has to care about the object type of the actor, for the same reason.
|
2018-07-01 22:01:00 +01:00 |
|
Monster Iestyn
|
a23d5cf101
|
huh, no wonder the two FHZ ice types looked the same in objectplace; they were using the same spawnstate it seems
|
2018-07-01 19:47:26 +01:00 |
|
Monster Iestyn
|
a1f742a0d4
|
Fix special stage map end var defaults to use the correct map numbers
|
2018-06-30 18:14:04 +01:00 |
|
Monster Iestyn
|
90b56b7386
|
Don't re-enable MD5 checks yet, we're not even near RC phase yet
|
2018-06-30 18:09:39 +01:00 |
|
toaster
|
4c3be6a577
|
Rework software coronas a bit, apply them to the flame and flame holder too, and spawn them only if MTF_EXTRA is given.
|
2018-06-19 23:16:49 +01:00 |
|
toaster
|
af3c0bc8e4
|
* Fix nextstate, radius, and painchance of fire torch decoration.
* Fix waving flag object type's... flags. *womp womp*
|
2018-06-19 21:58:49 +01:00 |
|
toaster
|
d655359544
|
Fixing dehacked.c consistency.
|
2018-06-13 18:10:32 +01:00 |
|
toaster
|
05afb28b57
|
Fix the starposts not being cleared properly.
|
2018-06-12 02:26:42 +01:00 |
|
toaster
|
653d6112e8
|
Fix all the Floral Fieldsing pv2 discovered.
|
2018-06-12 01:08:03 +01:00 |
|
toaster
|
fa82bb11db
|
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into hardcoding-time-again
|
2018-06-12 00:57:21 +01:00 |
|
Monster Iestyn
|
837ad5bcb1
|
Merge branch 'public_flatsprite'
# Conflicts:
# src/hardware/hw_main.c
# src/r_things.c
|
2018-06-11 19:53:16 +01:00 |
|
Monster Iestyn
|
f92a8c7f1e
|
Merge branch 'public_flatsprite' into 'public_flatsprite'
OpenGL: Paper Sprites: The Thousands of Bugs
See merge request STJr/SRB2!253
|
2018-06-11 14:46:51 -04:00 |
|
Sryder
|
34aa7df43a
|
Merge branch 'public_flatsprite' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite
|
2018-06-11 19:40:35 +01:00 |
|
Monster Iestyn
|
358a47967b
|
backport fix to L/R sprite loading code from internal
basically we don't want L/R sprites to always be flipped, for obvious reasons
|
2018-06-11 19:36:47 +01:00 |
|
toaster
|
db1992a429
|
Remove unpopular exitlevel limitation.
|
2018-06-10 20:02:34 +01:00 |
|
Sryder
|
ca4da92470
|
Fix papersprites more for real this time
(Seperate AL and AR sprites were broken, I figured out I was a dunce, oh noey)
|
2018-06-09 22:58:03 +01:00 |
|
toaster
|
7355c1482b
|
At FF and Sphere's suggestion, make the ring hoops work natively in normal stages and require more replacing for special stage conversion purposes.
|
2018-06-09 21:42:37 +01:00 |
|
toaster
|
35188076ba
|
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into hardcoding-time-again
|
2018-06-09 21:18:17 +01:00 |
|
Monster Iestyn
|
b2caed8528
|
Merge branch 'public_flatsprite'
# Conflicts:
# src/dehacked.c
# src/hardware/hw_main.c
# src/p_enemy.c
# src/p_inter.c
# src/p_map.c
# src/p_mobj.c
# src/p_mobj.h
# src/p_pspr.h
# src/p_user.c
# src/r_defs.h
# src/r_things.c
# src/r_things.h
|
2018-06-09 21:14:41 +01:00 |
|
toaster
|
fe750464ae
|
Restore music upon successful completion of old-style special stage
|
2018-06-09 21:12:56 +01:00 |
|
toaster
|
c85e97a05d
|
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into hardcoding-time-again
|
2018-06-09 19:36:48 +01:00 |
|
Monster Iestyn
|
105eee7e0a
|
Merge branch 'public_next'
# Conflicts:
# src/d_main.c
# src/d_netfil.c
# src/p_setup.c
|
2018-06-09 19:35:36 +01:00 |
|
Monster Iestyn
|
241ec4123b
|
Merge branch 'public_flatsprite' into 'public_flatsprite'
OpenGL: Public flatsprite: The Fixening
See merge request STJr/SRB2!252
|
2018-06-09 14:25:52 -04:00 |
|
toaster
|
6203a867f6
|
Disable bumper score icon in NiGHTS to match enemies.
|
2018-06-09 19:22:28 +01:00 |
|
Sryder
|
41cb51159d
|
Merge branch 'next' into public_flatsprite
I also fix papersprites in regards to flipping on one sprite fits all rotation stuff
# Conflicts:
# src/hardware/hw_main.c
|
2018-06-09 18:47:42 +01:00 |
|
toaster
|
5260d3f4e1
|
* Made P_LevelInitStuff's stuff clearer.
* Changed a caption I'd meant to modify earlier in the branch's lifespan.
|
2018-06-09 18:20:59 +01:00 |
|
toaster
|
66c8ab422b
|
* (probably) fix crash with followmobj not being properly invalidated on mapload
* clean up P_LevelInitStuff
* [unrelated] make the bot use directionchar if you are (i only realised it wasn't as a consequence of testing this)
|
2018-06-09 18:06:14 +01:00 |
|
toaster
|
16195d12db
|
Kart Krew discovered a crash, and I was already fiddling around with this, so...
|
2018-06-08 22:30:38 +01:00 |
|
toaster
|
0ebff3820b
|
My little experiments with super transformation animation! (Requires new player.dta.)
|
2018-06-08 21:11:59 +01:00 |
|
toaster
|
406ec1c6a5
|
* Make bomb spheres respawn with new laps
* Make the mapthing detection for stuff to be spawned by P_SpawnHoopsAndRings more consistent.
* Make NiGHTS stuff prevent perfect bonus.
|
2018-06-08 17:16:20 +01:00 |
|
toaster
|
49161952b3
|
* Remove flashing from spheres in bonus time through #ifdef.
* Fix inconsistency in counting nummaprings.
* Prevent perfect bonus in non-special stage NiGHTS maps.
|
2018-06-07 15:10:43 +01:00 |
|