lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
8,468 Commits 1 Branch 29 Tags 122 MiB
Commit Graph

8468 Commits

Author SHA1 Message Date
fickleheart a9b80bf1f0 Merge branch 'master' into newcontrols 
# Conflicts:
#	src/d_netcmd.c
#	src/g_game.c
#	src/g_game.h
#	src/m_menu.c
 2019-12-30 10:47:09 -06: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 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 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
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
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
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
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
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
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 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
James R 00e2c420f6 Merge branch 'dont-be-mean-to-tails-plz' into 'master' 
Don't be mean to Tails plz (Pandora's Box Super cheat fix)

See merge request STJr/SRB2!540
 2019-12-15 16:58:24 -05:00