Commit Graph

65 Commits

Author SHA1 Message Date
Rémi Verschelde 66ce012ca6 GLEW: Define static + enabled and includes via SCons
This allows us not to have to hack our definitions in the upstream files,
making it easier to upgrade to newer versions in the future.

For the include paths to work, the headers are moved to a GL subfolder to
match their upstream location.

(cherry picked from commit 768e925271)
2016-06-25 00:24:09 +02:00
marcelofg55 bed17e98c8 Right click->Quit on the godot icon will now close the application on OSX.
Fixed get_window_position that missed a return on OSX.

(cherry picked from commit 76ab7d3886)
2016-06-05 00:03:30 +02:00
marcelofg55 331a0aed71 Key modifiers (Ctrl, Alt, Meta and Shift) may be used as Input keys now on OSX
(cherry picked from commit bb223869e0)
2016-06-04 22:20:02 +02:00
marcelofg55 280899ee43 Added application/fat_bits property for EditorExportPlatformOSX::EditorExportPlatformOSX
(cherry picked from commit ba0fbe4f79)
2016-06-04 22:20:02 +02:00
marcelofg55 4dc2d78d2e Added 'fat' option for bits param on scons for osx, this will produce a fat binary that contains both 32 bits and 64 bits binaries
(cherry picked from commit eeb83982e2)
2016-06-04 22:20:02 +02:00
marcelofg55 2bd6e2402b OS.get_screen_size now returns the correct value on OSX
(cherry picked from commit b697de92ef)
2016-05-12 09:05:32 +02:00
Ariel Manzur 227604a566 Fix launching from .app on OSX
(cherry picked from commit 6962fd91c6)
2016-04-29 18:05:39 +02:00
eska 91461b588d Move export GUI debug toggle to export settings window
(cherry picked from commit ab4caa7953)
2016-04-29 07:43:23 +02:00
Rémi Verschelde bac8248316 Remove trailing spaces
(cherry picked from commit 0a5472e697)
2016-04-02 22:19:40 +02:00
Hubert Jarosz 424a104666 remove trailing whitespace
(cherry picked from commit 4a4f247914)
2016-04-02 22:03:48 +02:00
hondres 827f4a895a osx: fix inverted horizontal scrolling
(cherry picked from commit 02eddbf7da)
2016-04-02 21:57:26 +02:00
Zher Huei Lee c850fa7331 Added relative paths for DirAccess::remove()
Follows similar behaviour to DirAccess::rename()

(cherry picked from commit d7052ddba3)
2016-03-05 13:35:48 +01:00
Rémi Verschelde 130f8fa193 Rename KEY_KP_SUBSTRACT to KEY_KP_SUBTRACT
The former name was incorrect in English, though for us latin lovers it's an understandable mistake.
Second part of and closes #3626.
2016-02-17 23:01:27 +01:00
hondres df4faf8f33 support horizontal mouse wheel, use in text editor 2016-02-04 17:16:22 +01:00
punto- 987bfb4b5e Update detect.py
removed -g from linkflags
2016-01-29 17:33:45 -03:00
Ariel Manzur 593b01b709 audio crash 2016-01-29 07:18:53 -03:00
George Marques f4a39692b9 Change default window size for desktop
Fix #3149
2016-01-24 17:52:33 -02:00
George Marques 5be9ff7b67 Update copyright to 2016 in headers 2016-01-01 11:50:53 -02:00
Juan Linietsky 586e482a98 -Fix parsing of comments in VariantParser, fixes #3175 2015-12-31 10:25:21 -03:00
Ariel Manzur 4a7e5fafb1 thread rename for ios and osx (if called from the thread to be renamed) 2015-12-18 02:58:30 -03:00
santiagopf c8077de714 utf stuff on osx 2015-12-13 22:21:49 -03:00
Juan Linietsky 890b462ffb added rotation and scale support to gui controls 2015-12-12 13:54:26 -03:00
Juan Linietsky cc7880fba5 -added windowed mode with -w, fixes #3020
-changed default windowed resolution to 1280x720
2015-12-12 12:06:53 -03:00
est31 15f6d3cebf Add way to look for templates at system wide level too
Useful for everybody wanting to package godot.
Fixes #1026.

