lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
8052 commits 1 branch 29 tags 122 MiB
Commit graph

656 commits

Author SHA1 Message Date
Steel Titanium 97a87574b2
No longer allow showhud to toggle FPS counter or ping bar 2019-11-23 16:09:02 -05:00
Jaime Passos 1e4060af8c remove unused levelwipes 2019-11-18 19:22:46 -03:00
Jaime Passos 8a05afa1aa Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-18 18:48:19 -03:00
Steel Titanium 2584241a44
Better ping implementation. 2019-11-17 20:22:47 -05:00
Jaime Passos d95a93b537 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-14 19:57:51 -03:00
Jaime Passos 245881ec55 Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-12 21:38:02 -03:00
Jaime Passos 3354169769 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-12 20:36:06 -03:00
toaster 5729ba3cd2 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into metalrecording 
# Conflicts:
#	src/p_user.c
 2019-11-12 21:56:46 +00:00
toaster 915e50a1e4 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into internal-md3-vanilla-c 
Merge seems fine, but won't compile for some reason.
 2019-11-02 18:34:12 +00:00
toaster 2d1a574e09 * Add a death animation for killing the Metal object, in case somebody wants to Lua up a Sonic CD style race finish for the Metal object, or in case of the following... 
* Add an alternate DEMOMARKER for ending the Metal Recording on death, which kills the Metal object as well.
* Add some more relevant exceptions to the "most objects are removed when touching a deathpit" thing, primarily for the sake of ghosts and Metal playback.
 2019-10-29 17:38:14 +00:00
Jaime Passos 94ab276508 Merge remote-tracking branch 'origin/master' into f_wipes 2019-10-28 23:14:00 -03:00
Jaime Passos a22af36305 add r_patch.c 2019-10-28 15:28:42 -03:00
MascaraSnake 4a9eb387f7 Merge branch 'window-focus-music' into 'master' 
Window focus options for playing sounds/music

See merge request STJr/SRB2Internal!407
 2019-10-25 15:37:06 -04:00
James R cd252eb468 Console variables to toggle music/sound playing when the window is unfocused 
Playsoundsifunfocused and playmusicifunfocused. "No" by default.
 2019-10-23 17:21:09 -07:00
James R 9162ba87cc Revert sound and music window focus related toggles 
This partially reverts commit 5ac8a26814.
 2019-10-23 15:24:34 -07:00
James R d86be51472 Toggle ping and FPS counters with HUD 2019-10-22 21:50:51 -07:00
James R 5ac8a26814 Miscellaneous window de-focus options 
Music pausing is now optional.
Sounds may be paused--on by default.
The game itself being paused in off-line mode is now optional.

(showfocuslost now loads from config.)
 2019-10-22 21:15:20 -07:00
James R 602c66d173 Grab mouse on window focus 
Window focus does not necessarily imply mouse movement.
 2019-10-22 19:45:43 -07:00
toaster 4b965fe43b Mixed declaration + out-of-bounds GCC error fixes for OpenMPT fixes (can't believe I didn't catch the former earlier) 2019-10-13 12:17:24 +01:00
MascaraSnake a03ecac921 Merge branch 'openglskydome2' into 'master' 
OpenGL sky dome

See merge request STJr/SRB2Internal!350
 2019-10-12 11:06:47 -04:00
Jaime Passos 7746767735 Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c 2019-10-06 17:40:41 -03:00
Steel Titanium cf852e7d39
Fix crash if speed is too high 
Also update libopenmpt
 2019-09-27 23:53:19 -04:00
Jaime Passos 0aba0aa4b9 Merge remote-tracking branch 'origin/master' into openglskydome2 2019-09-27 22:47:10 -03:00
Steel Titanium 6a870b4467
Various of changes 
Changed any instance of "joystick" in strings to "gamepad"
Renamed some cvars
Added a define for MAX_JOYSTICK
Added back the missing command line params.
 2019-09-23 22:46:44 -04:00
