Commit graph

3033 commits

Author SHA1 Message Date
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
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
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
mazmazz
cd6964876e Buildbot fixes 2018-12-27 01:00:09 -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
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
mazmazz
a25c755a6b Also hide Chat Options if NONET 2018-12-26 16:41:39 -05:00
mazmazz
7deac7e603 Update code versions to 2.1.23 2018-12-26 16:31:43 -05:00
mazmazz
bd4874aa53 Hide SRB2-CHAT behind #ifndef NONET 2018-12-26 16:20:17 -05:00
Monster Iestyn
c181ac84ba 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
Steel Titanium
73dc40a0b1 Fix saving progress on vanilia 2018-12-26 15:47:12 -05:00
Digiku
a473896d2d Merge branch 'large-room-msvc-fix' into 'next'
Fix -ANGLE_180 because MSVC complains

See merge request STJr/SRB2!432
2018-12-25 01:15:02 -05:00
mazmazz
91abcd66b7 Fix -ANGLE_180 because MSVC complains
-ANGLE_180 evaluates equal to ANGLE_180.
2018-12-25 01:14:05 -05:00
Digiku
ab017edd6e Merge branch '2122-version' into 'next'
Update code versions to 2.1.22

See merge request STJr/SRB2!402
2018-12-25 00:45:14 -05:00
mazmazz
7fe19c2f09 Merge branch 'ctf-enemy-flag-sound' into 2122-version 2018-12-25 00:27:08 -05:00
mazmazz
818438d5d0 Merge remote-tracking branch 'public-gl/master' into 2122-version 2018-12-25 00:19:45 -05:00
mazmazz
610d43cc84 Merge remote-tracking branch 'public-gl/next' into 2122-version 2018-12-25 00:19:42 -05:00
Digiku
d9fdeaaa75 Merge branch 'undo-old-side-discolor-fix' into 'master'
Undo old side discolor fix

See merge request STJr/SRB2!431
2018-12-25 00:14:41 -05:00
mazmazz
8586643467 Merge remote-tracking branch 'public-gl/master' into undo-old-side-discolor-fix 2018-12-25 00:09:24 -05:00
Digiku
9c11d58bae Merge branch 'nights-pgup-control' into 'next'
Support Look Up/Down keys for NiGHTS movement

See merge request STJr/SRB2!430
2018-12-24 23:53:35 -05:00
mazmazz
3e712b57c5 Support Look Up/Down keys for NiGHTS movement 2018-12-24 23:48:03 -05:00
mazmazz
a7ac8179f5 Revert "Merge branch 'side-discolor-fix' into 'master'"
This reverts commit f81144d7b1, reversing
changes made to c24d860eea.
2018-12-24 20:58:26 -05:00
mazmazz
de0943352a Revert default console backcolor to green; changed from CHAT commit 2018-12-24 20:57:11 -05:00
Digiku
90e673a487 Merge branch 'float-compare-colormap-fix' into 'master'
Fix float comparison for colormap maskamt

See merge request STJr/SRB2!428
2018-12-24 20:55:06 -05:00
mazmazz
59ac969594 Define EPSILONs only if not already defined
Fixes OSX buildbot
2018-12-24 20:36:28 -05:00
mazmazz
52b6810ee1 Remove log message 2018-12-24 20:33:59 -05:00
mazmazz
7c3dcd2bf9 Use DBL_EPSILON for colormap comparison 2018-12-24 20:22:10 -05:00
Alam Ed Arias
fa5ff9c0cf Merge branch 'master' into next 2018-12-24 20:15:45 -05:00
mazmazz
732b9a66ca Fix float comparison for colormap maskamt 2018-12-24 19:58:05 -05:00
Alam Ed Arias
008fecbba7 TravisCI: GCC 8.x needs to pass 2018-12-24 19:10:29 -05:00
mazmazz
34964a07a8 Fix gcc 8 compile by using strcpy instead of memcpy for PM 2018-12-24 18:51:11 -05:00
Digiku
f81144d7b1 Merge branch 'side-discolor-fix' into 'master'
Fix colormap bleeding onto sides [by Jimita]

See merge request STJr/SRB2!427
2018-12-24 17:33:34 -05:00