Commit graph

3063 commits

Author SHA1 Message Date
mazmazz
70f2e9a7ab Merge remote-tracking branch 'public-gl/master' into md3-vanilla 2019-01-07 04:06:45 -05:00
Digiku
031e234d86 Merge branch 'changecontrol-text-overflow-fix' into 'master'
Resolve buffer overflow crash when configuring System Menu and GIF controls

See merge request STJr/SRB2!445
2019-01-04 19:39:17 -05:00
Digiku
e42e1178ed Increase M_ChangecontrolResponse message buffer by 25 chars 2019-01-04 19:38:36 -05:00
mazmazz
7be2e9cc30 Revert "Un-dummy md5 checks"
This reverts commit b7528134e7.
2019-01-04 11:31:20 -05:00
mazmazz
ccd742d92e Fix blinking MD2 models
MD2 models are forced to load float frames, so mesh->indices is never loaded, so glDrawElements can't be used. Use glDrawArrays instead.
2019-01-03 00:57:14 -05:00
mazmazz
b7528134e7 Un-dummy md5 checks 2019-01-02 23:31:29 -05:00
Digiku
4560b4cb41 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
Digiku
5149fb7d66 Merge branch 'appveyor-installer-revise' into 'master'
Make AppVeyor installer paths consistent with Travis installer paths

See merge request STJr/SRB2!446
2019-01-01 11:52:42 -05:00
mazmazz
7d66f912d0 Make AppVeyor installer paths consistent with Travis installer paths(assets/deployer/installer -> assets/installer) 2019-01-01 11:51:17 -05:00
Digiku
80dc98624b Merge branch 'mingw-64bit-cpu-target-revise' into 'master'
MinGW64:Target nocona for 64-bit builds [revision]

See merge request STJr/SRB2!440
2019-01-01 11:15:34 -05:00
Digiku
2374750d3c 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
f2aa86cab2 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
77eea3c41d Use optional asset archive instead of file 2018-12-31 17:31:25 -05:00
mazmazz
61e8685713 Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config 2018-12-31 01:43:47 -05:00
mazmazz
262dc5dac6 Rename ASSET_PATCH_DLL_GET to PACKAGE_PATCH_DLL_GET 2018-12-30 10:43:17 -05:00
mazmazz
8591455701 Implement install building for appveyor (deployer) 2018-12-30 03:42:55 -05:00
mazmazz
d36fc9f854 Merge branch 'mingw-64bit-cpu-target-revise' into appveyor-64 2018-12-29 23:46:16 -05:00
mazmazz
657f6c75c8 Add 64-bit DD buildbot 2018-12-29 23:16:08 -05:00
mazmazz
555be9c76f Consolidate [%CONFIGURATION%] == [SDL64] into %X86_64% 2018-12-29 23:15:09 -05:00
mazmazz
0ae3e51c7a Disable UPX by default in appveyor 2018-12-29 22:51:10 -05:00
mazmazz
13b143614e Add 64-bit SDL builds to appveyor config 2018-12-29 22:17:41 -05:00
mazmazz
deec4550d3 Rename M5 to ARCHOPTS; allow override by command line 2018-12-29 21:55:35 -05:00
mazmazz
44d2340a5b 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
f7f0c3bbf6 Merge branch 'timedemo-revise' into md3-vanilla 2018-12-29 12:09:32 -05:00
mazmazz
fe93469dc4 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
87c40b2dc5 Add framecount to timedemo message 2018-12-28 22:59:54 -05:00
Digiku
1517c16c4d 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
96b42605d6 Reset timedemo counters after wipe 2018-12-27 23:23:09 -05:00
mazmazz
670107ed63 Add framecount increment to HWR_RenderPlayerView
Analogue to R_RenderPlayerView; used for timedemo FPS reading
2018-12-27 23:05:06 -05:00
mazmazz
1686448b2a Compile fix -- remove (void)alpha from DoScreenWipe 2018-12-27 22:29:12 -05:00
Arthur
60afa76c3a Eliminate some old GL functions so we don't slide back into bad habits! 2018-12-27 22:10:10 -05:00
Arthur
5f6108f278 Fix screen transitions 2018-12-27 22:09:00 -05:00
Steel Titanium
f61c8fa279 Don't set if LINUX64 is defined 2018-12-27 21:17:02 -05:00
Steel Titanium
46d3e06576 Stupid restrictions 2018-12-27 19:00:18 -05:00
Steel Titanium
3ca95acc56 More explict check 2018-12-27 18:54:10 -05:00
mazmazz
cd6964876e Buildbot fixes 2018-12-27 01:00:09 -05:00
Steel Titanium
faaf298c4f Target nocona for 64-bit builds 2018-12-27 00:56:33 -05:00
mazmazz
fe77293122 Compile fixes -- specify GLubyte for pglColor4ubv 2018-12-27 00:50:43 -05:00
Arthur
c0fbd2f841 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
f18e09e638 Removed unused PF_Md2 flag
More OpenGL performance increase by making assumptions about client state
2018-12-27 00:30:07 -05:00
Arthur
f01d708edf boolean fix for VS
add GL_NORMALIZE
2018-12-27 00:24:21 -05:00
mazmazz
eb78f92641 Ignored fread fix 2018-12-27 00:01:51 -05:00
mazmazz
1ec384e3d0 More mixed d&c fixes 2018-12-26 23:50:35 -05:00
mazmazz
04188af28a byte -> char 2018-12-26 23:40:29 -05:00
mazmazz
43e1432cf6 Mixed D&C fixes 2018-12-26 23:39:34 -05:00
mazmazz
afe299559e Fix floating point comparisons 2018-12-26 23:15:28 -05:00
mazmazz
dcc17021b5 Merge tag 'SRB2_release_2.1.23' into md3-vanilla-ssn 2018-12-26 22:55:25 -05:00
james
77a5a31135 Update capslock state on window re-focus 2018-12-26 15:49:57 -08:00
Digiku
1358a8dd8f 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
7e923333b9 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