Commit Graph

8536 Commits

Author SHA1 Message Date
Jaime Passos 7b54846a02 Merge remote-tracking branch 'origin/master' into software-clownery 2019-12-30 23:21:42 -03:00
James R 5e5f3c4fa7 Merge branch 'renderswitch' into 'master'
Renderer switching

See merge request STJr/SRB2!550
2019-12-30 15:36:17 -05:00
Jaime Passos a04834d1aa Fix alignment in R_ThickStepping 2019-12-30 12:02:09 -03:00
Jaime Passos 590d6729e6 Merge remote-tracking branch 'origin/master' into software-clownery 2019-12-30 11:49:12 -03:00
James R 7886a4bbee Don't warn if we start in OpenGL 2019-12-29 18:37:44 -08:00
James R 569453ee93 Warn when going to OpenGL from the menu 2019-12-29 18:37:22 -08:00
GoldenTails bc88def225 Slap in some Ctrl+Insert (copy) support too while I'm at it.
Also added a comment but you didn't see that.
2019-12-29 20:22:58 -06:00
GoldenTails 9d701d722e Reverted to better, less complex system, and added support for Shift+Insert and Shift+Delete.
Major thanks to James for helping me.
Turns out that strncpy thwarts the memory leaks for me. Silly, me!
2019-12-29 20:15:18 -06:00
GoldenTails ae9adce873 Replace magic numbers with less magic and more readable chars. 2019-12-29 18:26:56 -06:00
Jaime Passos 2f4c270a7b Update r_segs.c 2019-12-29 19:43:38 -03:00
James R 566b4a1626 Don't let us warp to a map that doesn't exist (really!)
Okay so 6464df9876, I WAS mistaken! Except that's
not how you check for a map's existence, at least not how the old map command
did it.
2019-12-29 02:44:27 -08:00
James R 404f3c13e4 If we move the -warp code down, map searching can be used 2019-12-29 02:31:48 -08:00
James R 0a014755b9 I'm still an idiot 2019-12-29 02:16:37 -08:00
James R 2ffff56b39 Who cares? 2019-12-29 02:15:48 -08:00
James R 19aafbfd0b Split map code checking from Command_Map_f 2019-12-29 02:14:02 -08:00
Alam Ed Arias c27d062cc8 Merge branch 'fixmain' into 'master'
Fix logfiles crashing Windoze (resolves #102)

Closes #102

See merge request STJr/SRB2!591
2019-12-28 21:15:23 -05:00
Jaime Passos f997866b4d Fix broken dynlight list because of a SPR_NON2 that doesn't exist 2019-12-28 22:57:37 -03:00
Jaime Passos 244f0b228f Fix M_PathParts instead 2019-12-28 22:18:41 -03:00
Jaime Passos 3bb7fd4cbf Fix logfiles crashing Windoze 2019-12-28 22:14:23 -03:00
MascaraSnake f83d0fe3a1 Fixed/clarified some flag descriptions in the ZB config 2019-12-28 08:42:16 +01:00
Alam Ed Arias c394ad056c use size_t to count the sprites 2019-12-27 13:20:58 -05:00
Alam Ed Arias 0caa08defd fread and fwrite use size_t, not int 2019-12-27 13:08:26 -05:00
Alam Ed Arias ff004c4cf6 we only need link on unix systems 2019-12-27 13:05:15 -05:00
MascaraSnake 45c432462e Merge branch 'why-inline' into 'master'
I got a compiler warning from P_PlayerHitsPlayer being too big

See merge request STJr/SRB2!581
2019-12-27 02:12:01 -05:00
Jaime Passos 5ea43aa023 Fix sprite rotation crashes. 2019-12-27 00:37:40 -03:00
Jaime Passos 96609e45ae OpenGL funny 2019-12-27 00:02:30 -03:00
Jaime Passos 2d3f45de0d Merge branch 'renderswitch' of https://git.magicalgirl.moe/STJr/SRB2 into renderswitch 2019-12-26 23:53:03 -03:00
Jaime Passos eca5be52b2 And the sound test 2019-12-26 23:52:42 -03:00
Jaime Passos 956905c8f4 Same deal, but for the level platter and save select screen 2019-12-26 23:49:31 -03:00
James R 76a1a80d71 Save the renderer 2019-12-26 18:44:02 -08:00
James R e19d0877e8 Merge branch 'time' into 'master'
haha log files

See merge request STJr/SRB2!567
2019-12-26 21:43:46 -05:00
Jaime Passos 644e41d90c Handle character select screen correctly after a renderer switch 2019-12-26 23:39:40 -03:00
Jaime Passos e617f35182 PU_PATCH funny 2019-12-26 23:26:43 -03:00
James R 4865a19057 One more optimization 2019-12-26 18:23:01 -08:00
James R 9673439628 e 2019-12-26 18:20:48 -08:00
James R 4959d52ae0 Make cv_renderer CV_NOLUA instead of hidden!!! 2019-12-26 18:15:52 -08:00
James R cb29a9dd0a CV_NOLUA for when a cvar should not be changed via Lua 2019-12-26 18:15:19 -08:00
James R f26bdf00fe A system to encode flags in the command buffer 2019-12-26 18:12:10 -08:00
James R 414a066ec8 Merge branch 'turnmultiplier' into 'master'
Option to increase the turning speed

See merge request STJr/SRB2!553
2019-12-26 18:18:23 -05:00
James R dd1ca69f54 P_PlayerHitsPlayer is too big for inline, and these other functions are getting there 2019-12-26 14:59:31 -08:00
Jaime Passos 69b4efb579 Rename R_WorldSegTextured 2019-12-26 18:13:03 -03:00
Jaime Passos ad6cda7c53 Masked stuff 2019-12-26 17:39:18 -03:00
Jaime Passos 0ec800b266 I forgot a ``static`` 2019-12-26 17:20:17 -03:00
Jaime Passos 919864d0f3 Thick stuff. Hoping I didn't break anything. 2019-12-26 17:15:30 -03:00
Jaime Passos 5f1e3bab71 struct time 2019-12-26 16:25:04 -03:00
Jaime Passos 4e0a7030ca Move all the thick/masked/splat stuff to the end of the file 2019-12-26 15:34:33 -03:00
Jaime Passos e09838224e ifdef this right so it works like before without the define 2019-12-26 15:27:16 -03:00
Jaime Passos 649455c2d0 R_CalculateSegDistance stuff... 2019-12-26 01:58:38 -03:00
Jaime Passos 69e9784085 Something in R_RenderSegLoop I thought looked off... 2019-12-26 00:55:34 -03:00
Jaime Passos 6f5a259983 Tame R_StoreWallRange 2019-12-26 00:07:04 -03:00