Tim Angus
bde7665462
Merge branch 'master' into sdl2
...
Conflicts:
code/sdl/sdl_input.c
2013-08-16 23:34:08 +01:00
Zack Middleton
81909bb266
Fix text getting appended to vid_restart in command buffer
...
I was getting unknown command "vid_restart-button2" warning on OSX when trying to use alt-return to toggle fullscreen.
2013-08-03 17:40:50 -05:00
Zack Middleton
30fcabec65
SDL Mouse Button clean up
...
Make 'b' variable an int so that key values more than 255 will work (not currently an issue in ioq3 afaik).
Use SDL_BUTTON_* for easier transition to SDL2.
(SDL2 doesn't have SDL_BUTTON_WHEELUP or SDL_BUTTON_WHEELDOWN, X1/X2 are different values.)
2013-07-09 14:41:56 -05:00
Tim Angus
d9d52f0306
Merge branch 'master' into sdl2
...
Conflicts:
Makefile
code/renderercommon/qgl.h
code/renderergl1/tr_local.h
code/sdl/sdl_glimp.c
2013-05-08 14:27:15 +01:00
Tim Angus
2da0fd6de8
Add renderercommon/tr_common.h
2013-02-16 20:58:04 +00:00
Tim Angus
f6fb9eb602
renderer -> renderergl1, rend2 -> renderergl2
2013-02-15 23:46:37 +00:00
Tim Angus
51df89ab13
Remove the SMP renderer feature
2013-01-24 22:53:08 +00:00
Tim Angus
42586b782b
Improve console key situation
2013-01-21 22:20:15 +00:00
Tim Angus
9b8711d2e1
Fix wacky patch for r_ignorehwgamma
2013-01-19 21:39:35 +00:00
Tim Angus
aaea838d39
Convert SDL text input to UTF-32
2013-01-19 21:35:09 +00:00
Tim Angus
3105d62027
Allow hardware gamma, in theory
2013-01-18 21:53:37 +00:00
Tim Angus
61ed67bd1a
Make the mousewheel work
2013-01-17 19:04:27 +00:00
Tim Angus
f478761e07
Use SDL 2 instead of SDL 1.2
2013-01-17 18:20:03 +00:00
Zack Middleton
0167b439c9
Don't include client.h in sdl_glimp.c as it is part of the external renderer lib.
2012-10-13 23:15:02 +00:00
Zack Middleton
1aaf9d3e7b
Use correct fallback height and width for r_mode -2.
2012-08-27 15:38:55 +00:00
Zack Middleton
42d3ff8d1d
Added r_mode -2, uses desktop resolution. Bug #5408 . Patch by Andrei Drexler and myself.
2012-08-27 14:52:41 +00:00
Thilo Schulz
1af9c636a5
r_ignorehwgamma 1 does not actually turn on software gamma ( #5511 ) - patch by Serge Belyshev
2012-07-01 17:01:30 +00:00
Zack Middleton
fb1f629bbc
Removed unnessicary "!!".
2012-06-01 19:49:07 +00:00
Zack Middleton
021ce233b2
#5484 - Remove unneeded tr_local.h include from sdl_input.c. Patch by Harley Laue.
2012-04-04 17:16:11 +00:00
Zack Middleton
7a1efc19a4
Support up to 16 joystick axes, select which to use with j_*_axis cvars.
2012-02-15 18:26:08 +00:00
Zack Middleton
4113f63a63
Changed the joystick axis to key remap to start at K_JOY17 (fits better with hat_keys and K_JOY16 is used by button).
2011-09-09 21:46:37 +00:00
Zack Middleton
1469df546e
Reverted r2145 per Timbo's suggestion.
2011-08-11 20:57:39 +00:00
Zack Middleton
1609d1c42b
- Added r_mode -2 for using display resolution.
...
- Changed q3_ui's very high video settings use display resolution.
2011-08-11 05:14:42 +00:00
Zack Middleton
a87b059ab7
Don't grab mouse till UI loads.
2011-08-05 19:47:33 +00:00
Thilo Schulz
40dfcee06e
Modular rendering system. Patch by use.less01
...
This might break MSVC builds. I'll take care of it later
2011-08-01 01:19:55 +00:00
Thilo Schulz
dee3724a13
- Improve game_restart:
...
* differing screen resolutions and network settings are now honoured when changing fs_game
* Fix hunk memory leak on game_restart
* Move cls.state and cls.servername to clc so connection state is fully preserved over game_restart
* Revert back to previous fs_game after disconnecting from a server that triggered a game_restart
* Fix error dialog popping up after every game_restart if an error happened previously (reported by Ensiform)
- Fixed that not all commands added by CL_Init() would be removed by CL_Shutdown()
2011-06-21 11:18:35 +00:00
Thilo Schulz
4b9ab42c2c
Remove newlines from Com_Error calls, patch by DevHC
2011-05-14 14:32:43 +00:00
Thilo Schulz
c95bd0a684
Remove newlines from Com_Error message format strings, patch by DevHC
2011-05-12 14:02:48 +00:00
Thilo Schulz
9541fca878
Add better support for analog joysticks, patch by use.less01
2011-04-19 13:26:15 +00:00
Thilo Schulz
6b82f4fd09
Consider key states before startup, patch by Zack Middleton ( #4950 )
2011-04-17 22:09:05 +00:00
Thilo Schulz
bce3848523
Make buffers for device lists a bit longer. Just in case.
2011-03-11 13:53:22 +00:00
Thilo Schulz
37727b892c
Rename cvar "in_joystickThreshold" to "joy_threshold" as QVMs use the latter name.
2011-03-08 02:14:39 +00:00
Thilo Schulz
dd0161f475
Add in_availableJoysticks to list usable joysticks, similar to s_alAvailableDevices. Some parts of the patch provided by Zack Middleton
2011-03-07 22:56:03 +00:00
Thilo Schulz
fef4d12d68
Refactoring patch by DevHC
2011-03-05 19:20:37 +00:00
Thilo Schulz
a56e448850
Add minimize command ( #4531 )
2011-02-10 19:21:13 +00:00
Tim Angus
005f870ebe
* Sys_Dialog for more user friendly error reporting
...
* (bug #3932 ) Recovery from bad video settings
2010-02-15 16:20:33 +00:00
Ludwig Nussel
6f9b34ef75
avoid setting cvars by name each frame
2010-01-06 13:47:41 +00:00
Tim Angus
c98df5ad58
* Make window centering optional, defaulting to off
2009-11-06 15:34:05 +00:00
Tim Angus
568cf2732a
* Fix to GLimp_DetectAvailableModes not sorting the first returned mode
2009-11-05 20:29:26 +00:00
Thilo Schulz
bd2ab9bffd
- implement r_noborder, inspired by patch from ensiform ( #4289 )
...
- Add Sys_SetEnv for portable setting of environment variables
- Default ioquake3 to appear on the center of the screen if running in windowed mode.
2009-11-03 20:29:43 +00:00
Tim Angus
968892c61b
* Bump the minimum SDL version up to 1.2.10, and remove workarounds for earlier versions
2009-10-25 22:36:32 +00:00
Tim Angus
43d31f7c3a
* (bug #4316 ) Hack to work around suspected driver bug (Lakitu7)
2009-10-25 21:48:48 +00:00
Tim Angus
96a3b4b169
* Remove superfluous f from warning
2009-09-28 12:44:43 +00:00
Tim Angus
0ba8b20305
* Avoid calculating a NaN when failing to compute the display aspect ratio
2009-09-28 11:57:16 +00:00
Ryan C. Gordon
8c04462b34
Handle r_colorbits values better.
...
Fixes Bugzilla #4244 .
2009-09-15 02:51:09 +00:00
Ryan C. Gordon
842f27818b
Fix SGI systems choosing an inefficient 36-bit color visual.
...
Now they'll choose 16 or 32 bit correctly with this magic.
Fixes Bugzilla #4245 .
2009-09-15 01:01:07 +00:00
Ryan C. Gordon
b096ca1d04
Allow optional window resizing.
...
Fixes Bugzilla #2844 .
2009-09-14 22:07:34 +00:00
Tim Angus
64a0a078d2
* Fix warning in cl_main.c
...
* Fix bug #4026 (SDL dx backend doesn't work on some machines)
2009-09-14 12:34:31 +00:00
Zachary Slater
95060e4fb6
See here:
...
http://bugzilla.icculus.org/show_bug.cgi?id=4064
2009-06-13 22:00:28 +00:00
Tim Angus
b2d87c4b2a
* Add Com_HexStrToInt
...
* Fixed some whacky indentation in q_shared.c
* Allow single character keys e.g. 'c' to be used in cl_consoleKeys in addition
to ASCII characters
* Experimental code to ignore dead keys
2008-09-05 23:38:35 +00:00