fe43deacec
Merge branch 'master' into responsefile-fix
2018-11-22 23:02:20 -05:00
aa607ecf4c
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_again
...
# Conflicts:
# src/d_clisrv.c
# src/m_misc.c
2018-11-18 18:26:50 +00:00
02c08a3e10
Some small changes
2018-11-14 21:01:54 -05:00
f02105732e
Fix up compiling on DD version
2018-11-14 18:00:10 -05:00
c5a97dcfe6
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into mingw-64bit
2018-11-14 17:28:41 -05:00
f73ea4f984
Clean up warnings
2018-11-14 10:52:16 -05:00
f3b59c1731
Fix VC project files to include hw_clip.c/h
2018-11-14 12:11:57 +00:00
0b97b2a76c
Missed #ifdef HAVE_LIBGME in win_snd
2018-11-13 22:50:08 -05:00
4836e711d3
Fix up 64-bit MINGW
2018-11-13 20:32:18 -05:00
2db2b6e6af
Win32 boolean fixes
2018-11-13 17:24:19 -05:00
499faec555
Merge remote-tracking branch 'srb2public/next'
...
(Huge change: NO_MIDI is now a define, simply because that makes it easier for me to resolve merge conflicts if I can see the original code and the new code. Also means that people who REALLY miss MIDI can compile & fix it themselves :P)
2018-11-07 16:15:14 -05:00
a288b95458
Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup
2018-10-19 22:04:26 -04:00
a1e1aa81b5
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
# src/g_game.c
# src/p_floor.c
# src/p_user.c
# src/r_data.c
# src/r_data.h
# src/v_video.c
2018-10-14 21:52:05 +01:00
6184f91dd3
Add an int to I_PlaySound to tell an interface which channel number SRB2 is using.
...
I've voided this out on other sound interfaces than SDL Mixer ones because I'm both not sure whether they need it, and not sure how to make them work with it if they do.
2018-10-13 23:01:11 +01:00
027e6e8e3c
Change win_snd.c also
2018-10-07 15:00:48 -04:00
b812a6a4ab
Really fix DD compiling this time.
2018-10-04 22:56:11 -04:00
fc5d969642
Fix DD compiling
2018-10-04 22:44:26 -04:00
8afdda8249
Disable VSync by default. I wouldn't be surprised if there are issues that arise from it, and I'm fairly sure its always been slightly spotty.
2018-10-04 21:08:47 +01:00
54f94b80db
MP Core Win32: Fix FadeSong unused callback param (buildbots)
2018-09-20 08:41:40 -04:00
e4f48cfb71
MusicPlus core: Win32 DD compile fixes
2018-09-18 14:09:13 -04:00
c5ea6b5efe
MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport
2018-09-18 10:22:17 -04:00
0999b0f8a8
srb2dd music cleanup fixes
2018-09-14 13:24:15 -04:00
b0c47e2fb1
GME fix: play song in I_PlaySong, not I_LoadSong
...
(cherry picked from commit 5f21bf230d9716b7cc5b52e4bf3591ebe01e9f3a)
2018-09-14 10:45:39 -04:00
4d61f00b86
Refactor I_MusicType MusicPlaying and MusicPaused other targets
...
(cherry picked from commit 9e6eebeb8d6b4119d87e9678bb6b0687e3dc5217)
2018-09-14 10:45:39 -04:00
d535c14fc6
Refactoring and reordering other targets
...
(cherry picked from commit cf065e106f68fb8af3b0568eba188c8235b1656e)
2018-09-14 10:43:46 -04:00
44557d9c9d
I_MusicPlaying, I_MusicPaused other targets
...
(cherry picked from commit d5ec38815968e267aceb59a48a6cb6d3292c0b69)
2018-09-14 10:28:35 -04:00
e58a8f4fe1
Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume other targets
...
(cherry picked from commit 9fb9386f84b3739fe765a78bcb9683eb7e98bc36)
2018-09-14 10:23:47 -04:00
46b53e8bae
Added I_GetMusicType and removed midimode variable: other targets
...
(cherry picked from commit 14b393ab16736bb44dab6fd4a90b7bdd8ff782e0)
2018-09-14 09:55:45 -04:00
b59aa27104
Loose ends other targets
...
(cherry picked from commit 9a5fc5f66a31baf713c6f32f7a696b933da6907b)
2018-09-14 09:41:08 -04:00
08a23d7b87
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2.git into sonicitems
...
# Conflicts:
# src/g_game.c
# src/v_video.c
2018-08-26 12:42:55 +01:00
89cce5c461
More menu stuff!
...
* Center level selection.
* Re-work Record Attack screen.
* Re-order MP Main menu, hide in NONET.
* Combined yeeeah on vote screen.
* Colour gametype on tab and tally.
* (unrelated) Don't show "CHECK" if exiting.
2018-07-02 01:55:01 +01:00
5c8c35e773
Deallocate when I_Quit() is called instead.
2018-06-23 15:09:11 -04:00
2139d4771f
Default sound volume is too loud
2018-04-11 14:40:05 -04:00
36b52e1c67
Merge remote-tracking branch 'refs/remotes/srb2public/next'
...
# Conflicts:
# src/f_finale.c
# src/hardware/hw_draw.c
# src/hardware/hw_main.c
# src/m_misc.c
2018-04-07 18:43:59 -04:00
77af3a8f95
Optimise the screen texture setup for SDL2, Post-processor, and wipes.
...
Only use glCopyTexImage2D when first creating the screen texture, use glCopyTexSubImage2D anytime after that as it does not define a new texture each time.
Flushing of the screen textures has been implemented for when the screen size changes (so that the screen textures don't stay at a wrong size) and the game is closed, I believe they would leave a memory leak before.
2018-03-07 22:55:21 +00:00
42ddd32406
Merge remote-tracking branch 'refs/remotes/srb2public/master'
2018-01-02 22:59:43 -05:00
f397b5fc3f
Makefile: disable win_dbg for DirectDraw
2017-12-26 20:42:37 -05:00
a29203acd8
Disable win_dbg
2017-12-26 20:24:08 -05:00
e2b604fdfd
TCP: remove BADSOCKET
2017-12-26 19:56:50 -05:00
c38423eeb0
Merge remote-tracking branch 'srb2public/next' into quads
...
Update
2017-12-22 20:55:59 -05:00
cf10b55be0
Win32: pragma hell
2017-10-28 18:39:42 -04:00
3ecc304332
Win32: just ignore format overflows
2017-10-28 18:33:47 -04:00
0250040a5b
Win32: all fails of DD and try more to stop format-overflow errors
2017-10-28 18:24:07 -04:00
a4072260db
Win32: try to fix up CD printf code
2017-10-28 18:13:59 -04:00
5fe2f4928f
Merge remote-tracking branch 'refs/remotes/srb2public/next' into zarrotsu
...
# Conflicts:
# src/doomdef.h
# src/sdl/i_main.c
# src/sdl/i_video.c
# src/y_inter.c
2017-10-17 15:53:34 -04:00
108b0c2732
Merge branch 'master' into disable_gettext
2017-03-29 16:56:44 -04:00
f50ecc0dcd
Most items work (netgame needs testing), will do fireballs later.
2017-02-26 17:38:24 -05:00
559607dfe2
version num 1.0.04; Removed unneeded files from the md5 check
2017-02-17 19:39:10 -05:00
68d439a783
Merge branch 'upstream/next' into zarrotsu_vanillamerge
...
# Conflicts:
# src/Makefile
# src/doomdef.h
# src/hardware/hw_main.c
# src/p_mobj.c
# src/p_user.c
# src/r_segs.c
# src/sdl/i_video.c
# src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
2d6c7959ed
Merge branch 'SRB2_release_2.1.15' into zarrotsu_vanillamerge
...
# Conflicts:
# .gitignore
# libs/zlib/projects/visualc10/zlib.vcxproj
# src/Makefile
# src/am_map.c
# src/d_main.c
# src/dehacked.c
# src/doomdef.h
# src/g_game.c
# src/hardware/hw_main.c
# src/hardware/hw_md2.c
# src/info.c
# src/p_inter.c
# src/p_map.c
# src/p_mobj.c
# src/p_spec.c
# src/p_user.c
# src/r_bsp.c
# src/r_plane.c
# src/r_segs.c
# src/r_things.c
# src/s_sound.c
# src/s_sound.h
# src/sdl/Srb2SDL-vc10.vcxproj
# src/win32/Srb2win-vc10.vcxproj
# src/win32/Srb2win.ico
# src/y_inter.c
2017-02-17 20:03:10 +00:00
b0b51f9a61
Some position code
2017-02-12 23:25:06 -05:00
580f909c6c
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 17:19:58 -05:00
628d1c4dab
DD: Mingw 3.4.5 build fix
2017-01-16 16:40:16 -05:00
55925cabe8
win32: fixup printf warnings
2017-01-08 14:06:30 -05:00
fca398ae4d
Win32 Debugger: no need for Win32 interface code for SDL
2016-12-22 19:40:02 -05:00
d782638da8
Merge branch 'zlib_pkgconfig' into 'master'
...
Zlib pkgconfig
Linux build to include libgme by default
See merge request !116
2016-12-18 21:44:19 -05:00
93c9841360
move Windows zlib options out of PNG to ZLIB
2016-11-06 15:11:02 -05:00
1f6388a2e0
Fix up Win32 interface code misdeclaration of I_ClipboardPaste()
2016-11-03 14:35:32 -04:00
bb20cfd6be
Clipboard copy/paste testing
...
(unfinished, but basics work)
2016-11-03 01:43:57 -07:00
e4a970f894
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
69f556d40a
Split AA trees code from m_misc.c/.h into m_aatree.c/.h
...
Also updated any relevant project files that I can think of to include the new files, as well as the makefile of course. Some of the other project files haven't been touched in years so I'll leave those alone ...unless someone objects
2016-06-05 21:29:40 +01:00
f21c72b889
debug: always load exchndl.dll
2016-05-31 21:30:18 -04:00
b96b999c1e
MSVC: Move x86/x64 settings into commons props
2016-05-22 21:55:55 -04:00
79f3d6e072
MSVC: Tidy up project files by hand
2016-05-22 11:54:32 -04:00
57091261d9
MSVC: fixed up MSVC project
2016-05-21 23:53:04 -04:00
ff5587d1d5
Merge branch 'master' into next
2016-05-19 18:03:56 -04:00
c846b0ab23
Aren't some of these things already added later in sdl/Makefiles.cfg?
...
* -lSDL2_mixer is already added to SDL_LDFLAGS by default, unless NOMIXER=1 is set
* -DSDLMAIN should also be added to OPTS by default for MINGW=1 builds, unless NOSDLMAIN=1 is set
2016-05-19 16:51:05 +01:00
e2a5783521
Merge branch 'master' into next
2016-05-19 01:39:45 -04:00
ab9f2ea831
MSVC: fixup Debug build linked
2016-05-18 21:11:30 -04:00
7058baed44
Merge branch 'master' into next
2016-05-18 20:07:27 -04:00
bbf9f5adc8
Makefile: use built-in SDL2 and SDL2_mixer for Mingw32 and Mingw64
2016-05-18 16:54:55 -04:00
5aa48cf7ca
fixed up old VS 2010 project to work with VS 2015, tested with FMOD/DirectX
2016-05-18 01:35:35 -04:00
b3b5521e1b
Merge branch 'master' into next
2016-02-25 18:33:29 -05:00
b258b9b503
remove cpuaffinity code from SDL
...
still exists in DD (while it exists) but no longer saves.
No reason whatsoever for affinity to be settable by the game itself.
2016-02-22 23:08:34 -08:00
69f9c10a99
16/02/15 Starting some setup
2016-02-15 11:08:54 -05:00
83461f49c5
Merge branch 'public_todo_next' into next
...
All commits that was in private that are not SRB2 2.2 had moved to public's next
2015-04-01 12:32:34 -04:00
c43b41e183
Fix generation of SRB2DD target.
...
It still won't compile correctly. But this should avoid the error
messages related to it.
2015-03-08 04:30:07 -05:00
0dff0d84de
New HD SRB2 icon by VAdaPEga.
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8994 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-01 20:07:56 -05:00
53799eb390
cmake: Add CPack Package Generation
...
Generates zips only at the moment
2015-01-28 16:42:05 -06:00
05f5ec664a
Initial CMake support pass
...
Compiles the SDL2 target on Windows successfully
2015-01-27 23:46:39 -06:00
3eafca0dc1
Fix compile errors on win32, warnings elsewhere
2014-11-13 22:58:08 -06:00
be1565fce3
Add support for new HWR functions in win32 and sdl12
2014-11-13 22:34:09 -06:00
404b5f666c
SRB2 2.1.12 release
2014-11-11 19:55:07 -05:00
1bfea632c9
sdl2: windows exe rename srb2sdl2.exe
2014-07-25 23:08:37 -05:00
c59df51d19
Merge branch 'master' into sdl2
...
Conflicts:
comptime.sh
2014-04-09 14:54:06 -04:00
25448dec36
Compile Win32 EXE with -gdwarf-2
2014-04-07 10:03:14 -04:00
d040190a66
Merge branch 'master' of github.com:STJr/SRB2 into sdl2
2014-03-24 19:47:14 -04:00
a9c2395e8d
SDL interface no longer use FMOD.dll
2014-03-24 19:40:54 -04:00
15bd266cac
SRB2 2.1.5 release
2014-03-23 12:00:29 -04:00
b93cb1b65a
SRB2 2.1 release
2014-03-15 13:11:35 -04:00
Steel Titanium