Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
2019-01-01 10:41:40 -05:00
Merge errors for compile
2019-01-07 17:05:20 -05:00
Better ping implementation.
2019-11-17 20:22:47 -05:00
Some fixup
2019-07-22 22:01:05 -04:00
Fix FreeMipmapColormap crash
2019-11-24 17:37:11 -03:00
Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'""
2019-08-04 12:03:57 +01:00
No longer allow showhud to toggle FPS counter or ping bar
2019-11-23 16:09:02 -05:00
remove unused levelwipes
2019-11-18 19:22:46 -03:00
INT32 -> boolean
2019-09-24 19:49:24 -03:00
remove unused macros
2019-09-24 19:54:16 -03:00
Merge branch 'apng-oh-shit-fixes' into 'master'
2019-02-28 12:00:58 -08:00
Remove references to old console ports that slipped in from the 2.1 source code a while back
2019-08-20 14:13:38 +01:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Prevent Tailsbot from considering flight when Sonic is exiting.
2019-11-26 11:53:49 +00:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-12 21:38:02 -03:00
Optimizations from LJ and generic functions
2019-11-13 14:26:28 -08:00
Optimizations from LJ and generic functions
2019-11-13 14:26:28 -08:00
Branch and revision information in builds
2016-03-14 12:43:08 -04:00
Use zones.pk3 instead of zones.dta.
2019-09-29 05:31:50 +02:00
Improved "HELP" command!
2019-10-15 13:36:04 +01:00
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
Correct two instances where "Zone" is forced uppercase.
2019-11-25 16:04:03 +00:00
Merge branch 'reset-rollangle' into 'master'
2019-11-18 14:11:32 -05:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Fix stuck closed captioning
2019-11-25 20:16:17 -03:00
Revert "Render title map on connecting to server screen too"
2019-11-25 01:09:00 +01:00
Replace ping command with a condensed and sorted version
2019-10-22 19:40:05 -07:00
Remove double define
2019-02-27 16:05:43 -05:00
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.)
2019-11-26 12:37:57 +00:00
Merge branch 'exit-move-lj' into 'master'
2019-11-18 15:10:15 -05:00
Merge branch 'public_next' into 'master'
2019-11-18 15:39:41 -05:00
Merge branch 'addons_menu' into 'master'
2018-12-15 20:46:42 -05:00
Merge branch 'master' into exit-move-lj
2019-11-15 19:35:47 +01:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Merge branch 'minusflip' into 'master'
2019-11-25 16:43:49 -05:00
Emblem and unlockable SOFTcoding! Emblems and unlockables are no longer predefined in the code and instead loaded from IWAD
2019-02-03 11:05:22 +01:00
Turn Color_Opposite into a 2D array to simplify usage somewhat. Also fix ColorOpposite for Lua
2019-08-12 14:00:26 +01:00
remove unused levelwipes
2019-11-18 19:22:46 -03:00
Do a whole bunch of cleanup for mapvisited and intermission related things.
2019-11-21 16:10:28 +00:00
Merge branch 'map-by-name' into 'master'
2019-11-13 13:45:36 -05:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Update ending cutscene(s) to linger for an additional two seconds, so that the music can properly fade out ( resolves #384 ).
2019-11-28 19:11:12 +00:00
Fix crossfades
2019-11-22 17:44:42 -03:00
clarify comment
2019-11-22 17:50:05 -03:00
Mark new-style log names as loaded.
2019-09-20 17:43:41 +01:00
Hide kart-specific addons behavior behind USE_KART
2018-12-16 16:07:47 -05:00
Keep counting players as finished even after dying
2019-11-27 17:32:02 +01:00
fix RA fade
2019-11-23 18:15:09 -03:00
Add scroll-wheel weapon changing to default controls
2019-10-13 15:19:31 +01:00
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
Merge branch 'ending' into 'master'
2019-08-03 16:23:51 -04:00
Merge branch 'exit-move-lj' into 'master'
2019-11-18 15:10:15 -05:00
Merge branch 'titlecard-lowercase-support' into 'master'
2019-11-18 15:05:02 -05:00
Merge branch 'public_next' into private
2019-08-08 23:41:19 -04:00
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'""
2019-08-04 12:03:57 +01:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
New -port command line paramater
2019-10-13 20:04:45 -04:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
This Black Eggman? ***YEET***
2019-11-29 21:55:25 +00:00
Have Minus rotate in mid-air
2019-11-24 22:29:26 +08:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Merge branch 'master' into exit-move-lj
2019-11-15 19:35:47 +01:00
Merge branch 'master' into newmenus
2019-08-01 18:36:42 -04:00
Merge branch 'public_next'
2019-08-25 18:18:59 +01:00
New intermission thinker hook
2019-10-13 20:50:46 -04:00
Change this for consistency.
2019-10-14 21:47:20 -04:00
lua
2019-11-18 13:50:44 -03:00
lua
2019-11-18 13:50:44 -03:00
Optimise
2019-11-14 14:12:36 -03:00
finish lua spriteinfo :]
2019-11-07 23:42:14 -03:00
Oh right, the keywords...
2019-10-27 14:26:29 -07:00
Turn Color_Opposite into a 2D array to simplify usage somewhat. Also fix ColorOpposite for Lua
2019-08-12 14:00:26 +01:00
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-10-28 14:29:10 -03:00
Merge branch 'public_next' into 'master'
2019-11-18 15:39:41 -05:00
Merge branch 'mi-tinkers-with-lua-again' into 'master'
2019-10-25 15:27:55 -04:00
* Strip the word "function" from INLEVEL error messages, since they're now shared between access and function cases.
2019-07-30 17:57:57 +01:00
Forgot to put these in Lua. (Not gonna make a fifth exe today just for this one change, though.)
2019-09-11 17:32:41 +01:00
* Strip the word "function" from INLEVEL error messages, since they're now shared between access and function cases.
2019-07-30 17:57:57 +01:00
Incinerated WinCE
2017-09-29 23:25:34 +01:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Merge branch 'public_next' into 'master'
2019-11-18 15:39:41 -05:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Secret stuff. (I intend to keep candid discussion of this outside of any commits; you'll see me write up a comment describing what's going on here soon.)
2019-11-01 15:48:50 +00:00
2D toggle command
2019-09-06 20:51:39 -04:00
* Resolve #345 .
2019-11-24 13:24:37 +00:00
Lots of changes
2019-10-15 22:54:21 -04:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
bland
2018-12-20 18:52:51 -03:00
Merge branch 'public_next' into 'master'
2019-11-18 15:39:41 -05:00
Merge branch 'xtrafix' into 'master'
2019-11-25 17:02:32 -05:00
Rename "secrets" to "extras".
2019-11-21 01:34:32 +01:00
Correct two instances where "Zone" is forced uppercase.
2019-11-25 16:04:03 +00:00
Merge branch 'public_next' into 'master'
2019-11-18 15:39:41 -05:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
()
2019-09-12 16:12:31 -03:00
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-12 21:38:02 -03:00
Merge branch 'public_next'
2019-09-03 19:07:57 +01:00
Incinerated WinCE
2017-09-29 23:25:34 +01:00
copyright dates/statements updated and such
2016-05-17 17:42:11 -07:00
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Basic multiple thinker list implementation
2019-04-20 22:39:22 +02:00
This Black Eggman? ***YEET***
2019-11-29 21:55:25 +00:00
There's some whitespace...
2019-11-07 14:56:42 -08:00
Merge branch 'deadstuff' into 'master'
2019-11-26 17:24:17 -05:00
Basic multiple thinker list implementation
2019-04-20 22:39:22 +02:00
Fix camera not being flipped when camera is stopped due to game design hack reasons ( resolves #383 ).
2019-11-27 13:37:03 +00:00
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 ).
2019-11-26 17:56:42 +00:00
lmao I forgot the backside FOF
2019-10-21 14:44:16 -07:00
Add openfloorrover and openceilingrover vars so that PIT_CheckLine can update tmfloorrover and tmceilingrover properly via P_LineOpening
2019-08-01 18:56:00 +01:00
This Black Eggman? ***YEET***
2019-11-29 21:55:25 +00:00
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-14 12:49:03 -03:00
Remove commented out P_CheckSector calls and add extra comments explaining the situation
2019-08-15 14:21:19 +01:00
Implement displacement-based polyobject rotation.
2019-04-05 11:50:59 +02:00
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite
2019-05-06 20:20:57 +01:00
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-14 12:49:03 -03:00
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
Fix 'Speeding off to...' placement in non-greeen resolutions
2019-11-26 00:16:46 +08:00
Optimize texture/patch/png/flat flat caching
2019-10-20 20:24:03 -07:00
Whoops, forgot to make P_CheckSight support slopes for same-sector FOF plane checking.
2019-05-27 21:18:02 +01:00
Fix all our landing woes. (For now.)
2019-08-10 16:06:59 +01:00
Add back the p_slopes.h header guard
2019-04-21 18:05:16 +02:00
Holy shit
2019-11-28 12:10:57 -08:00
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
* Store gravflip ( resolves #206 ) and destscale in starposts. (Using the same field, taking advantage of the fact that object scale will always be positive!)
2019-09-07 22:12:47 +01:00
Resolve #378 , because I knew as soon as I saw that issue name that it was my fault.
2019-11-27 09:03:21 +00:00
Merge branch 'master' into newmenus
2019-08-01 18:36:42 -04:00
Merge branch 'campokes' into 'master'
2019-11-28 14:21:18 -05:00
Make polyobjects agree with sector lighting/colormap like a FOF.
2019-08-22 22:30:36 +01:00
viewx/viewy also need to be stored/restored.
2019-06-06 13:31:48 +02:00
Accidental missing (void)
2019-11-15 18:53:32 -03:00
add r_patch.c
2019-10-28 15:28:42 -03:00
Prevent Knuckles latching onto horizon special linedefs.
2019-11-23 14:20:41 +00:00
Metal Sonic battle improvements.
2019-10-29 23:11:12 +00:00
Add new dashmode colormap
2019-10-21 04:37:56 +08:00
Revert "Revert "Merge branch 'flats-png_port' into 'master'""
2019-09-09 15:05:17 -04:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Disable the GL sprite shadows behind a #define.
2019-11-17 22:18:46 +00:00
Disable the GL sprite shadows behind a #define.
2019-11-17 22:18:46 +00:00
Deobfuscate the R_ParseSpriteInfo call
2019-11-14 19:56:26 -08:00
Optimise
2019-11-14 14:12:36 -03:00
fix missing mmx check
2019-11-22 17:30:53 -03:00
Revert "Revert "Merge branch 'flats-png_port' into 'master'""
2019-09-09 15:05:17 -04:00
Properly take skybox viewpoint angle into account.
2019-06-11 14:47:58 +02:00
Remove remnants of portalcullsector.
2019-06-10 17:13:04 +02:00
Prevent Knuckles latching onto horizon special linedefs.
2019-11-23 14:20:41 +00:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Software plane fixes
2018-12-14 14:08:25 -03:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Better fades
2019-09-09 23:31:48 -03:00
Courteousy of fickle, an adjustment to papersprite rendering that prevents the object's x1 and x2 being slightly off where they should be. Not perfect, but absolutely better than it was!
2019-11-24 16:42:13 +00:00
Hopefully the last time this week I'll ever touch these files
2019-11-06 20:41:55 -03:00
Fix stuck closed captioning
2019-11-25 20:16:17 -03:00
Fix stuck closed captioning
2019-11-25 20:16:17 -03:00
fix showfps with st_translucency
2019-11-23 18:41:28 -03:00
Better ping implementation.
2019-11-17 20:22:47 -05:00
Merge branch 'reversesmash' into 'master'
2019-11-25 13:11:48 -05:00
Restore old sound effect
2019-11-17 21:33:59 -03:00
Fix Continue sprites not working for custom characters (incorrect SPR2_XTRA bounds check).
2019-11-25 18:52:38 +00:00
missing prototype
2019-11-18 15:13:31 -03:00
Fix strcasestr SIGSEGV in the case of only upper case strchr returning NULL
2019-11-19 11:16:17 -08:00
Use a superior strcasestr
2019-10-27 14:23:13 -07:00
remove blank lines at EOF of new files
2016-05-13 00:12:51 -04:00
remove blank lines at EOF of new files
2016-05-13 00:12:51 -04:00
remove blank lines at EOF of new files
2016-05-13 00:12:51 -04:00
remove blank lines at EOF of new files
2016-05-13 00:12:51 -04:00
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Fix Continue sprites not working for custom characters (incorrect SPR2_XTRA bounds check).
2019-11-25 18:52:38 +00:00
fix showfps with st_translucency
2019-11-23 18:41:28 -03:00
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Merge branch 'public_next' into 'master'
2019-11-18 15:39:41 -05:00
Allow PNG graphics to be used as patches
2019-09-11 16:59:28 -03:00
Do a whole bunch of cleanup for mapvisited and intermission related things.
2019-11-21 16:10:28 +00:00
Do a whole bunch of cleanup for mapvisited and intermission related things.
2019-11-21 16:10:28 +00:00
Add overflow checks so we I_Error instead of death crash into oblivion
2019-10-28 00:40:25 -07:00
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
339907fd5d