Commit Graph

29838 Commits

Author SHA1 Message Date
Arzed Five
051cc3fe4d Undo Save State currently seems to be working almost as intended
(missing OSD messages). Undo Load State isn't working yet.
2016-06-08 20:27:54 +01:00
Arzed Five
4d529ffbc0 Merge remote-tracking branch 'upstream/master' 2016-06-08 17:07:18 +01:00
Arzed Five
c47b58228f Make this compile 2016-06-08 17:07:04 +01:00
twinaphex
ac29a2acc2 Free heap variable 2016-06-08 17:56:09 +02:00
Twinaphex
29012aa74f (Cocoa) Cleanups 2016-06-08 17:54:55 +02:00
twinaphex
008e622843 Add capabilities to ui_browser_window_state 2016-06-08 17:53:51 +02:00
Twinaphex
5a746e04c2 (OSX) Refactor document loading code 2016-06-08 17:51:05 +02:00
neville
817b63be99 (OSX) Buildfix for pre-OSX 10.6 2016-06-08 17:39:20 +02:00
Twinaphex
1cd441b125 (Cocoa) Reimplement browser loading code 2016-06-08 17:18:48 +02:00
twinaphex
82ae93e348 Add ui_companion_driver_get_browser_window_ptr 2016-06-08 16:56:45 +02:00
Twinaphex
8088df5f09 Cleanups 2016-06-08 16:39:46 +02:00
Twinaphex
9e5ad14da0 Start implementing untested ui_browser_window_cocoa_open function 2016-06-08 16:11:06 +02:00
twinaphex
d9e61e5153 Add missing file 2016-06-08 15:53:59 +02:00
twinaphex
7a3e3ab46b Add to Makefile files 2016-06-08 15:52:58 +02:00
twinaphex
969ef4b88d Add stub browser window implementations for Win32/Cocoa 2016-06-08 15:51:43 +02:00
twinaphex
0e01a3c84b Add ui_browser_window 2016-06-08 15:47:00 +02:00
twinaphex
d63442ca3b Implement ui_win32_msg_window 2016-06-08 10:19:37 +02:00
twinaphex
47abc22fe9 ui_win32_window.c needs to become a C++ file for DragAcceptFiles 2016-06-08 10:05:48 +02:00
Twinaphex
d178f90cc1 Remove this header 2016-06-08 08:19:06 +02:00
neville
f170856374 (OSX) Fixes 2016-06-08 07:41:59 +02:00
twinaphex
0a7bc4d21f Add 'warning' 2016-06-08 07:27:46 +02:00
twinaphex
615fc0432f Free strdup'ed values 2016-06-08 07:24:26 +02:00
twinaphex
047ffe9d30 Remove apple_display_alert 2016-06-08 07:19:19 +02:00
Twinaphex
6cf905508e Reimplement apple_display_alert to use new ui_msg_window implementation 2016-06-08 07:07:10 +02:00
twinaphex
3c7fafe9a3 Create ui_companion_driver_get_msg_window_ptr 2016-06-08 07:02:38 +02:00
Twinaphex
aa81c1d82f Start implementing ui_cocoa_msg_window.m 2016-06-08 06:56:42 +02:00
twinaphex
1fc0009cdc ui_msg_window_state - turn title and text into pointers 2016-06-08 06:37:00 +02:00
Twinaphex
a6406a57ca Add ui_cocoa_msg_window.m to Cocoa 2016-06-08 06:35:04 +02:00
twinaphex
10a25209da (Msg window) Add backends for Win32/Cocoa 2016-06-08 06:33:15 +02:00
twinaphex
a247b16164 Add ui_null_msg_window 2016-06-08 06:29:52 +02:00
twinaphex
c35e75a0bd Create ui_msg_window_t 2016-06-08 06:24:15 +02:00
twinaphex
793d0de45c Add ui_message_window_buttons/ui_message_window_response 2016-06-08 06:17:26 +02:00
twinaphex
b7d3ed5264 (nk_common.c) Add HAVE_GLSL ifdef 2016-06-08 05:32:45 +02:00
twinaphex
4e91f6fcd0 Use CG macro instead 2016-06-08 05:26:33 +02:00
Twinaphex
710a3fe249 Merge pull request #3090 from fr500/nuklear
[nk] fix nuklear / linux
2016-06-08 02:46:02 +02:00
radius
991ea3c008 [nk] fix nuklear in linux and don't request a core context on windows 2016-06-07 19:40:11 -05:00
Arzed Five
70b1f385e8 Change task_save_state so we save a single state and a single savestate
file in memory, allowing to undo a loadstate/savestate once.
2016-06-07 18:33:01 +01:00
twinaphex
20766147a6 Cleanup 2016-06-07 18:04:07 +02:00
twinaphex
3f44ba59eb Add pending_events function callback 2016-06-07 18:02:37 +02:00
twinaphex
dbf59a72bd (ui_win32_application.c) Indenting cleanups 2016-06-07 17:32:37 +02:00
twinaphex
f4c3a41f84 (Win32) Implement application process events 2016-06-07 17:28:51 +02:00
Twinaphex
ba962d5dda Remove poll_iteration 2016-06-07 17:16:16 +02:00
Twinaphex
02910fd64d (Cocoa) Implement ui_application_process_events 2016-06-07 17:14:57 +02:00
twinaphex
c1a321015a Create ui_companion_driver_get_application_ptr 2016-06-07 17:10:27 +02:00
twinaphex
4dded0c76b Change signature of process_events 2016-06-07 17:07:11 +02:00
twinaphex
3aeecc7eb2 Create ui_win32_application.c 2016-06-07 17:03:34 +02:00
Twinaphex
3b16eb1e91 Add (stub) ui_cocoa_application.m 2016-06-07 16:51:25 +02:00
Twinaphex
f17b4fba05 Rename ui_cocoa_window.h 2016-06-07 16:47:48 +02:00
twinaphex
07ca97618d Add ui_application_win32 2016-06-07 16:43:25 +02:00
twinaphex
ee8277b31c Rename ui_win32_window.h to ui_win32.h 2016-06-07 16:33:55 +02:00