Commit graph

3977 commits

Author SHA1 Message Date
Monster Iestyn
42b955f4ca getActionName: added support for custom actions (A_ prefix functions only) 2017-10-31 16:47:24 +00:00
toasterbabe
811fd5f9bc * Change the NiGHTS link text colour list. Again.
* Make the NiGHTS link text pulse, like in the original game!
* Fix going from NiGHTS special stage as Smiles to a normal level losing your followitem.
2017-10-31 15:47:58 +00:00
toasterbabe
ead8fd6bf7 Update some strings that say "joystick". 2017-10-30 23:23:52 +00:00
toasterbabe
2458c06f5b Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into sal-misc-stuff
# Conflicts:
#	src/g_game.c
2017-10-30 21:42:38 +00:00
Monster Iestyn
bfca420f47 Merge branch 'master' into gametype-strings 2017-10-30 21:34:16 +00:00
Monster Iestyn
440ada120d Merge branch 'master' into lua-action-userdata 2017-10-30 21:33:40 +00:00
toasterbabe
4d82a76e5b Move R_AddSpriteDefs back into place. 2017-10-30 21:07:17 +00:00
toasterbabe
d4e08551bf * Make P_LoadVertexes a wrapper for P_LoadRawVertexes.
* Remove extraenous R_ClearTextureNumCache from P_LoadSidedefs2.
* Remove regressions in comments/#includes.
2017-10-30 20:54:14 +00:00
Monster Iestyn
1d11797b47 Added six new functions from p_spec.c/h to Lua 2017-10-30 20:09:41 +00:00
Monster Iestyn
2b1fb67a5f DrawMD2i: change duration and tics to INT32, fix up any related code 2017-10-30 19:12:51 +00:00
toasterbabe
3994697fbd Fix all NiGHTS demo desyncs! (More specifically: compare with d_netcmd.c's order of operations - it's skin change, then g_initnew, then demo start, NOT g_initnew then skin change then demo start!!!!! 2017-10-30 14:20:36 +00:00
toasterbabe
548c120534 Since they give points now, make tokens spawn in record attack (and not add end-of-act tokens/continues). 2017-10-29 13:41:02 +00:00
Steel Titanium
97445f941a Add command to restart the audio system 2017-10-29 01:09:34 -04:00
Steel Titanium
799a819ee9 Merge remote-tracking branch 'upstream/master' into window_center_fix 2017-10-29 00:00:11 -04:00
Alam Ed Arias
6a639dd717 Merge branch 'master' into md2-interpolation-fix 2017-10-28 18:47:20 -04:00
Alam Ed Arias
d2f922a981 Merge branch 'master' into next 2017-10-28 18:46:10 -04:00
Alam Ed Arias
cf10b55be0 Win32: pragma hell 2017-10-28 18:39:42 -04:00
Alam Ed Arias
3ecc304332 Win32: just ignore format overflows 2017-10-28 18:33:47 -04:00
Alam Ed Arias
0250040a5b Win32: all fails of DD and try more to stop format-overflow errors 2017-10-28 18:24:07 -04:00
Alam Ed Arias
a4072260db Win32: try to fix up CD printf code 2017-10-28 18:13:59 -04:00
Alam Ed Arias
365879d06f libs: Updated SDL2-Mixer to 2.0.2 2017-10-28 18:03:18 -04:00
Alam Ed Arias
e1492ae3f0 libs: EOL fun of SDL2 2017-10-28 17:53:15 -04:00
Alam Ed Arias
b7d0896c83 libs: updated SDL2 to 2.0.7 2017-10-28 17:50:36 -04:00
toasterbabe
efc4d2f81d * Make multiple ANIMDEFS lumps get loaded.
* Refactor the multiple TEXTURES lump code.
2017-10-28 17:12:08 +01:00
Alam Ed Arias
daf442f17b Appvendor: -Wno-error=suggest-attribute=noreturn 2017-10-27 21:31:02 -04:00
Alam Ed Arias
f6af81be59 Appvendor: -Wno-tautological-compare 2017-10-27 21:25:52 -04:00
Alam Ed Arias
264fc2f3c7 Appveyor: remove error 2017-10-27 21:14:52 -04:00
Alam Ed Arias
c160241f1b Appveyor: stuff warnings switchs 2017-10-27 20:59:18 -04:00
Alam Ed Arias
bdfdd868c7 Appveyor: let see what is the command line 2017-10-27 20:30:15 -04:00
Alam Ed Arias
ce40c00b7a Build: do not error on FALLTHURs 2017-10-27 19:49:55 -04:00
toasterbabe
ee4b891318 Since I'm on the branch: bugfix a thing with introchanged/titlechanged. 2017-10-27 22:08:01 +01:00
Monster Iestyn
365cd305d7 Make appveyor config use GCC72=1 instead of GCC63=1 2017-10-27 17:41:23 +01:00
toasterbabe
f512b64563 Fix some mistakes when updating the function signature. 2017-10-26 17:30:08 +01:00
toasterbabe
df1e5eb9b7 * Optimise the new static code further.
* Update all the other V_DrawCroppedPatch calls to match the new behaviour.
* Fix the OGL version of V_DrawCroppedPatch to match the new behaviour.

(To justify my changes: It's not exposed to Lua, and the function signature was a mess. This way it's easier to mentally map how it would work.)
2017-10-26 16:59:02 +01:00
toasterbabe
b2e89f6832 WOOPS CAN'T UPDATE THE PLAYSIM RANDOM SEED IN A MENU 2017-10-26 11:45:08 +01:00
toasterbabe
4a4ba228df Per request, remove the "/ * ACTION" stuff 2017-10-25 23:34:20 +01:00
toasterbabe
9a10dfeaee Replaced the laggy randomised-at-runtime static with sufficiently random low-impact pregenerated static. Requires new patch.dta. https://cdn.discordapp.com/attachments/293238104096112641/372770688890830859/srb20003.gif 2017-10-25 16:40:21 +01:00
toasterbabe
9ffb5c0fb0 Since Mystic complained, moved the right-aligned Rings to a special "Mania" HUD mode. 2017-10-25 11:54:21 +01:00
Monster Iestyn
0cc8fbdb4e Don't use interpolation code if the frame lasts instantaneously or infinitely
Also removed the + 1 from newtime, since there was never really any need for it. It just offset the interpolation so it went like (1 -> 2] instead of [1 -> 2), so you never saw the base appearance for each frame except at the end of any frames interpolating to it

Changed DrawMD2Ex's duration/tics type to INT32 so -1 comparisons work, probably want to change the signs elsewhere too but this is fine for now
2017-10-24 20:45:55 +01:00
toasterbabe
d1e007ef8d Change the little green light symbol on the save to indicate modifiedgame. 2017-10-24 00:06:13 +01:00
toasterbabe
65e3cdc1fb Fix Autobrake/analog not showing up properly in record attack mode. 2017-10-23 23:29:55 +01:00
toasterbabe
3a96c507a2 * Made PK3s fail the music lump check, because... that method of checking doesn't really work with it.
* Improve the output of listwad to identify unimportant, non-networked files. https://cdn.discordapp.com/attachments/237467298590490625/371314970002063370/srb20044.png
* Fixed mainwads being one too high due to the removal of rings.dta.
2017-10-21 16:18:28 +01:00
toasterbabe
50d6208913 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into FileManagement 2017-10-21 14:28:44 +01:00
toasterbabe
eea5c9d56a Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into unca_scrooge
# Conflicts:
#	src/dehacked.c
#	src/info.h
#	src/p_enemy.c
2017-10-21 12:48:41 +01:00
toasterbabe
49aa6ee339 Tweak to modifications to new level select. 2017-10-18 22:18:43 +01:00
toasterbabe
8372bde91b Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into more_about_menus 2017-10-18 21:02:50 +01:00
toasterbabe
9f46f84132 Disable REDXVI cheat by default. 2017-10-18 21:02:43 +01:00
Monster Iestyn
94b7d564e7 Merge branch 'ports-chopping-block' into 'master'
Ports chopping block

See merge request STJr/SRB2Internal!118
2017-10-18 14:39:57 -04:00
toasterbabe
77bcb5d502 Slow the flash. 2017-10-18 16:22:18 +01:00
toasterbabe
5c4247dd61 Allow for the combination of NiGHTS and record attack HUD. 2017-10-18 13:58:16 +01:00