James R
be14b8a564
dumbass doesn't test changes before pushing directly to next
2020-08-14 08:25:12 -07:00
James R
3e02f5d0cb
Add http-mserv to fuck
...
(cherry picked from commit 1a1c215a9110491a3c7324045dc96c18b604d9e7)
2020-08-09 23:34:16 -07:00
Steel Titanium
3d1110a0c2
Fix cmake using wrong libs if internal libs is turned on
...
Use '\0' instead, just in case
(cherry picked from commit 9293c6cb32109b5b003114ab441e312df76f263c)
2020-08-09 20:28:33 -07:00
James R
54e446199d
Merge remote-tracking branch 'origin/next' into http-mserv
2020-08-08 15:05:03 -07:00
James R
fa90ff6bae
Merge remote-tracking branch 'origin/master' into next
2020-07-16 19:00:21 -07:00
James R
93615b07be
Merge remote-tracking branch 'origin/next' into http-mserv
2020-07-13 08:58:43 -07:00
James R
4985d94386
Merge remote-tracking branch 'origin/master' into cmake-adjustments
2020-07-12 16:24:24 -07:00
James R
b9a24001d8
Merge remote-tracking branch 'origin/next' into remove-glide-2
2020-07-12 16:05:15 -07:00
James R
479bbeacbe
Merge remote-tracking branch 'origin/next' into http-mserv
2020-07-11 17:41:46 -07:00
Jaime Passos
4f6420274f
Remove Software tricks
2020-07-06 01:26:56 -03:00
Jaime Passos
abeedc4b65
Delete hw_glide.h
2020-07-06 00:27:34 -03:00
mazmazz
8fc414536f
CMAKE: Move launch-c into more sensible location
2020-06-10 15:08:09 -04:00
mazmazz
36e17006b7
CMAKE: Fix OS X ccache scripts
2020-06-09 11:12:52 -04:00
mazmazz
f3c1db0650
CMAKE: Fix OSX CCache error
2020-06-08 03:08:58 -04:00
mazmazz
aef9a1b522
CMAKE: Add CCACHE support
2020-06-08 00:35:31 -04:00
mazmazz
a449fa4a1d
Added SDL Mixer X to CMAKE (Windows only)
2020-06-08 00:01:15 -04:00
Hannu Hanhi
abe13651d0
OpenGL draw call batching system
2020-06-07 21:20:52 +03:00
James R
1ccca987cb
Jart? What's that?
2020-05-15 12:57:31 -07:00
Steel Titanium
ff8987f745
Support for http downloads
...
(cherry picked from commit 6fcc06bf72cf3b95c30f04919e807c7aaacec68d)
(cherry picked just the libcurl stuff)
2020-05-13 17:25:52 -07:00
Monster Iestyn
7a585e2498
Merge branch 'next' into demos-refactor
...
# Conflicts:
# src/g_game.c
(also update g_demo.c)
2020-03-20 17:48:31 +00:00
Monster Iestyn
1a14234088
update Makefile, CMakeLists.txt and MSVC project files
2020-03-19 20:13:39 +00:00
Louis-Antoine
e3cbdf8fab
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
Monster Iestyn
31b1188a3e
Merge branch 'master' into next
2020-03-15 20:32:43 +00:00
Monster Iestyn
37ecb47436
update Makefile, CMakeLists.txt and MSVC project files
2020-03-08 19:48:23 +00:00
Louis-Antoine
e8760fe5dd
Update Lua I/O support to 2.2
2020-01-22 23:08:57 +01:00
Eidolon
d63ad82dc5
[cmake] Remove srb2dd target
2019-12-15 00:47:58 -06:00
Jaime Passos
245881ec55
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-12 21:38:02 -03:00
Jaime Passos
a22af36305
add r_patch.c
2019-10-28 15:28:42 -03:00
mazmazz
dc0a92ea62
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla
2019-06-29 17:51:30 -04:00
Steel Titanium
fe7b041346
Merge branch 'public-notpublic-libopenmpt' into 'master'
...
libopenmpt support
See merge request STJr/SRB2Internal!229
2019-06-21 17:03:53 -04:00
Nev3r
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
Steel Titanium
91767a7740
Merge branch 'master' into public-musicplus-libopenmpt
2019-05-20 21:33:10 -04:00
mazmazz
3d90488d17
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-05-02 17:43:40 -04: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
mazmazz
1bfc4c02e4
CMake fixes for OpenMPT
2019-01-03 21:17:18 -05:00
mazmazz
a851c5d7da
Add libopenmpt to cmake
2019-01-02 03:45:40 -05:00
mazmazz
c844141322
Add new model files to CMake
2018-12-18 20:36:39 -05:00
Monster Iestyn
11cb163435
Backport the Blockmap library I made two years ago
2018-11-30 17:11:11 +00:00
Steel Titanium
6020abab94
Fix the not found errors on DLLs
2018-11-22 22:44:47 -05:00
Steel Titanium
1b79b9527c
Properly check if cmake is running on wwindows
...
Thanks Monster Iestyn for informing me this is the correct way.
2018-11-14 15:58:45 -05:00
Steel Titanium
2ca5e29110
Make sure the new option only works on Windows.
...
Is this how you do it? I'm not really sure.
2018-11-13 20:37:14 -05:00
Steel Titanium
d0b64222f7
Merge branch 'master' into cmake-use-internal-libs
2018-11-13 19:46:43 -05:00
Monster Iestyn
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
Steel Titanium
0f9611df76
Merge remote-tracking branch 'upstream/master' into cmake-use-internal-libs
2018-10-30 21:06:06 -04:00
Steel Titanium
2f62a03f6c
Fix up 64-bit gme
2018-10-30 20:50:36 -04:00
Alam Ed Arias
e7a1c81355
Merge branch 'cmake_nasm' into 'master'
...
CMake: Fix nasm Linux builds
When compiling under Linux with CMake and nasm/yasm enabled, the operation would fail during linking with undefined symbols related to the tmap files.
This commit adds support for passing flags to the assembler and passes ```-DLINUX``` in order to compile.
After this change, binaries are successfully compiled with either nasm or yasm on Linux systems.
Tested on Ubuntu.
See merge request !153
2017-01-12 17:21:05 -05:00
Tasos Sahanidis
5216da13f0
Don't check if SRB2_ASM_FLAGS is defined and add docstring for the assembler
2017-01-11 21:52:14 +02:00
Tasos Sahanidis
0f52606953
Pass -DLINUX to n/yasm
2017-01-11 03:16:48 +02:00
Alam Ed Arias
0b572b6eee
CMake: split inline AMS code from vid_copy.s code
2017-01-06 15:48:19 -05:00
Monster Iestyn
54b35c3975
Fix GME library path, consider 64-bit systems for png/zlib/SDL2 paths/libraries
2016-09-26 21:58:25 +01:00