Steel Titanium dfee7efd33
Merge branch 'master' into internal-hotplug-stableid 2019-09-23 00:44:34 -04:00
toaster 113568095a * Resolve compiling issues with logmessages. 
* Improve logfile print. (I know Steel wanted it gone entirely, but I feel like it's relevant to have it in game..?)
 2019-09-20 17:22:09 +01:00
toaster 20d098de8f Merge branch 'betterdirs' into 'master' 
Better directory structure

See merge request STJr/SRB2Internal!321
 2019-09-20 11:36:56 -04:00
Jaime Passos 5f6c702ed6 sky barreling 2019-09-17 23:38:04 -03:00
Alam Ed Arias 35e3d9acab Revert "Merge branch 'gl_skydome' into 'master'" 
This reverts merge request !326
 2019-09-17 20:20:09 +00:00
Jaime Passos db979845e0 Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c 2019-09-15 16:24:24 -03:00
Steel Titanium 00d64c380d Merge branch 'newicon' into 'master' 
New EXE icon

See merge request STJr/SRB2Internal!265
 2019-09-12 14:05:32 -04:00
Jaime Passos fec579db8c Merge remote-tracking branch 'origin/master' into gl_skydome 2019-09-10 19:20:20 -03:00
Jaime Passos f0788598c9 Better fades 2019-09-09 23:31:48 -03:00
Alam Ed Arias 9d64ee88a0 Be clear on what FALLTHRU we really want 2019-09-09 15:02:13 -04:00
Steel Titanium 555b4e1766
Fix function being redefined 2019-09-08 19:39:23 -04:00
Steel Titanium 995ab1c84d
Merge branch 'master' into internal-hotplug-stableid 
Just merged in known working code, note that I haven't tested it, so I have no idea if it compiles still.
 2019-09-08 01:55:36 -04:00
Steel Titanium 8ee0a9309b
Better directory structure 2019-09-08 01:29:09 -04:00
Jaime Passos f6d2b5109b PRBoom sky dome 2019-09-03 02:12:17 -03:00
Jaime Passos d99026df3b Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b 2019-09-02 20:27:50 -03:00
Monster Iestyn f3484f7ded Merge branch 'public_next' 
# Conflicts:
#	src/config.h.in
#	src/d_clisrv.c
#	src/d_netcmd.c
#	src/doomdef.h
#	src/p_map.c
#	src/p_maputl.c
#	src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
 2019-08-20 13:54:48 +01:00
Monster Iestyn e52a314ddb Update version to 2.1.25 2019-08-16 20:14:01 +01:00
Alam Ed Arias 92a954609d Merge branch 'public_next' into private 2019-08-08 23:41:19 -04:00
Alam Ed Arias 5a79a446df Tested to be compile with Mingw64 9.1.0 2019-08-08 21:25:46 -04:00
mazmazz 688fdf35f9 Use strtok instead of strtok_r 2019-08-07 01:29:05 -04:00
mazmazz 84c9633579 Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b 2019-08-04 21:33:13 -04:00
toaster 015abfc970 Revert "Revert "Fix MIDI Soundfont code shadowing a global variable."" 
This reverts commit 99dbcb9f65.
 2019-08-04 12:04:01 +01:00
toaster 384dc0674e Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'"" 
This reverts commit 603d5805f7.
 2019-08-04 12:03:57 +01:00
toaster 603d5805f7 Revert "Merge branch 'musicplus-aug2019-b' into 'master'" 
This reverts commit 56bfdb7113, reversing
changes made to c29cfbef9b.
 2019-08-04 11:32:55 +01:00
toaster 99dbcb9f65 Revert "Fix MIDI Soundfont code shadowing a global variable." 
This reverts commit 3591e3d092.
 2019-08-04 11:28:04 +01:00
toaster 3591e3d092 Fix MIDI Soundfont code shadowing a global variable. 2019-08-04 10:28:10 +01:00