Sally Coolatta
15d18640de
Merge remote-tracking branch 'public/master' into merge-12
2020-05-12 03:16:14 -04:00
Sally Cochenour
f2aa2bb541
'sal-lighting' code ports from v2
2020-04-25 20:56:50 -04:00
Wolfy
98183fef6f
Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix
...
# Conflicts:
# src/hardware/hw_main.c
# src/hardware/r_opengl/r_opengl.c
2020-04-24 18:10:25 -05:00
Hannu Hanhi
74b846a6e3
Sky dome from SRB2
2020-04-22 00:18:58 +03:00
Wolfy
5e4ec61d82
Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix
...
# Conflicts:
# src/hardware/hw_cache.c
# src/hardware/hw_draw.c
# src/hardware/hw_glob.h
# src/hardware/hw_main.c
# src/r_bsp.h
# src/r_data.c
2020-04-11 23:47:25 -05:00
Hannu Hanhi
6bf90fc441
Batching!
2020-04-12 03:09:07 +03:00
Jaime Passos
1a759a4904
GIF recording
...
(cherry picked from commit d467d2b2295a9660631774b9edb29555cc5c30fe)
2020-03-23 17:10:33 -07:00
James R
a511d9358a
Terrible code to show the ping counter for honest servers
2020-02-23 23:07:57 -08:00
Jaime Passos
c2aab97d10
fix conflict
2019-11-12 00:23:26 +01:00
James R
de8030bc2e
Toggle ping and FPS counters with HUD
2019-08-11 12:32:57 -07:00
Latapostrophe
a35cea9243
chaos conflict
2019-06-11 17:02:47 +02:00
Jaime Passos
157b510f2b
Merge remote-tracking branch 'upstream/master' into gl_shaders
2019-06-10 16:21:46 -03:00
Monster Iestyn
c8e3748a1c
Merge branch 'master' into next
2019-05-13 16:07:30 +01:00
wolfy852
93c706bfb8
Don't skip frames when connecting or paused
2019-05-08 09:39:45 -05:00
wolfy852
4eb2a7d2eb
Merge remote-tracking branch 'remotes/pub/master' into next
2019-05-06 14:17:02 -05:00
Jaime Passos
2a3e885b9a
01052019
2019-05-01 19:37:42 -03:00
Jaime Passos
fbc3e27592
stuff
2019-04-06 23:33:34 -03:00
James R
714b4068ca
Grab mouse on window focus
...
Window focus does not necessarily imply mouse movement.
2019-03-29 22:00:47 -07:00
wolfy852
963cbf4671
Merge branch 'next' into md3-vanilla-kart
...
# Conflicts:
# src/hardware/r_opengl/r_opengl.c
2019-03-20 19:50:20 -05:00
Jaime Passos
843498ef4a
Improve custom shader support
2019-03-19 17:37:04 -03:00
Jaime Passos
cfc5bd4ac7
custom shader support
2019-03-18 23:03:29 -03:00
Jaime Passos
35459caea7
md3-vanilla
2019-03-18 18:34:20 -03:00
Jaime Passos
fd5fb73671
gl4
2019-03-17 22:27:50 -03:00
fickleheart
6555802dc0
Merge remote-tracking branch 'remotes/james/unpause-resume-sounds' into version-prep
2019-03-17 16:36:52 -05:00
James R
81669c9372
Resume sounds on unpausing after a window re-focus
2019-03-16 15:50:16 -07:00
fickleheart
5c4c0a5ff6
Merge remote-tracking branch 'remotes/upstream/next' into HEAD
2019-03-11 21:53:53 -05:00
James R
b91701c948
Miscellaneous window de-focus options
...
Music pausing is now optional.
Sounds may be paused--on by default.
The game itself being paused in off-line mode is now optional.
(showfocuslost now loads from config.)
2019-03-11 14:57:11 -07:00
Alam Arias
06cd65cc72
Merge branch 'master' into next
2019-03-11 10:01:57 -04:00
Steel Titanium
32fbfc9159
Always return false instead.
2019-03-08 18:51:55 -05:00
Steel Titanium
db07eddb3a
Properly comment out the function
2019-03-07 18:52:27 -05:00
Steel Titanium
4698130321
Fix unused function error
2019-03-07 18:20:57 -05:00
Steel Titanium
a0b06044b1
Don't skip frames in software mode
2019-03-05 22:07:53 -05:00
wolfy852
733c472e1f
Reorganization + kill old interfaces
2019-02-19 18:52:57 -06:00
Latapostrophe
4129dae3af
Move ping display in i_video for consistency with showfps display
2019-02-16 13:38:50 +01:00
Alam Arias
380bce88a0
remove whitespaces
2019-02-05 15:42:37 -05:00
james
e4a1470116
Set modifiers in a non-reactive manner
2019-01-17 16:47:01 -08:00
mazmazz
aae6eb945d
Merge remote-tracking branch 'kart-public-gl/next' into md3-vanilla-kart
2019-01-10 22:08:37 -05:00
wolfy852
5c5e6a26dd
Merge remote-tracking branch 'remotes/public/next' into gamepad-tweaks
...
# Conflicts:
# CMakeLists.txt
# appveyor.yml
# src/command.c
# src/command.h
# src/d_clisrv.c
# src/d_netcmd.c
# src/dehacked.c
# src/doomdef.h
# src/hu_stuff.c
# src/m_misc.c
2019-01-08 16:32:24 -06:00
Arthur
2b8f49fd5e
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
2019-01-07 04:33:22 -05:00
Arthur
9617e604bb
Removed all glBegin/glEnd references
...
MD2/MD3 now works, with the exception of WAD textures for some odd reason
2019-01-07 04:30:47 -05:00
Arthur
e67c1bee5d
Common model format, with MD2/MD3 loading
2019-01-07 04:21:43 -05:00
SeventhSentinel
1d58c6b8c2
merge srb2 next
2019-01-05 15:59:23 -05:00
wolfy852
f5cd56004c
JoyInfo1 -> JoyInfo
...
Don't you love it when typos ruin everything? :P
2018-12-29 13:55:58 -06:00
wolfy852
f2e5de3043
Check joystick IDs against all other players [by Digiku]
...
Untested on my end, but conceptually sound.
2018-12-29 02:33:53 -06:00
wolfy852
650df71cfc
Reorganize some of the code for SDL_JOYDEVICEADDED events
2018-12-28 14:20:28 -06:00
wolfy852
f4d6a108d5
Merge remote-tracking branch 'remotes/SRB2/vanilla-hotplug-stableid' into gamepad-tweaks
...
# Conflicts:
# src/command.c
# src/command.h
# src/g_game.c
# src/m_menu.c
# src/sdl/i_system.c
# src/sdl/i_video.c
# src/sdl/sdlmain.h
This is NOT just a normal merge commit. I have adjusted the hotplugging code from stableid to account for the last two players, and also removed new 2.1 additions that were deemed irrelevant to Kart.
2018-12-27 16:21:51 -06:00
james
77a5a31135
Update capslock state on window re-focus
2018-12-26 15:49:57 -08:00
mazmazz
fe836e6109
Only SetWindowGrab if !disable_mouse; toggle cursor visibility
2018-12-23 22:09:16 -05:00
Steel Titanium
f1c4f3c772
Another attempt to lock the mouse
2018-12-23 18:54:15 -05:00
Steel Titanium
c98024aaf0
A more through out attempt to lock the mouse
2018-12-23 14:54:14 -05:00
