mazmazz
0724d042bc
Add safe lua music functions
...
S_MusicExists
S_SetInternalMusicVolume
S_StopFadingMusic
S_FadeMusic
S_FadeOutStopMusic
2019-01-02 04:58:03 -05:00
mazmazz
05b27b5127
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2019-01-02 04:02:13 -05:00
mazmazz
6086a9f238
Merge branch 'public-musicplus-le-changemusic' into public-musicplus-core
2019-01-02 03:47:51 -05:00
mazmazz
7a60a739e1
Add libopenmpt to cmake
2019-01-02 03:45:40 -05:00
mazmazz
04fc9a8605
Revised MinGW Makefile logic for OpenMPT
2019-01-02 02:37:48 -05:00
mazmazz
235db51696
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2019-01-02 02:15:29 -05:00
mazmazz
e244b34093
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
2019-01-02 02:15:16 -05:00
mazmazz
1dd2899521
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2019-01-02 02:14:49 -05:00
mazmazz
81352aece1
WIP 20190101 merge
...
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
2019-01-02 01:09:15 -05:00
Jimita the Cat
6a29184b5c
Merge branch 'flashpals-on-screenshots' of https://github.com/monster-psychic-cat/SRB2 into flashpals-on-screenshots
2019-01-02 01:02:14 -03:00
Jimita the Cat
6f72f69575
dumb
2019-01-02 01:01:57 -03:00
Alam Ed Arias
13e3a975d8
Merge branch 'master' into next
2019-01-01 23:00:39 -05:00
Jimita
55e65def2c
Merge branch 'next' into flashpals-on-screenshots
2019-01-02 01:55:59 -02:00
Jimita the Cat
2cc6a22d12
Add support for flashpals in screenshots
2019-01-02 00:41:52 -03:00
Digiku
764e6e7659
Merge branch 'expanded-nmuslist' into 'next'
...
Expand NMUSList to include HUD changes
See merge request STJr/SRB2!388
2019-01-01 15:06:04 -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
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
mazmazz
8dc37a850b
Fix loop_point and song_length floating point comparisons
2019-01-01 10:47:16 -05:00
mazmazz
2326a58bc7
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
2019-01-01 10:41:40 -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
6e2d757219
Implement deployer scripts for Travis -- OSX and Linux package building
2018-12-30 15:22:50 -05:00
Steel Titanium
07f1d495a4
Inclue PNG file
2018-12-29 23:10:45 -05:00
Steel Titanium
b6538c966e
Update XPM icon
2018-12-29 22:52:04 -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