7060083db5
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
d415cd5c6d
Update copyright date on source files
2019-12-06 13:49:42 -05:00
245881ec55
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-12 21:38:02 -03:00
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
a22af36305
add r_patch.c
2019-10-28 15:28:42 -03:00
bea7224ebf
Use zones.pk3 instead of zones.dta.
2019-09-29 05:31:50 +02:00
84c9633579
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b
2019-08-04 21:33:13 -04:00
384dc0674e
Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'""
...
This reverts commit 603d5805f7
2019-08-04 12:03:57 +01:00
603d5805f7
Revert "Merge branch 'musicplus-aug2019-b' into 'master'"
...
This reverts commit 56bfdb7113c29cfbef9b
2019-08-04 11:32:55 +01:00
5b0f7d2850
Merge branch 'master' into musicplus-sdlmixerx
2019-06-29 19:31:01 -04:00
dc0a92ea62
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla
2019-06-29 17:51:30 -04:00
fe7b041346
Merge branch 'public-notpublic-libopenmpt' into 'master'
...
libopenmpt support
See merge request STJr/SRB2Internal!229
2019-06-21 17:03:53 -04:00
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
df0a40b3c2
Code refactoring to turn portal struct into a more generalized shape.
...
Split portal-related code to its own source files.
Most of the 2-line-specific setup has been moved to the function which adds a 2-line case. The portals should render as they used to so far, anyway.
2019-06-01 13:07:23 +02:00
91767a7740
Merge branch 'master' into public-musicplus-libopenmpt
2019-05-20 21:33:10 -04:00
3d90488d17
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-05-02 17:43:40 -04:00
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
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
66e6a6f940
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-01-07 04:06:45 -05:00
69965b8d98
Flip HAVE_OPENMPT on by default for non-Windows makefile
2019-01-04 01:48:04 -05:00
4a17e9ed9b
Remove dynamic openmpt loading
2019-01-03 20:52:09 -05:00
08812b1501
Revised MinGW Makefile logic for OpenMPT
2019-01-02 02:37:48 -05:00
953f5b6297
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2019-01-02 02:15:29 -05:00
6166fad045
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2019-01-02 02:14:49 -05:00
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
3d2e58861d
Rename M5 to ARCHOPTS; allow override by command line
2018-12-29 21:55:35 -05:00
4cfacf5cde
Check for NONX86 in addition to X86_64; move MINGW64 subflags from win32/Makefile.cfg to Makefile
2018-12-29 21:14:50 -05:00
d048e7cbec
Don't set if LINUX64 is defined
2018-12-27 21:17:02 -05:00
5ba0863876
Stupid restrictions
2018-12-27 19:00:18 -05:00
4a05fd5f26
More explict check
2018-12-27 18:54:10 -05:00
6dddf61265
Target nocona for 64-bit builds
2018-12-27 00:56:33 -05:00
980803e0c0
Add MD2/MD3 files to makefile
2018-12-18 17:57:39 -05:00
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
224c0fccdb
Merge branch 'public_next'
...
# Conflicts:
# src/Makefile.cfg
# src/d_clisrv.c
# src/p_setup.c
# src/r_segs.c
# src/r_things.c
2018-11-20 14:33:10 +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
4836e711d3
Fix up 64-bit MINGW
2018-11-13 20:32:18 -05:00
f2bfed7892
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-11-13 14:34:40 -05:00
a733a29f4c
Starting work on porting hw_clip.c/h code, Makefiles and CMake can compile them at least
...
Other notes:
* Renamed all new functions to have HWR_ prefix instead of gld_, for consistency
* HWR_FrustrumSetup and HWR_SphereInFrustum are disabled and require HAVE_SPHEREFRUSTRUM. This is because 1) SRB2CB did not need the code, so presumably neither will we, and 2) there are some OpenGL API functions used there that due to our way of using OpenGL we don't use outside of r_opengl.c, which makes dealing with HWR_FrustrumSetup complicated in theory
* The new clipping functions are not added to OpenGL's "main" rendering code itself just yet, they're just available to use now once hw_clip.h is included
2018-11-10 16:08:26 +00:00
291ebf302c
Merge branch 'public_next'
...
# Conflicts:
# src/Makefile
# src/lua_script.c
# src/p_user.c
# src/sdl/i_system.c
# src/v_video.c
# src/w_wad.c
2018-10-10 14:51:34 +01:00
79f5f4885c
Split zlib and libpng
2018-10-04 19:47:19 -04:00
1508f3a320
MP Libopenmpt: Make explicit OPENMPT=1 for non-windows platforms
2018-09-19 23:03:35 -04:00
4d89beb105
musicplus-libopenmpt 2.2 -> 2.1 backport
2018-09-18 12:31:47 -04:00
8ee27d3297
Makefile comments
2018-08-26 23:02:57 -04:00
be5d0406bd
Merge branch 'public_next'
...
# Conflicts:
# src/hardware/hw_md2.c
2018-07-31 19:41:54 +01:00
1ee7eda0ad
Fixup PROFILEMODE
2018-07-20 17:35:18 -04:00
75bc76e9b4
Remove all traces of "srb2.wad" support, since it is no longer needed now that srb2.pk3 is the IWAD (...IPK3?). srb2.wad cannot exactly be a pk3 file after all.
...
Additionally, rename any remaining "srb2.srb" to "srb2.pk3" in the main source code files. Not sure whether to bother dealing with srb2.srb/srb2.wad mentions in project files for now.
2017-12-07 18:26:12 +00:00
7ebaa58997
Removed makefile options that existed only for the removed ports
2017-10-11 19:11:35 +01:00
38c109ddd2
filtered out the FILTERS makefile option
2017-10-07 21:31:24 +01:00
b2bd073677
Slaughtered SDL 1.2 code
2017-10-07 18:32:50 +01:00
James R