lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
3033 commits 1 branch 29 tags 122 MiB
Commit graph

3033 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz a3fd5e7247 Revert "Un-dummy md5 checks" 
This reverts commit 908a6d321d.
 2019-01-04 11:31:20 -05:00
mazmazz bbcc82e9b4 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 908a6d321d Un-dummy md5 checks 2019-01-02 23:31:29 -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
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
mazmazz f7a01c60a4 Buildbot fixes 2018-12-27 01:00:09 -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
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
Steel Titanium 4f18ec60bc Fix saving progress on vanilia 2018-12-26 15:47:12 -05:00
Digiku 98e46f5b1c 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 fa6f791ec3 Fix -ANGLE_180 because MSVC complains 
-ANGLE_180 evaluates equal to ANGLE_180.
 2018-12-25 01:14:05 -05:00
Digiku 26f956acea 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 73a67fc9f5 Merge branch 'ctf-enemy-flag-sound' into 2122-version 2018-12-25 00:27:08 -05:00
mazmazz 842bcfc8a0 Merge remote-tracking branch 'public-gl/master' into 2122-version 2018-12-25 00:19:45 -05:00
mazmazz a626660564 Merge remote-tracking branch 'public-gl/next' into 2122-version 2018-12-25 00:19:42 -05:00
Digiku a5b3f0397f 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 0b81debf94 Merge remote-tracking branch 'public-gl/master' into undo-old-side-discolor-fix 2018-12-25 00:09:24 -05:00
Digiku 1d474626f4 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 82a40f0dba Support Look Up/Down keys for NiGHTS movement 2018-12-24 23:48:03 -05:00
mazmazz b7edc7f870 Revert "Merge branch 'side-discolor-fix' into 'master'" 
This reverts commit e721a3d882, reversing
changes made to 4656a0d02c.
 2018-12-24 20:58:26 -05:00
mazmazz bfc501a271 Revert default console backcolor to green; changed from CHAT commit 2018-12-24 20:57:11 -05:00
Digiku cb42702e6b 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 10a3e3fec9 Define EPSILONs only if not already defined 
Fixes OSX buildbot
 2018-12-24 20:36:28 -05:00
mazmazz c65f44e805 Remove log message 2018-12-24 20:33:59 -05:00
mazmazz e9e5128754 Use DBL_EPSILON for colormap comparison 2018-12-24 20:22:10 -05:00
Alam Ed Arias 4651eddc36 Merge branch 'master' into next 2018-12-24 20:15:45 -05:00
mazmazz 58728ec358 Fix float comparison for colormap maskamt 2018-12-24 19:58:05 -05:00
Alam Ed Arias 89133160ec TravisCI: GCC 8.x needs to pass 2018-12-24 19:10:29 -05:00
mazmazz 32697ddf61 Fix gcc 8 compile by using strcpy instead of memcpy for PM 2018-12-24 18:51:11 -05:00
Digiku e721a3d882 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