Camilla Berglund
|
c06f838d88
|
Merge branch 'master' into multi-monitor
Conflicts:
.gitignore
examples/CMakeLists.txt
include/GL/glfw3.h
src/CMakeLists.txt
src/internal.h
src/win32_platform.h
src/win32_window.c
src/x11_fullscreen.c
src/x11_platform.h
tests/listmodes.c
|
2012-07-05 16:15:01 +02:00 |
|
Camilla Berglund
|
cef9dea1d2
|
Unified nomenclature for cursor positions.
|
2012-06-22 13:57:25 +02:00 |
|
Camilla Berglund
|
bf42c3cfbc
|
Made glfwGetProcAddress return a function pointer.
|
2012-06-05 00:16:40 +02:00 |
|
Camilla Berglund
|
fbb2f24ebb
|
Merge branch 'context-window-split'
Conflicts:
src/x11_init.c
src/x11_platform.h
src/x11_window.c
|
2012-06-03 16:31:56 +02:00 |
|
Camilla Berglund
|
79bef68511
|
Only restore gamma ramp if it has been changed.
|
2012-05-24 11:46:51 +02:00 |
|
Camilla Berglund
|
1a99827432
|
Moved the type declarations.
|
2012-04-22 21:49:38 +02:00 |
|
Camilla Berglund
|
21e77fe1a6
|
Split platform-specific global data.
|
2012-04-22 15:53:02 +02:00 |
|
Camilla Berglund
|
f868712f02
|
Simplified clipboard API.
|
2012-04-12 00:51:58 +02:00 |
|
Camilla Berglund
|
bf1ada029b
|
Added window parameter to clipboard API.
|
2012-04-09 16:00:54 +02:00 |
|
Camilla Berglund
|
7044ed6f06
|
Simplified and made clipboard API more type safe.
|
2012-04-09 15:54:36 +02:00 |
|
Camilla Berglund
|
952c6b7e82
|
Merge branch 'master' into clipboard
|
2012-04-09 15:33:03 +02:00 |
|
Camilla Berglund
|
c1dd245d8a
|
Moved input functions to input section.
|
2012-04-06 14:37:31 +02:00 |
|
Camilla Berglund
|
92d4c02e07
|
Merge branch 'master' into clipboard
Conflicts:
src/CMakeLists.txt
|
2012-03-29 13:29:28 +02:00 |
|
Camilla Berglund
|
4ef9aec7e0
|
Made scrolling deltas floating point.
|
2012-03-28 21:54:09 +02:00 |
|
Camilla Berglund
|
d022e54934
|
Merge branch 'master' into clipboard
|
2012-03-28 14:58:03 +02:00 |
|
Camilla Berglund
|
8109470e72
|
Merge branch 'master' into cursor-enter-leave
|
2012-03-22 12:06:00 +01:00 |
|
Tai Chi Minh Ralph Eastwood
|
5937af089e
|
Merge branch 'master' of github.com:raedwulf/glfw into clipboard
Conflicts:
src/CMakeLists.txt
tests/CMakeLists.txt
|
2012-02-19 06:29:48 +00:00 |
|
Tai Chi Minh Ralph Eastwood
|
d561e3a0b0
|
Merge branch 'master' of github.com:raedwulf/glfw into clipboard
Conflicts:
tests/CMakeLists.txt
|
2012-02-19 06:17:52 +00:00 |
|
Camilla Berglund
|
0c3b1b5a0e
|
Removed allocator.
|
2012-02-07 14:58:58 +01:00 |
|
Camilla Berglund
|
f6dfaf50ad
|
Formatting.
|
2012-02-05 16:56:26 +01:00 |
|
Camilla Berglund
|
fb465377e3
|
Merge remote-tracking branch 'adrian/multi-display-support' into multi-monitor
|
2012-02-05 02:50:22 +01:00 |
|
Camilla Berglund
|
6b98a04d17
|
Merge branch 'utf8' into multi-monitor
Conflicts:
src/CMakeLists.txt
|
2012-02-04 20:12:28 +01:00 |
|
Camilla Berglund
|
b997db3a8b
|
Removed GLFWthreadmodel and glfwInitWithModels.
|
2012-02-04 01:38:00 +01:00 |
|
Camilla Berglund
|
ce288a8939
|
Transformed glfwEnable/Disable/SetCursorMode into glfwGetInputMode/SetInputMode.
|
2012-02-04 00:51:35 +01:00 |
|
Camilla Berglund
|
b016d642ab
|
Comment fixes.
|
2012-01-31 15:27:15 +01:00 |
|
Camilla Berglund
|
c4806b9532
|
Merged cursor enter/leave callbacks.
|
2012-01-30 22:59:38 +01:00 |
|
Camilla Berglund
|
1ddafc25a6
|
Moved new cursor input code to other cursor input code.
|
2012-01-30 22:30:40 +01:00 |
|
Hanmac
|
0b752b84c3
|
Added API and X11 implementation of cursor enter and leave callbacks.
|
2012-01-30 22:19:39 +01:00 |
|
Marcel Metz
|
df64773a44
|
Moved monitor callback to shared implementation.
|
2012-01-30 14:55:23 +01:00 |
|
Marcel Metz
|
f228d23024
|
Moved platform specific monitor list creation part to separate functions.
|
2012-01-30 12:33:32 +01:00 |
|
Marcel Metz
|
6f970f5753
|
Made monitor list cleanup shared.
|
2012-01-30 12:04:16 +01:00 |
|
Marcel Metz
|
4c6681bad6
|
Merge branch 'master' into multi-display-support
Conflicts:
src/CMakeLists.txt
src/input.c
|
2011-11-22 16:06:24 +01:00 |
|
Camilla Berglund
|
a18cd1b14c
|
Renamed GLFW_WINDOW_NO_RESIZE to GLFW_WINDOW_RESIZABLE.
|
2011-11-02 16:56:34 +01:00 |
|
Camilla Berglund
|
2660b27cf3
|
Renamed internal cursor position in preparation of new API.
|
2011-10-13 15:20:59 +02:00 |
|
Camilla Berglund
|
72ef537425
|
Added input function for window damage events.
|
2011-10-09 21:12:13 +02:00 |
|
Camilla Berglund
|
d0840bdea1
|
Added more input functions to clarify internal API.
|
2011-10-09 17:10:40 +02:00 |
|
Marcel Metz
|
784f60365e
|
Stub implementation of monitor callback.
|
2011-10-09 00:20:34 -04:00 |
|
Marcel Metz
|
ac57be060d
|
Merge branch 'master' into multi-display-support
Conflicts:
src/fullscreen.c
src/win32_window.c
src/x11_fullscreen.c
|
2011-10-07 00:35:37 -04:00 |
|
Camilla Berglund
|
9738728298
|
Reshuffling, formatting and shortening.
|
2011-10-06 23:28:56 +02:00 |
|
Marcel Metz
|
3aa4976d6f
|
Removed constant string length for monitor parameters.
|
2011-10-03 13:54:05 -04:00 |
|
Marcel Metz
|
426df42d00
|
Replaced display with monitor in monitor related api.
|
2011-10-03 03:24:35 -04:00 |
|
Marcel Metz
|
58d4323ece
|
Implemented display aware glfwVideoModes function for X11 XRandR and win32.
|
2011-10-02 16:47:15 -04:00 |
|
Marcel Metz
|
beacbb3447
|
Implemented display iteration for x11. Added attributes and queries for physical size, name and logical position. Updated test executable.
|
2011-10-02 16:47:06 -04:00 |
|
Marcel Metz
|
3cb4dea453
|
Fixed implementation on win32 platform for iteration of video modes.
|
2011-10-02 16:18:31 -04:00 |
|
Camilla Berglund
|
a98c66c8cb
|
Added glext header explanation.
|
2011-09-22 14:15:07 +02:00 |
|
Ralph Eastwood
|
31c91545be
|
Added clipboard stubs.
|
2011-09-21 10:09:47 +01:00 |
|
Camilla Berglund
|
d0af26cd43
|
Allow error callback to be set before glfwInit.
|
2011-09-16 01:16:31 +02:00 |
|
Camilla Berglund
|
3b733b91bb
|
Fixed header include paths.
|
2011-09-06 17:32:41 +02:00 |
|
Camilla Berglund
|
b1656d7323
|
Replaced GLFW_MOUSE_CURSOR enable with glfwSetCursorMode.
|
2011-09-06 13:55:29 +02:00 |
|
Camilla Berglund
|
c1ab73b979
|
Renamed context-related functions to more closely match underlying APIs.
|
2011-07-27 16:01:27 +02:00 |
|