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
fe60902df5
Merge remote-tracking branch 'origin/master' into renderswitch
2019-09-27 22:53:57 -03: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
Alam Ed Arias
78075ecd89
Fix FALLTHRU for Win32 console interface code
2019-09-17 14:18:27 -04: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
8057eeaaca
Merge remote-tracking branch 'jimita/renderswitch' into renderswitch
2019-09-10 18:12:01 -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
Jaime Passos
dc93cafda9
can i push this already?
2019-09-08 22:25:18 -03:00
Jaime Passos
725d0b4c44
still making things better
2019-09-08 21:37:24 -03:00
Steel Titanium
555b4e1766
Fix function being redefined
2019-09-08 19:39:23 -04:00
Jaime Passos
19e50062cc
more stuff. i hope i didnt mess this up.
2019-09-08 18:59:49 -03:00
Jaime Passos
c7e01a558e
initial stuff
2019-09-08 18:44:40 -03:00
Jaime Passos
2863ede7bf
initial stuff
2019-09-08 18:27:35 -03: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
mazmazz
bddafbeece
Merge branch 'internal-musicplus-jingle' into musicplus-aug2019
2019-08-04 02:41:37 -04:00
mazmazz
fd4d3a6a69
Mixer X menu touchup
2019-08-04 02:30:34 -04:00
mazmazz
b99f06c0c9
Merge remote-tracking branch 'origin/master' into musicplus-sdlmixerx
2019-08-04 01:10:21 -04:00
mazmazz
dd9efebab5
Merge remote-tracking branch 'origin/master' into internal-musicplus-jingle
2019-08-03 23:38:49 -04:00
Alam Ed Arias
a8637d034e
SDL2: more consts
2019-07-29 19:22:14 -04:00
Alam Ed Arias
1a643b1bd9
SDL2: more const in xpm code
2019-07-29 19:08:55 -04:00
Alam Ed Arias
ed0754382f
Merge remote-tracking branch 'private/master' into newicon
2019-07-29 19:04:19 -04:00
Alam Ed Arias
b77780e1e7
Fix building with MSVC
2019-07-29 19:02:45 -04:00
Alam Ed Arias
e50dc7c779
Merge branch 'public_next' into private
2019-07-29 18:31:01 -04:00
Alam Ed Arias
66f84efd02
SDL2: fixed compiling mixer interface with MSVC
2019-07-29 17:56:35 -04:00
Steel Titanium
98adcb1de3
Change it back to const char
2019-07-28 18:19:00 -04:00
Steel Titanium
74cbf2b4f3
Update mac icon
2019-07-28 17:06:01 -04:00
Steel Titanium
9813cbc857
More icon stuff
2019-07-27 01:13:54 -04:00
Steel Titanium
64bb70bef4
Fix crash with GME sounds when being freed
2019-07-27 01:13:54 -04:00
Steel Titanium
c35afa2c96
Merge branch 'master' into musicplus-sdlmixerx
2019-07-22 22:20:08 -04:00
Steel Titanium
af959ee309
Some fixup
2019-07-22 22:01:05 -04:00
Steel Titanium
181ecee202
Let's not use this
2019-07-16 19:26:16 -04:00
Steel Titanium
3ffb7b6192
New icons
...
Also update IMG_xpm.c
2019-07-16 19:20:00 -04:00
Monster Iestyn
c8cfc3110f
Merge branch 'public_next'
2019-07-16 18:28:49 +01:00
Steel Titanium
4e839596a1
Fix crash with GME sounds when being freed
2019-07-14 14:55:04 -04:00
Monster Iestyn
5c54022a89
Add static keyword to these variables for correctness
2019-07-14 16:23:01 +01:00
Steel Titanium
60cb2de6a0
Seperate declarations from code
2019-07-09 15:51:11 -04:00
Steel Titanium
21c6836fe0
Some few comments
2019-07-09 00:56:22 -04:00
Steel Titanium
164e797670
Better loading code for modules
2019-06-29 20:35:31 -04:00
mazmazz
5b0f7d2850
Merge branch 'master' into musicplus-sdlmixerx
2019-06-29 19:31:01 -04:00
mazmazz
923dc34215
Merge branch 'public-notpublic-musicplus-jingle' into internal-musicplus-jingle
2019-06-29 18:33:45 -04:00
mazmazz
6244489fd0
Merge branch 'public-musicplus-jingle' into public-notpublic-musicplus-jingle
2019-06-29 18:10:44 -04:00
mazmazz
dc0a92ea62
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla
2019-06-29 17:51:30 -04:00
mazmazz
521d8fd8c1
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-06-29 15:02:07 -04:00
Steel Titanium
58bb05be00
Merge branch 'public-musicplus-libopenmpt' of https://git.magicalgirl.moe/STJr/SRB2 into public_libopenmpt
...
# Conflicts:
# .travis.yml
# src/m_menu.c
# src/sdl/Srb2SDL-vc10.vcxproj
# src/sdl/Srb2SDL.props
2019-06-11 17:48:00 -04:00
Monster Iestyn
e7e3b0ef38
Merge branch 'public_next'
...
# Conflicts:
# src/doomdef.h
# src/hardware/hw_draw.c
# src/m_misc.c
# src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
2019-06-09 20:04:08 +01:00
Monster Iestyn
f5d883bd12
Merge branch 'next' into 2.1.24-prep
...
# Conflicts:
# debian-template/control
# debian/changelog
2019-06-07 23:18:31 +01:00
Alam Ed Arias
ea08ba3fba
Merge branch 'master' into next
2019-06-07 18:07:32 -04:00
Alam Ed Arias
83b8a98df4
Merge branch 'gme-msvc' into 'master'
...
Add GME to MSVC 10 solution
See merge request STJr/SRB2!448
2019-06-07 18:06:51 -04:00
Steel Titanium
3c08ee1313
Merge branch 'master' into travis-deployer
...
# Conflicts:
# .travis.yml
2019-06-07 16:56:19 -04:00
Monster Iestyn
6f6d912fa6
Update version to 2.1.24
2019-06-07 15:48:33 +01:00
Steel Titanium
81dec89aeb
Merge branch 'next' into public-musicplus-libopenmpt
2019-06-03 15:36:50 -04:00
Steel Titanium
c8a5597492
Update libopenmpt to 0.4.4
2019-05-23 22:05:28 -04:00
Steel Titanium
ce1c1d8c88
Forgot some references
2019-05-20 23:31:23 -04:00
Steel Titanium
bf3d5f4188
circleci: Fix compiling error
2019-05-20 23:22:23 -04:00
Steel Titanium
91767a7740
Merge branch 'master' into public-musicplus-libopenmpt
2019-05-20 21:33:10 -04:00
Monster Iestyn
66bc287688
Merge branch 'public_next'
2019-05-16 15:58:17 +01:00
Monster Iestyn
600a373739
Merge branch 'master' into next
2019-05-13 16:07:30 +01:00
Steel Titanium
8a14427420
Merge branch 'perpetual-modifier-updates' into 'master'
...
Set modifiers in a non-reactive manner
See merge request STJr/SRB2!456
2019-05-13 00:36:06 -04:00
wolfy852
8f05d75926
Don't skip frames when connecting or paused
2019-05-08 09:39:45 -05:00
mazmazz
904b00e921
Remove song_length tag search
...
Because songs without this tag will skiplag when loading.
2019-05-02 19:14:23 -04:00
mazmazz
3e5b0c4531
Remove MP3 widechar tag searching
...
1. It's slow, 2. It's incorrect
2019-05-02 19:13:56 -04:00
mazmazz
3d90488d17
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-05-02 17:43:40 -04:00
Monster Iestyn
7ae6d5ee8c
Merge branch 'public_next'
...
# Conflicts:
# src/doomstat.h
# src/g_game.c
2019-03-28 14:19:02 +00:00
Monster Iestyn
7441dd7d9b
Merge branch 'master' into next
2019-03-25 18:08:36 +00:00
mazmazz
8317155c40
Merge branch 'public-gl-next' into public-musicplus-jingle
2019-03-15 18:42:19 -04:00
mazmazz
9ec98c588f
Merge branch 'public_next'
2019-03-14 22:15:34 -04:00
mazmazz
aea18f36ba
Remove MP3 warning
2019-03-13 19:51:45 -04:00
mazmazz
93626c2293
Merge remote-tracking branch 'public-gl/next' into public-musicplus-core
2019-03-13 19:45:07 -04:00
Steel Titanium
9542a47f7f
New -noxinput and -nohidapi command line parameters.
2019-03-03 22:57:09 -05:00
Monster Iestyn
a93e96c75b
Merge branch 'public_next'
...
# Conflicts:
# src/sdl12/Srb2SDL-vc10.vcxproj
# src/sdl12/Srb2SDL-vc9.vcproj
# src/sdl12/macosx/Srb2mac.pbproj/project.pbxproj
# src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
2019-03-02 20:51:15 +00:00
Monster Iestyn
67e721e983
Merge branch 'need-more-time' into 'master'
...
Stop Linux servers from hanging every 34 hours
See merge request STJr/SRB2!465
2019-03-01 11:22:32 -05:00
wolfy852
97de2ae4f6
Stop Linux servers from hanging every 34 hours
2019-03-01 00:07:58 -06:00
wolfs
5620d0188e
Merge branch 'apng' into 'master'
...
Support aPNG in new versions of libpng
See merge request KartKrew/Kart-Public!63
2019-02-28 12:00:58 -08:00
Monster Iestyn
7a0d8b408e
Merge branch 'public_next'
...
# Conflicts:
# src/d_main.c
# src/dehacked.c
# src/m_menu.c
# src/m_menu.h
2019-02-27 22:36:01 +00:00
Monster Iestyn
d76e946b3e
Merge branch 'sdl-new-windowicon' into 'master'
...
SDL:Update XPM icon
See merge request STJr/SRB2!441
2019-02-27 13:34:24 -05:00
james
356249dade
Set modifiers in a non-reactive manner
2019-01-17 16:47:01 -08:00
mazmazz
66e6a6f940
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-01-07 04:06:45 -05:00
Steel Titanium
7d1e59d4ba
Some few changes
2019-01-05 23:42:25 -05:00
mazmazz
578a4fe80d
Merge remote-tracking branch 'public-gl/master' into travis-deployer
2019-01-05 09:08:34 -05:00
Marco Z
882355d24b
Specify HAVE_LIBGME, paths, and depends only for Win32/x64 MSVC
2019-01-04 21:18:55 -05:00
Marco Z
88c4a54cea
Add GME to VC10 SRB2SDL project
2019-01-04 20:43:42 -05:00
mazmazz
87c015e340
MUS_MODPLUG fix
2019-01-04 18:39:09 -05:00
mazmazz
1bfc4c02e4
CMake fixes for OpenMPT
2019-01-03 21:17:18 -05:00
mazmazz
4a17e9ed9b
Remove dynamic openmpt loading
2019-01-03 20:52:09 -05:00
Marco Z
caab60e9f0
Fix MSVC compile errors
2019-01-03 20:34:10 -05:00
Marco Z
6d2ef74b21
Add libopenmpt to VC10 project
2019-01-03 20:28:00 -05:00
mazmazz
a851c5d7da
Add libopenmpt to cmake
2019-01-02 03:45:40 -05:00
mazmazz
953f5b6297
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2019-01-02 02:15:29 -05:00
mazmazz
109dd70a53
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
2019-01-02 02:15:16 -05:00
mazmazz
6166fad045
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2019-01-02 02:14:49 -05:00
mazmazz
075f28b7c8
WIP 20190101 merge
...
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
2019-01-02 01:09:15 -05:00
Digiku
5278d1ca20
Merge branch 'caps-lock-consistency-fix' into 'master'
...
Update capslock state on window re-focus
See merge request STJr/SRB2!436
2019-01-01 15:05:20 -05:00
mazmazz
7916e020d2
Fix loop_point and song_length floating point comparisons
2019-01-01 10:47:16 -05:00
mazmazz
b7bb570f97
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
2019-01-01 10:41:40 -05:00
mazmazz
78fa72514f
Implement deployer scripts for Travis -- OSX and Linux package building
2018-12-30 15:22:50 -05:00
Steel Titanium
0ebe5b258c
Inclue PNG file
2018-12-29 23:10:45 -05:00
Steel Titanium
a7b96ab83d
Update XPM icon
2018-12-29 22:52:04 -05:00
Digiku
80e30c6aaa
Merge branch 'MSVC-ARM' into 'master'
...
ARM and ARM64 support with MSVC toolchain
See merge request STJr/SRB2!412
2018-12-28 01:05:40 -05:00
Arthur
587ffa9ada
Removed gr_voodoocompatibility as even low-power mobile devices do not have this limitation
...
No longer using byte2float in DrawPolygon -- use the surface color data directly
Vertex Buffer Objects for non-interpolated model frames
Removed some old unused paletted texture stuff
2018-12-27 00:35:29 -05:00
mazmazz
74d6921f47
Merge tag 'SRB2_release_2.1.23' into md3-vanilla-ssn
2018-12-26 22:55:25 -05:00
james
0b857f127f
Update capslock state on window re-focus
2018-12-26 15:49:57 -08:00
mazmazz
894c139bf1
Update code versions to 2.1.23
2018-12-26 16:31:43 -05:00
mazmazz
7fc79f0b88
Merge remote-tracking branch 'public-gl/master' into 2122-version
2018-12-24 17:31:03 -05:00
mazmazz
ed410575d6
Only SetWindowGrab if !disable_mouse; toggle cursor visibility
2018-12-23 22:09:16 -05:00
Steel Titanium
46d1a866d8
Another attempt to lock the mouse
2018-12-23 18:54:15 -05:00
mazmazz
c0a0c5ac5d
Merge remote-tracking branch 'public-gl/next' into 2122-version
2018-12-23 18:09:14 -05:00
Arthur
b19252651f
Removed all glBegin/glEnd references
...
MD2/MD3 now works, with the exception of WAD textures for some odd reason
2018-12-23 17:00:11 -05:00
Monster Iestyn
2d675750cf
fix inconsistent "tabbing" in the VS project files from when I added in lua_blockmaplib.c
2018-12-23 21:52:49 +00:00
Steel Titanium
40a037f603
A more through out attempt to lock the mouse
2018-12-23 14:54:14 -05:00
mazmazz
b49cf11fb6
Merge remote-tracking branch 'public-gl/next' into 2122-version
2018-12-22 23:41:55 -05:00
Steel Titanium
66e13cf1cc
SDL:Auto grab input
2018-12-22 23:28:59 -05:00
Alam Ed Arias
0ed9665a79
Added static library of SDL2 and SDL2_mixer for ARM systems
2018-12-22 20:48:15 -05:00
Alam Ed Arias
102fd11cb4
More work to cleanup the ARM builds
2018-12-22 19:50:32 -05:00
mazmazz
8707b2f40a
Center window on current monitor during vidmode change
2018-12-22 01:43:58 -05:00