-> Retain the old behaviour: path in error msg only when exporting.
-> User templates override system templates
2015-11-30 01:36:08 +01:00
Juan Linietsky b987d2113b 0theora compilation fixes 2015-11-25 00:28:03 -03:00
Didier Vandekerckhove d48a1bd22d Added specific get_locale to OSX platform
The default unix get_locale didn’t work. OS X requires a specific one.
2015-10-16 19:42:26 +02:00
Juan Linietsky b3cda43a0f Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	platform/windows/detect.py
2015-10-13 01:19:32 -03:00
Juan Linietsky c858515785 Fixed theora playback. Removed theoraplayer.
Still need to get proper audio output latency in some platforms.
2015-09-26 14:50:42 -03:00
Juan Linietsky 9962518ffd Merge branch 'master' of https://github.com/okamstudio/godot 2015-09-24 18:07:13 -03:00
Juan Linietsky 82a3304458 Added ability to set custom mouse cursors. Not hardware accelerated yet. 2015-09-24 18:06:15 -03:00
Juan Linietsky 83d9a692be Ability to visually debug geometry visually:
-Visible 2D and 3D Shapes, Polygons, Tile collisions, etc.
-Visible Navmesh and Navpoly
-Visible collision contacts for 2D and 3D as a red point
-Customizable colors in project settings
2015-09-20 13:03:46 -03:00
Juan Linietsky 59e1ad2773 disabling theora for now (will be re-written, re-enabled later) 2015-09-10 13:27:15 -03:00
Juan Linietsky b0aa49accb merged some stuff for okam 2015-09-03 23:24:55 -03:00
Juan Linietsky cf57a654d7 new editor settings customization of where to run the game from the editor 2015-08-30 23:36:46 -03:00
Juan Linietsky 9d185ccc30 -Merged the file server with the live editing and remote debug
-It is now really easy to deploy an android build with debug, and debug it
2015-08-06 02:37:40 -03:00
James McLean 2f33f820e9 Fixed compilation error on MacOS X. 2015-06-22 00:56:49 -04:00
Juan Linietsky 9df77d2765 ability to run 2D physics in a thread
also, 2D physics is now thread safe too.
see physics_2d/thread_model
2015-05-26 01:06:05 -03:00
Ricardo Pérez 979b931995 Better OS X fullscreen support, without the nasty startup effect 2015-05-06 12:53:55 +02:00
Ricardo Pérez 1d619fad86 Really fixes fullscreen mode in OS X, even during startup 2015-05-05 12:02:47 +02:00
Juan Linietsky fdaa2920eb Updated copyright year in all headers 2015-04-18 14:38:54 -03:00
Ariel Manzur ebd743f7c2 Merge branch 'master' of https://github.com/okamstudio/godot 2015-04-02 01:35:12 -03:00
Ariel m 7c1d516c01 fullscreen thing 2015-04-02 01:32:02 -03:00
Juan Linietsky ed2a24ef21 solved color depth issues on osx 2015-04-01 12:39:54 -03:00
steve a6f6bd85f9 fixed build error on OSX from new WM code 2015-03-23 22:07:03 -07:00
greay ef565b9778 fix for “no viable conversion from 'NSPoint' (aka '_NSPoint') to 'CGPoint'” build error on OS X 2015-02-17 19:19:29 -08:00
Juan Linietsky d2f86cc09b fixes to mouse warp
-can warp now from viewport and control, in their respective coordinate
systems
-warp is now local to the window on Windows and OSX.

IF YOU RUN OSX, PLEASE TEST THIS! And make sure it works!, new code is
in OS_OSX::warp_mouse_pos. I don't have OSX so i can't test!
2015-02-14 19:22:06 -03:00
hurikhan 928e068f71 -try fixing LLVM color diagnostic on osx 2015-01-13 12:54:23 +08:00
hurikhan 067a0d0e64 osx support for llvm coloring added 2015-01-12 14:04:25 +08:00
Rhody Lugo 08cfad00dd Create the test string to detect kb layouts directly from the unicode chars 2015-01-08 10:31:10 -04:30
Rhody Lugo d046bd88ad OS X: Add keyboard layout detection and fix build 2015-01-08 02:56:27 -04:30