Commit Graph

1328 Commits

Author SHA1 Message Date
Camilla Berglund
c1bb1d8a6e Merge branch 'master' into multi-monitor
Conflicts:
	tests/iconify.c
2012-10-18 18:42:45 +02:00
Camilla Berglund
ccec055ff7 Formatting. 2012-10-18 17:54:55 +02:00
Camilla Berglund
550b0c177d Added missing initial value. 2012-10-18 16:25:15 +02:00
Camilla Berglund
e6556c7f34 Comment grammar fix. 2012-10-17 17:11:56 +02:00
Camilla Berglund
d6210b11f3 Formatting. 2012-10-05 05:42:47 +02:00
Camilla Berglund
6ac7af38d9 Began using monitor position for window placement. 2012-10-05 04:10:42 +02:00
Camilla Berglund
2c6f4329a4 Updated iconification test to use callbacks. 2012-10-05 04:00:27 +02:00
Camilla Berglund
2bb62a1467 Bug fix formatting. 2012-10-04 04:08:53 +02:00
Camilla Berglund
ae5da60c18 Fixed test for wrong client API. 2012-10-04 04:05:37 +02:00
Camilla Berglund
f236fc2f61 Fixed X11 hidden cursor mode. 2012-10-02 18:03:21 +02:00
Camilla Berglund
ddeca47117 Removed executable flag from header. 2012-10-02 17:25:37 +02:00
Camilla Berglund
88fb5c1cf3 Merge branch 'master' into multi-monitor 2012-10-02 17:24:50 +02:00
Camilla Berglund
464619d5c8 Updated change log. 2012-10-02 17:24:30 +02:00
Camilla Berglund
26480901fd Added glfwGetWindowMonitor. 2012-10-02 17:24:18 +02:00
Camilla Berglund
21a015778f Replaced malloc and memset with calloc. 2012-10-02 17:07:59 +02:00
Camilla Berglund
ff09d3a343 Merge branch 'master' into multi-monitor 2012-10-02 03:11:32 +02:00
Camilla Berglund
5fcfcb2ddc Updated comment. 2012-09-30 15:53:20 +02:00
Camilla Berglund
d00c194f4a Added 8 bits of stencil to defaults. 2012-09-30 15:51:59 +02:00
Camilla Berglund
937f137246 Improved error formatting. 2012-09-30 15:51:46 +02:00
Camilla Berglund
c764ae81e8 Added missing window parameter return. 2012-09-30 15:43:26 +02:00
Camilla Berglund
38cad9aff0 Added client API window hint.
This is cherry-picked from the EGL branch in preparation for the EGL backend.
2012-09-30 15:32:50 +02:00
Camilla Berglund
bf8639e49f Removed unused struct member. 2012-09-30 14:54:58 +02:00
Camilla Berglund
508c7fe0e6 Merge branch 'master' into multi-monitor
Conflicts:
	src/window.c
2012-09-27 23:32:26 +02:00
Camilla Berglund
410a4e29e1 Moved from gl3.h to glcorearb.h. 2012-09-27 22:28:04 +02:00
Camilla Berglund
1be1636326 Begun integrating monitor and window. 2012-09-27 21:38:35 +02:00
Camilla Berglund
fe0cc512a2 Added missing cast. 2012-09-27 15:18:57 +02:00
Camilla Berglund
7fa27f1e98 Fixed warnings on VC++. 2012-09-27 02:49:20 +02:00
Camilla Berglund
c5f7eff190 Fixed use of functions missing on VC++. 2012-09-27 02:35:19 +02:00
Camilla Berglund
a73384d87c Merge branch 'joystickname' of github.com:elmindreda/glfw into joystickname 2012-09-23 16:58:59 +02:00
Camilla Berglund
85cfc6bdd0 Merge branch 'master' into joystickname
Conflicts:
	src/x11_joystick.c
2012-09-23 15:46:42 +02:00
Camilla Berglund
9d6945a766 Merge branch 'master' into EGL
Conflicts:
	CMakeLists.txt
	include/GL/glfw3.h
	readme.html
	src/CMakeLists.txt
	src/internal.h
	src/window.c
2012-09-23 15:35:45 +02:00
Camilla Berglund
7aaeb6955b Merge branch 'master' into multi-monitor
Conflicts:
	src/x11_window.c
2012-09-23 15:26:53 +02:00
Camilla Berglund
c0dcb5a056 Fixed fullscreen regressions. 2012-09-23 15:08:43 +02:00
Camilla Berglund
6a5ebbc870 Merge branch 'master' into multi-monitor 2012-09-23 14:44:56 +02:00
Camilla Berglund
718af531a3 Fixed order of operations. 2012-09-23 14:08:36 +02:00
Camilla Berglund
d6d5fb2684 Simplified character input. 2012-09-19 13:17:53 +02:00
Camilla Berglund
14f00ffa67 Removed unused struct member. 2012-09-16 12:43:33 +02:00
Camilla Berglund
b711b2fc72 Formatting. 2012-09-16 12:42:51 +02:00
Camilla Berglund
a2dab25b06 Added fallback for X11 monitor size. 2012-09-13 22:04:01 +02:00
Camilla Berglund
1027935cdf Merge branch 'master' of github.com:elmindreda/glfw 2012-09-13 21:58:16 +02:00
Camilla Berglund
dbd4d1657e Formatting. 2012-09-13 21:57:42 +02:00
Camilla Berglund
20a49a7eee Improved handling of primary monitor. 2012-09-13 17:46:40 +02:00
Camilla Berglund
89018331f7 Fixed invalid uses of glfwDestroyWindow. 2012-09-13 17:29:07 +02:00
Camilla Berglund
d21e79642b Added output of monitor position. 2012-09-13 16:47:59 +02:00
Camilla Berglund
a0305affeb Began implementing multi-monitor on Cocoa. 2012-09-13 16:37:06 +02:00
Camilla Berglund
633839502c Fixed various VC++ warnings. 2012-09-13 00:05:54 +02:00
Camilla Berglund
5bbbf8640e Formatting. 2012-09-12 23:03:15 +02:00
Camilla Berglund
b4493dd3bc Removed paranoid error check. 2012-09-12 23:03:07 +02:00
Camilla Berglund
4f8f6c7d89 Fixed monitor enumeration on Win32. 2012-09-12 22:51:55 +02:00
Camilla Berglund
f6ba959b1b Moved threads package to X11 block. 2012-09-12 21:54:00 +02:00