stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-29 14:10:43 +00:00
Code Issues Projects Releases Packages Wiki Activity
8424 commits 173 branches 41 tags 313 MiB
Commit graph

8424 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz
b7bb570f97 Merge remote-tracking branch 'public-gl/master' into public-musicplus-core 2019-01-01 10:41:40 -05:00
Digiku
ce7875b133 Merge branch 'appveyor-64' into 'mingw-64bit-cpu-target-revise' 
Add 64-bit job to Appveyor

See merge request STJr/SRB2!442
 2019-01-01 10:14:37 -05:00
Digiku
bd81c3190e Merge branch 'appveyor-deployer' into 'appveyor-64' 
Add Windows installer building to AppVeyor

See merge request STJr/SRB2!443
 2019-01-01 10:14:25 -05:00
mazmazz
4d4b048ead Don't download individual asset files; support only archives 2018-12-31 19:11:01 -05:00
mazmazz
f00cfb7b3f Use optional asset archive instead of file 2018-12-31 17:31:25 -05:00
mazmazz
d61eb7edee Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config 2018-12-31 01:43:47 -05:00
Steel Titanium
f73501fd11 Update libgme to 0.6.2 2018-12-30 22:49:11 -05:00
mazmazz
78fa72514f Implement deployer scripts for Travis -- OSX and Linux package building 2018-12-30 15:22:50 -05:00
mazmazz
e1300d5173 Rename ASSET_PATCH_DLL_GET to PACKAGE_PATCH_DLL_GET 2018-12-30 10:43:17 -05:00
mazmazz
941e29780c Implement install building for appveyor (deployer) 2018-12-30 03:42:55 -05:00
mazmazz
bef0bc82e4 Merge branch 'mingw-64bit-cpu-target-revise' into appveyor-64 2018-12-29 23:46:16 -05:00
mazmazz
e7165444b4 Add 64-bit DD buildbot 2018-12-29 23:16:08 -05:00
mazmazz
0fc07ebaae Consolidate [%CONFIGURATION%] == [SDL64] into %X86_64% 2018-12-29 23:15:09 -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
mazmazz
2aa7ee70fe Disable UPX by default in appveyor 2018-12-29 22:51:10 -05:00
mazmazz
34534428fd Add 64-bit SDL builds to appveyor config 2018-12-29 22:17:41 -05:00
mazmazz
3d2e58861d Rename M5 to ARCHOPTS; allow override by command line 2018-12-29 21:55:35 -05:00
mazmazz
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
mazmazz
1a4f1e54f3 Merge branch 'timedemo-revise' into md3-vanilla 2018-12-29 12:09:32 -05:00
mazmazz
b3908755af Add CSV functionality to timedemo 
* Append timedemo trials to timedemo.csv
* Specify -csv <trialid> to toggle CSV behavior
* Specify -quit to immediately quit after timedemo
* Add ticrate, rendermode, video mode, demo name, bits to CSV timedemo row
 2018-12-29 04:51:00 -05:00
mazmazz
56892c13ab Add framecount to timedemo message 2018-12-28 22:59:54 -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
mazmazz
89c12a4ee8 Reset timedemo counters after wipe 2018-12-27 23:23:09 -05:00
mazmazz
1d9b8d357b Add framecount increment to HWR_RenderPlayerView 
Analogue to R_RenderPlayerView; used for timedemo FPS reading
 2018-12-27 23:05:06 -05:00
mazmazz
34915f0508 Compile fix -- remove (void)alpha from DoScreenWipe 2018-12-27 22:29:12 -05:00
Arthur
4f1f315563 Eliminate some old GL functions so we don't slide back into bad habits! 2018-12-27 22:10:10 -05:00
Arthur
b83790260f Fix screen transitions 2018-12-27 22:09:00 -05:00
Steel Titanium
d048e7cbec Don't set if LINUX64 is defined 2018-12-27 21:17:02 -05:00
Steel Titanium
5ba0863876 Stupid restrictions 2018-12-27 19:00:18 -05:00
Steel Titanium
4a05fd5f26 More explict check 2018-12-27 18:54:10 -05:00
mazmazz
f7a01c60a4 Buildbot fixes 2018-12-27 01:00:09 -05:00
Steel Titanium
6dddf61265 Target nocona for 64-bit builds 2018-12-27 00:56:33 -05:00
mazmazz
f6e8b26af1 Compile fixes -- specify GLubyte for pglColor4ubv 2018-12-27 00:50:43 -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
Arthur
a812acc3d4 Removed unused PF_Md2 flag 
More OpenGL performance increase by making assumptions about client state
 2018-12-27 00:30:07 -05:00
Arthur
0978732ecd boolean fix for VS 
add GL_NORMALIZE
 2018-12-27 00:24:21 -05:00
mazmazz
8c3e6642a7 Ignored fread fix 2018-12-27 00:01:51 -05:00
mazmazz
5ec40cf906 More mixed d&c fixes 2018-12-26 23:50:35 -05:00
mazmazz
52f668e9b0 byte -> char 2018-12-26 23:40:29 -05:00
mazmazz
036e44aa21 Mixed D&C fixes 2018-12-26 23:39:34 -05:00
mazmazz
b175629748 Fix floating point comparisons 2018-12-26 23:15:28 -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
Digiku
da9447342c Merge branch '2123-version' into 'master' 
Update code versions to 2.1.23

See merge request STJr/SRB2!435
 2018-12-26 17:14:58 -05:00
Digiku
ebb4c65d92 Merge branch 'srb2-chat-nonet' into 'master' 
Hide SRB2-CHAT behind #ifndef NONET

See merge request STJr/SRB2!434
 2018-12-26 17:13:23 -05:00
mazmazz
60bdc056f8 Also hide Chat Options if NONET 2018-12-26 16:41:39 -05:00
mazmazz
894c139bf1 Update code versions to 2.1.23 2018-12-26 16:31:43 -05:00
mazmazz
814db7e371 Hide SRB2-CHAT behind #ifndef NONET 2018-12-26 16:20:17 -05:00
Monster Iestyn
e39c6b47e7 Merge branch 'vanilia-savegame-fix' into 'master' 
Fix saving game progress on a unmodified game

See merge request STJr/SRB2!433
 2018-12-26 16:05:16 -05:00