Commit Graph

4117 Commits

Author SHA1 Message Date
Camilla Berglund
ea664c8a39 Added comments. 2012-09-12 20:54:12 +02:00
Camilla Berglund
c83b336a4c Formatting. 2012-09-12 20:53:57 +02:00
Camilla Berglund
fa4f6b43f6 Added monitor stubs for Cocoa. 2012-09-12 20:44:08 +02:00
Camilla Berglund
830f2b439c Cleanup. 2012-09-12 20:41:14 +02:00
Camilla Berglund
83f5b920b9 Merge branch 'master' into multi-monitor
Conflicts:
	.gitignore
	src/CMakeLists.txt
	src/x11_window.c
2012-09-12 06:04:17 +02:00
Camilla Berglund
64c677be9e Renamed config macro to match convention. 2012-09-12 03:17:50 +02:00
Camilla Berglund
e15e92b583 Fixed function grouping. 2012-09-11 23:56:44 +02:00
Camilla Berglund
0e2b12be43 Corrected comment. 2012-09-11 23:53:10 +02:00
Camilla Berglund
023b816bcc Disallowed hiding of fullscreen windows. 2012-09-11 23:51:45 +02:00
Camilla Berglund
d214bfdfde Made defaults test window hidden. 2012-09-11 22:23:35 +02:00
Camilla Berglund
dcc3d67158 Merge branch 'showwindow' 2012-09-11 20:03:55 +02:00
Camilla Berglund
7be55239e7 Disabled native API by default. 2012-09-11 20:02:13 +02:00
Camilla Berglund
0272ce2e98 Merge branch 'master' into EGL
Conflicts:
	src/glx_opengl.c
	src/opengl.c
	tests/glfwinfo.c
2012-09-09 19:52:33 +02:00
Camilla Berglund
7493bbe0c8 Removed X11 prefix from EGL and GLX files. 2012-09-09 19:33:40 +02:00
Camilla Berglund
74488bec67 Further isolated X11-specific parts of EGL code. 2012-09-09 19:21:14 +02:00
Camilla Berglund
0ca1e67d7a Moved X11-specific defines to X11 header. 2012-09-09 19:03:17 +02:00
Camilla Berglund
dd69985649 Fixed API error tags. 2012-09-09 19:01:48 +02:00
Camilla Berglund
feef05f839 Removed superfluous inclusion. 2012-09-09 14:22:14 +02:00
Camilla Berglund
50d68c83bb Fixed TinyCThread declaring timespec on OS X. 2012-09-09 13:56:57 +02:00
Camilla Berglund
2b946289d8 Added direct dependency on librt for threads test on X11. 2012-09-09 01:31:23 +02:00
Camilla Berglund
9f94286c9a Merge branch 'master' into showwindow
Conflicts:
	readme.html
2012-09-08 21:20:45 +02:00
Camilla Berglund
bd70e53352 Added missing flags for size hints. 2012-09-08 21:13:31 +02:00
Camilla Berglund
a49c61f1a7 Updated TinyCThread. 2012-09-08 20:43:08 +02:00
Camilla Berglund
b4d0223faa Formatting. 2012-09-07 15:48:03 +02:00
Camilla Berglund
4cb569b5b3 Replaced guessing with dirent and regex. 2012-09-07 15:27:41 +02:00
Camilla Berglund
487bcea235 Merge branch 'master' into joystickname 2012-09-07 02:19:16 +02:00
Camilla Berglund
e70ced5e05 Fixed bad editing in Cocoa joystick code. 2012-09-07 02:15:54 +02:00
Camilla Berglund
93a1d1c226 Added stubs, implemented on Linux and Cocoa. 2012-09-07 01:01:34 +02:00
Camilla Berglund
8cf093a19d Linux joystick fixes. 2012-09-07 01:01:17 +02:00
Camilla Berglund
755c2a364b Updated .gitignore. 2012-09-06 23:57:36 +02:00
Camilla Berglund
8a948753df Added printing of debug context window parameter. 2012-09-06 23:55:23 +02:00
Camilla Berglund
8f82e02a51 Updated credit. 2012-09-06 23:05:19 +02:00
Camilla Berglund
1653541aca Formatting. 2012-09-06 23:03:54 +02:00
Camilla Berglund
ea7ab3e01b Fixed broken selector signature. 2012-09-06 23:02:33 +02:00
Camilla Berglund
c03659e9c3 Updated change log and credit. 2012-09-06 21:42:42 +02:00
Camilla Berglund
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
Camilla Berglund
a3502a7f00 Merge branch 'tls' of github.com:elmindreda/glfw into tls 2012-09-06 15:41:47 +02:00
Camilla Berglund
5e23620c7f Merge branch 'master' into tls
Conflicts:
	src/x11_window.c
2012-09-06 15:40:18 +02:00
Camilla Berglund
67390ac2f4 Merge branch 'showwindow' of github.com:elmindreda/glfw into showwindow 2012-09-06 15:33:26 +02:00
Camilla Berglund
9a183090e0 Merge branch 'master' into showwindow
Conflicts:
	src/window.c
2012-09-06 15:11:50 +02:00
Camilla Berglund
a339098bc0 Formatting. 2012-09-02 15:22:56 +02:00
Camilla Berglund
52c27113d3 Shortened PC boolean name. 2012-09-02 15:21:40 +02:00
Camilla Berglund
1f05fa6945 Merge remote-tracking branch 'github/multi-monitor' into multi-monitor 2012-08-30 02:21:24 +02:00
Camilla Berglund
62cc39bd2a Merge branch 'master' into multi-monitor 2012-08-30 02:17:37 +02:00
Camilla Berglund
733cd5372f Fixed and separated GLFW version check. 2012-08-30 02:17:08 +02:00
Camilla Berglund
2b9f54d650 Improved output of modes test. 2012-08-30 02:12:02 +02:00
Camilla Berglund
89b42d084d Replaced glfwGetDesktopMode with glfwGetVideoMode. 2012-08-30 01:54:01 +02:00
Camilla Berglund
e0ce920191 Formatting. 2012-08-29 20:39:05 +02:00
Camilla Berglund
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
Camilla Berglund
2502e4d6f3 Renamed glfwGetJoystickPos to glfwGetJoystickAxes. 2012-08-29 18:58:16 +02:00