8cf093a19d
Linux joystick fixes.
2012-09-07 01:01:17 +02:00
1653541aca
Formatting.
2012-09-06 23:03:54 +02:00
ea7ab3e01b
Fixed broken selector signature.
2012-09-06 23:02:33 +02:00
cbcab56a25
Merge branch 'master' into EGL
...
Conflicts:
include/GL/glfw3.h
src/opengl.c
src/win32_opengl.c
src/window.c
src/x11_fullscreen.c
src/x11_glx_opengl.c
src/x11_platform.h
src/x11_window.c
tests/glfwinfo.c
2012-09-06 21:05:03 +02:00
a3502a7f00
Merge branch 'tls' of github.com:elmindreda/glfw into tls
2012-09-06 15:41:47 +02:00
5e23620c7f
Merge branch 'master' into tls
...
Conflicts:
src/x11_window.c
2012-09-06 15:40:18 +02:00
67390ac2f4
Merge branch 'showwindow' of github.com:elmindreda/glfw into showwindow
2012-09-06 15:33:26 +02:00
9a183090e0
Merge branch 'master' into showwindow
...
Conflicts:
src/window.c
2012-09-06 15:11:50 +02:00
52c27113d3
Shortened PC boolean name.
2012-09-02 15:21:40 +02:00
89b42d084d
Replaced glfwGetDesktopMode with glfwGetVideoMode.
2012-08-30 01:54:01 +02:00
560b6b5a11
Merge branch 'master' into multi-monitor
...
Conflicts:
src/CMakeLists.txt
src/internal.h
src/x11_platform.h
2012-08-29 20:36:07 +02:00
2502e4d6f3
Renamed glfwGetJoystickPos to glfwGetJoystickAxes.
2012-08-29 18:58:16 +02:00
38e4cc3dad
Removed superfluous comments.
2012-08-29 17:29:46 +02:00
cdcf3be462
Removed event debug printfs.
2012-08-29 17:26:54 +02:00
54f1a57f8d
Added channel bit depth hint defaults.
2012-08-29 16:00:54 +02:00
d5ede06859
Removed WS_VISIBLE from creation flags.
2012-08-28 21:37:07 +02:00
54fceaaf64
Clarified result comparison.
2012-08-28 20:24:37 +02:00
53245d754e
Added detection of joystick disconnect on X11.
2012-08-28 20:16:43 +02:00
d0ad28f174
Merge branch 'master' into showwindow
2012-08-28 17:52:31 +02:00
e10d935efe
API tag and error message cleanup.
2012-08-28 15:03:57 +02:00
9696321334
Fixed return value of glfwGetCurrentContext.
2012-08-27 13:52:10 +02:00
2a8b2ccef4
Split internal prototypes into APIs.
2012-08-27 03:55:45 +02:00
035a8f4a49
Merge branch 'master' into tls
...
Conflicts:
src/x11_window.c
2012-08-26 21:56:55 +02:00
bb635729ec
Fixed spelling of GLFW.
2012-08-26 21:29:39 +02:00
aaaac00aa5
Comment fixes.
2012-08-26 21:29:26 +02:00
bd5ff15769
Moved error handling to init module.
2012-08-26 18:49:39 +02:00
85ca7ee184
Shortened comment.
2012-08-26 18:42:59 +02:00
5d52ad1548
Replaced GLFWGLOBAL and _init_c_ with extern.
2012-08-26 18:42:15 +02:00
1839c1c73d
Added joystick API error checks for shared and Linux code.
2012-08-26 18:28:30 +02:00
c28fb4ca0c
Cleaned up Linux joystick code.
2012-08-26 18:15:47 +02:00
2b6080fc20
Merge branch 'master' of github.com:elmindreda/glfw
2012-08-26 15:39:10 +02:00
bf3486f077
Comment updates and formatting.
2012-08-26 15:38:18 +02:00
f6a1bbf782
Added GLFW_VISIBLE to glfwWindowParam.
2012-08-21 21:57:13 +02:00
0e63488b40
Cocoa window visibility fixes.
2012-08-21 21:35:42 +02:00
8bb5c59d2d
Added GLFW_VISIBLE window hint and parameter.
2012-08-21 21:19:01 +02:00
3d2722dc4c
Fixed broken call to glfwShowWindow.
2012-08-21 20:32:44 +02:00
a2ca095b86
Renamed GLFW_WINDOW_RESIZABLE to GLFW_RESIZABLE.
...
This matches GLFW_ACTIVE and GLFW_ICONIFIED.
2012-08-21 20:28:36 +02:00
596132c3a1
Add glfwShowWindow, glfwHideWindow
...
Add glfwShowWindow and glfwHideWindow functions to allow explicit
control over show/hide window.
Remove platform specific show window code from _glfwPlatformCreateWindow
but call glfwShowWindow from glfwCreateWindow to avoid breaking things
(for now).
2012-08-21 21:01:57 +03:00
b77bdea734
Merge pull request #18 from madcad/master
...
Fixed compilation issues on OS X.
2012-08-19 18:28:10 -07:00
3f34b091b8
Gave MinGW link library a .a suffix.
2012-08-16 19:23:54 +02:00
84b2787f0d
Formatting.
2012-08-16 19:11:31 +02:00
3f39c5ae42
Fixed compiling issues on mac os x with llvm-gcc 4.2
2012-08-14 23:34:26 +02:00
8bf5fc72d0
Merge branch 'master' into multi-monitor
2012-08-14 22:00:43 +02:00
0c92fb8500
Added clearing of global joystick data.
2012-08-14 22:00:11 +02:00
ac653761b9
Formatting.
2012-08-14 21:58:22 +02:00
cd6d957eca
Moved internal API code to proper location.
2012-08-14 21:47:09 +02:00
17cac4bfa0
Formatting.
2012-08-14 16:55:48 +02:00
2b0f8c2f1e
Removed 'device' from monitor callback.
2012-08-14 15:15:51 +02:00
39c171a61d
Merge branch 'master' into multi-monitor
...
Conflicts:
tests/modes.c
2012-08-14 14:02:37 +02:00
9af03e141b
Merge branch 'master' into tls
2012-08-14 14:00:19 +02:00
Camilla Berglund