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 |
|
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 |
|
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 |
|
Jaime Passos
|
03a3b02301
|
Merge remote-tracking branch 'origin/master' into renderswitch
|
2019-12-25 05:43:46 -03:00 |
|
James R
|
75a5142aad
|
Merge branch 'wipes2' into 'master'
Wipe styles cleanup
See merge request STJr/SRB2!525
|
2019-12-24 14:47:14 -05:00 |
|
James R
|
f077413f31
|
Merge branch 'soc-srb2-fix' into 'master'
The "SRB2" directive, for warning if a SOC isn't compatible
See merge request STJr/SRB2!551
|
2019-12-24 14:44:55 -05:00 |
|
James R
|
e0a20a733c
|
Merge branch 'gl_gifs' into 'master'
OpenGL GIF movie recording
See merge request STJr/SRB2!549
|
2019-12-24 14:44:44 -05:00 |
|
James R
|
3f339384c8
|
Merge branch 'hwrtexfix' into 'master'
Fix model texture blending
See merge request STJr/SRB2!546
|
2019-12-24 14:44:19 -05:00 |
|
James R
|
1df31f2e98
|
Merge branch 'soundtest-fix' into 'master'
Init MUSICDEFs regardless of music state
See merge request STJr/SRB2!532
|
2019-12-24 14:44:08 -05:00 |
|
James R
|
be063c454a
|
Fix NOPNG compiling
|
2019-12-24 11:37:37 -08:00 |
|
James R
|
9d28351b5c
|
I'm an idiot
|
2019-12-24 11:14:21 -08:00 |
|
James R
|
d1f12347cc
|
Merge remote-tracking branch 'origin/master' into time
|
2019-12-24 11:02:31 -08:00 |
|
James R
|
b7b4945c36
|
Correct usage of logdir
|
2019-12-24 01:59:05 -08:00 |
|
James R
|
f2c2836301
|
Overwrite an already existing symlink
|
2019-12-24 01:55:47 -08:00 |
|
James R
|
9defd997c3
|
Merge branch 'fixsignalhandler' into 'master'
Handle signals correctly on linux
See merge request STJr/SRB2!530
|
2019-12-24 02:54:44 -05:00 |
|
James R
|
25525a6aae
|
symlink latest-log.txt on nix, copy to the real log file everywhere else
|
2019-12-23 18:20:04 -08:00 |
|
James R
|
98cb238d36
|
Create directories from -logfile too
|
2019-12-23 17:43:42 -08:00 |
|
James R
|
5fbe77cdda
|
Let an asbolute path work with -logfile
|
2019-12-23 17:40:43 -08:00 |
|
James R
|
457e986b75
|
-logdir lets the user change the log directory
|
2019-12-23 17:21:58 -08:00 |
|
GoldenTails
|
1f93ab0e0f
|
Optimise further, play beep on cut/copy, play beep when paste is successful.
|
2019-12-23 18:53:41 -06:00 |
|
James R
|
c285000c56
|
Change default log filename to not use a space
bleh
|
2019-12-23 15:34:27 -08:00 |
|
James R
|
d9d13764e6
|
-logfile to let the user change the log file name
|
2019-12-23 15:31:50 -08:00 |
|
James R
|
f574cd0ce2
|
Whoops I forgot player 2
|
2019-12-22 21:29:41 -08:00 |
|
James R
|
3e2b28e162
|
Merge remote-tracking branch 'origin/master' into turnmultiplier
|
2019-12-22 21:26:36 -08:00 |
|
MascaraSnake
|
1e13604007
|
Merge branch 'flats-in-walls' into 'master'
Flats in walls
See merge request STJr/SRB2!548
|
2019-12-22 17:44:50 -05:00 |
|
GoldenTails
|
ed847e831b
|
Fix pasting going out of bounds and dash the possibility of memory leaks while pasting.
|
2019-12-20 20:28:30 -06:00 |
|
GoldenTails
|
a2faa975cb
|
Allow Clipboard actions.
|
2019-12-20 16:39:19 -06:00 |
|
James R
|
2ed5617c5f
|
Merge branch 'better-deadzone' into 'master'
Better Deadzones
See merge request STJr/SRB2!541
|
2019-12-20 17:33:29 -05:00 |
|
James R
|
c50fe1874d
|
Merge branch 'random-port' into 'master'
Choose a random port as a client
See merge request STJr/SRB2!554
|
2019-12-20 17:33:12 -05:00 |
|
Jaime Passos
|
4e349cbd0f
|
Remove W_UnlockCachedPatch calls to avoid crashing
|
2019-12-19 17:14:56 -03:00 |
|
James R
|
77747c66df
|
Fix switching to software
Would show a black screen for me on Linux. My suspsicion is that
some things are not initialized with just VID_CheckRenderer.
|
2019-12-19 17:13:23 -03:00 |
|
Jaime Passos
|
5c8604aeb7
|
Merge remote-tracking branch 'origin/master' into renderswitch
|
2019-12-19 17:09:47 -03:00 |
|
Alam Ed Arias
|
1771c7c8ce
|
Revert "Travis yflip error"
This reverts commit 2a9a2c0f02 .
|
2019-12-19 10:25:54 -05:00 |
|
Alam Ed Arias
|
a66fd274a1
|
Merge remote-tracking branch 'origin/master' into srb2-release-220-deployer
|
2019-12-19 10:24:04 -05:00 |
|
James R
|
843d9b9f0a
|
-clientport (it's back!) and -serverport, which is an alias to -port
If you ever need to, you can change the client port number.
|
2019-12-18 15:47:47 -08:00 |
|
James R
|
4e32101289
|
Use a pointer for port_name
Using strcpy is stupid because we don't know how long the argument would be.
There's no need for a buffer anyway.
|
2019-12-18 15:43:29 -08:00 |
|
James R
|
f584b61c93
|
Use a random port when connecting
|
2019-12-18 15:34:55 -08:00 |
|
Jaime Passos
|
1b81232d32
|
sike
|
2019-12-18 11:47:26 -03:00 |
|
James R
|
23951cf938
|
bleh
|
2019-12-17 20:54:44 -08:00 |
|
James R
|
d1b944121a
|
Fix "SRB2" SOC directive, though its usefulness is debatable
|
2019-12-17 14:11:45 -08:00 |
|
Jaime Passos
|
79daafd893
|
Fix missing "-" prefix on "-software" cmdline parm
|
2019-12-17 18:04:05 -03:00 |
|
Jaime Passos
|
53885e5ac0
|
Free PU_HWRMODELTEXTURE tag
|
2019-12-17 16:28:32 -03:00 |
|
Jaime Passos
|
e359f802fd
|
Update comments
|
2019-12-17 16:14:26 -03:00 |
|
Jaime Passos
|
cc54163210
|
Merge remote-tracking branch 'origin/master' into renderswitch
|
2019-12-17 16:12:44 -03:00 |
|
Jaime Passos
|
a0971d0756
|
Put loadgame patch loading back in M_ReadSaveStrings
|
2019-12-17 15:56:56 -03:00 |
|
Jaime Passos
|
c3f0e6aa44
|
Avoid recreating the color LUT mid-recording-frame
|
2019-12-17 15:37:43 -03:00 |
|
Jaime Passos
|
0af71fafc5
|
Don't use the local palette, because OpenGL mixes it into the textures themselves
|
2019-12-17 15:20:22 -03:00 |
|
Jaime Passos
|
3d08664de4
|
Merge remote-tracking branch 'sonicteamjuniorheadquarters/master' into gl_gifs
|
2019-12-17 15:14:22 -03:00 |
|
Jaime Passos
|
141d0376a5
|
Merge remote-tracking branch 'origin/master' into flats-in-walls
|
2019-12-17 15:05:16 -03:00 |
|
Jaime Passos
|
7e55dd31f5
|
fix menu spacing
|
2019-12-17 12:53:26 -03:00 |
|
Jaime Passos
|
369563ad92
|
allow models to change colors more than once.
|
2019-12-17 12:50:41 -03:00 |
|
James R
|
53c7df4818
|
Merge branch 'map-command-no-mapheaderinfo' into 'master'
Let the map command warp to maps without a level header
See merge request STJr/SRB2!528
|
2019-12-15 16:59:03 -05:00 |
|
James R
|
adc87640d9
|
Merge branch 'cmake-fixes' into 'master'
Various cmake adjustments
See merge request STJr/SRB2!538
|
2019-12-15 16:58:45 -05:00 |
|
Sryder
|
a093c76cfb
|
Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2.git into better-deadzone
|
2019-12-15 15:47:45 +00:00 |
|
Monster Iestyn
|
eb179e4d6a
|
Remove anti-Tails restriction for the Allow super Pandora's Box cheat.
Despite popular belief, this was just some experimenting from 2.2 development that we forgot to remove!
|
2019-12-15 15:40:56 +00:00 |
|