Alam Ed Arias
a29203acd8
Disable win_dbg
2017-12-26 20:24:08 -05:00
Alam Ed Arias
e2b604fdfd
TCP: remove BADSOCKET
2017-12-26 19:56:50 -05:00
Monster Iestyn
6886a29e99
Merge branch 'master' into next
2017-12-24 20:06:33 +00:00
toasterbabe
a1620b709e
Fix airbob sectors fucking up when below 0 z-height.
2017-12-20 21:13:24 +00:00
toasterone
ff745531b0
Merge branch 'master' into addfile-netgame-fixes
2017-12-20 20:58:45 +00:00
Monster Iestyn
d576453b56
Command_Addfile: add "too many files" and already-loaded checks and respective error messages
...
No more shall the server be kicked from their own servers for re-adding a wad by accident!
2017-12-18 21:17:37 +00:00
LJSonik
36ce6579b7
Merge branch 'master' into download-freeze-fix
2017-12-18 21:39:16 +01:00
Louis-Antoine
47481804da
Merge branch 'download-freeze-fix' of https://github.com/LJSonik/SRB2 into download-freeze-fix
2017-12-18 21:38:10 +01:00
Louis-Antoine
c8e9e779e7
Add a short comment to explain the newplayernum hack
2017-12-18 21:35:02 +01:00
Alam Ed Arias
57a7a3bed8
Merge branch 'master' into next
2017-12-17 22:22:57 -05:00
LJSonik
084a534f6a
Merge branch 'master' into download-freeze-fix
2017-12-17 22:48:13 +01:00
LJSonik
9c7ff6e0c3
Merge branch 'master' into resynch-fixes
2017-12-17 22:47:23 +01:00
Monster Iestyn
c7cd64583d
Added a bunch of I_Asserts to lua_hooklib.c relating to mobj types just in case
2017-12-17 20:59:24 +00:00
Monster Iestyn
ec10367856
Bail out of P_RespawnSpecials if no mobjinfo entry has a doomednum that matches, and print a warning to the console.
...
This prevents a mobj of NUMMOBJTYPES from being created and potentially crashing the game. Really, this happens only if you start messing with the mapthings of respawning items like rings/weapons/etc in the first place via Lua.
2017-12-17 20:57:45 +00:00
Alam Ed Arias
baf227175b
Merge branch 'master' into next
2017-12-16 18:16:15 -05:00
Alam Arias
703c5322d4
Merge pull request #212 from SteelTitanium/window_center_fix
...
Fix for window being offcenter
2017-12-16 18:15:00 -05:00
Alam Ed Arias
bd86f98822
Merge branch 'master' into next
2017-12-16 16:07:31 -05:00
Louis-Antoine
4ea5d2df01
Merge branch 'net-archive-fix' of https://github.com/LJSonik/SRB2 into net-archive-fix
2017-12-15 22:06:03 +01:00
Louis-Antoine
beb9b0f103
Return for both players and mobjs if they've got an empty table, instead of just mobjs
2017-12-15 22:02:34 +01:00
LJSonik
b994180927
Merge branch 'master' into net-archive-fix
2017-12-15 20:07:44 +01:00
Louis-Antoine
0b836a9841
Fix missing lua_pop in ArchiveExtVars
2017-12-15 16:31:27 +01:00
Monster Iestyn
ac3fef15eb
Rob is now in charge of Mod IDs, change MODID comment in doomdef.h to reflect this
2017-12-13 19:07:02 +00:00
Louis-Antoine
4e89c03b0f
Node and player isn't the same thing !#^&*%^:'\[[^!#^$4&@(é@*(&$*@#à $%@
2017-12-12 23:08:18 +01:00
Louis-Antoine
16b8265c6e
F stands for Fun. You want more Fun, don't you?
2017-12-12 22:48:08 +01:00
toasterbabe
336a26602d
Not strictly pretty, but fixes a bug I discovered whilst working on this.
2017-12-10 14:35:55 +00:00
toasterbabe
ce724a6138
* Make lives pic appear in all gametypes.
...
* Lives position now more consistent between players in splitscreen.
* Ringslinger weapon bar is now at the same height as the lives pic, and also more centered horizontally.
* Begin tweaking emerald icon locations for ringslinger gametypes.
* Remove in-game team names from team gametypes, since this information is (mostly) conveyed by the lives pic.
2017-12-09 23:08:12 +00:00
toasterbabe
3d4adaac09
my mistake
2017-12-09 18:48:25 +00:00
toasterbabe
e63c1d15d8
* Show an emerald token box on the tally screen.
...
* Change the horizontal spacing of the emeralds on the special stage tally screen.
* (unrelated) Fix a reference to srb2.srb instead of the now-correct srb2.pk3.
2017-11-17 23:02:34 +00:00
Steel Titanium
e61549d81f
Opps, forgot to change this.
2017-11-08 14:50:27 -05:00
Steel Titanium
55c86f3e15
Successful attempt at restarting the music
2017-11-08 14:48:05 -05:00
Monster Iestyn
7cb0138293
Change version number to 2.1.20
2017-11-08 15:06:42 +00:00
Steel
dbbbc1cc06
Merge branch 'master' into window_center_fix
2017-11-08 00:32:23 -05:00
Steel Titanium
c1405137ec
Extra tab space to make the compiler happy
2017-11-07 23:48:03 -05:00
Steel Titanium
4f8b91c770
Attempt to restart music
2017-11-07 16:26:45 -05:00
Louis-Antoine
67aba2648c
Fix download freezes (well, most of them)
2017-11-03 22:58:47 +01:00
Alam Ed Arias
7f4424b4a0
whitespace cleanup
2017-11-02 23:13:34 -04:00
Alam Ed Arias
3e3065f67c
Move FindFolder
2017-11-02 23:09:52 -04:00
toasterbabe
c89b1ec234
Always allow the first singleplayer level in the MP level platter.
2017-11-02 21:20:55 +00:00
toaster
7d15afe6fb
Merge branch 'md2_interpfix' into 'master'
...
(re-)fix MD2 interpoleration.
See merge request STJr/SRB2Internal!128
2017-11-02 16:47:24 -04:00
toaster
82a868ec8f
Merge branch 'lua-sector-find-funcs' into 'master'
...
Lua sector find funcs
See merge request STJr/SRB2Internal!127
2017-11-02 16:46:16 -04:00
toaster
b302607c2e
Merge branch 'nights_colours_again' into 'master'
...
More NiGHTS tweaks
See merge request STJr/SRB2Internal!125
2017-11-02 16:45:09 -04:00
toaster
29c3ff1c0e
Merge branch 'demo_shit' into 'master'
...
Demo shit
See merge request STJr/SRB2Internal!123
2017-11-02 16:44:13 -04:00
toaster
c84d4261d1
Merge branch 'unca_scrooge' into 'master'
...
The hardcoded part of ACZ3 so far
See merge request STJr/SRB2Internal!124
2017-11-02 16:43:11 -04:00
toasterbabe
2a42291b30
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into demo_shit
...
# Conflicts:
# src/d_netcmd.c
2017-11-02 20:39:07 +00:00
toaster
49a1266ccc
Merge branch 'sal-misc-stuff' into 'master'
...
Sal misc stuff (state overwriting, gamepad tweaks)
See merge request STJr/SRB2Internal!116
2017-11-02 16:35:12 -04:00
toaster
605e51f6f3
Merge branch 'more_about_menus' into 'master'
...
More about menus
Closes #72
See merge request STJr/SRB2Internal!122
2017-11-02 16:31:51 -04:00
toaster
927e74e406
Merge branch 'FileManagement' into 'master'
...
File management - PK3 support.
See merge request STJr/SRB2Internal!121
2017-11-02 16:27:54 -04:00
toasterbabe
05832e66a3
Fix unmatched readfixed (by replacing).
2017-11-02 19:38:21 +00:00
toasterbabe
b2d43cc56b
(re-)fix MD2 interpoleration.
2017-11-02 14:33:56 +00:00
Monster Iestyn
2cccb81d7f
Merge branch 'master' into lua-sector-find-funcs
2017-11-01 19:14:44 +00:00
Monster Iestyn
5faf263f1f
Merge branch 'gametype-strings' into 'master'
...
Gametype strings
See merge request STJr/SRB2Internal!113
2017-11-01 14:47:45 -04:00
Monster Iestyn
477ee6e073
Merge branch 'lua-action-userdata' into 'master'
...
Lua action userdata
See merge request STJr/SRB2Internal!112
2017-11-01 14:45:03 -04:00
Monster Iestyn
b52c843139
Merge branch 'public_next'
2017-11-01 18:39:25 +00:00
Monster Iestyn
d61105fcce
Merge branch 'master' into next
2017-11-01 18:36:48 +00:00
Monster Iestyn
fbe5654477
add quick error messages to make toaster happy
2017-11-01 17:11:10 +00:00
Monster Iestyn
a244948f21
fix action_call index numbers for the args, add missing breaks after LUA_TUSERDATA code in infolib (I am dumb dumb dumb dumb dumb dumb)
2017-11-01 16:52:12 +00:00
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
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
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
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
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
toasterbabe
0fe1f9d63b
* "BAD DEMO!!" and "ANALOG" attachments to the input viewer
...
* Minor refactor
2017-10-18 13:22:57 +01:00
toasterbabe
c7b2c43ae5
Record attack input display!
...
https://cdn.discordapp.com/attachments/293238104096112641/369485020038955008/srb20041.gif
2017-10-16 16:25:31 +01:00
toasterbabe
04160f0081
Fixed the smilestails/any other followmobj not spawning at leveltime 0 in a fresh record attack boot!
2017-10-15 13:51:20 +01:00
toasterbabe
a4f10a4b96
Fixed replays of skins whose realnames differed from their normal names from not being readable (by fixing the writing).
2017-10-15 12:35:49 +01:00
