020700af1d
windows resource version thing
2015-12-20 13:43:08 -03:00
bec1e003e7
this failed on mingw on linux (but not on msvc) with 2 problems:
...
1) it didn't print the error to the console, only this:
build_res_file(["platform/windows/godot_res.windows.tools.32.o"], ["platform/windows/godot_res.rc"])
scons: *** [platform/windows/godot_res.windows.tools.32.o] Error 1
I had to print the actual command and run it on a console to see the error. The builder should be able to print the command it's running and the error, like it does with compiler invocations, etc.
2) The actual error was a syntax error on line 11 of godot_res.rc. I looked up "FILEVERSION" and "PRODUCTVERSION" (here https://msdn.microsoft.com/en-us/library/windows/desktop/aa381058(v=vs.85).aspx ), it says they take 4 numbers as parameters, so I added those 0s, but I'm not sure if they're in the right order.
@masoudbh3 can you check it out? thanks
It builds on msvc just fine with (and without) these changes.
2015-12-20 11:50:16 -03:00
33e5c3181d
Merge pull request #3101 from Hinsbart/remapping-new
...
Better gamepad support
2015-12-20 11:08:04 -03:00
87dab29f4b
Use tabs instead of spaces for new gamepad code
2015-12-18 19:15:32 +01:00
4a7e5fafb1
thread rename for ios and osx (if called from the thread to be renamed)
2015-12-18 02:58:30 -03:00
af633c7941
Better gamepad support
2015-12-18 06:12:53 +01:00
27e4c87869
no need to revert this actually
2015-12-14 11:10:16 -03:00
a9795d5826
Merge branch 'master' of https://github.com/godotengine/godot
2015-12-14 10:58:26 -03:00
c8077de714
utf stuff on osx
2015-12-13 22:21:49 -03:00
95a469ad28
added binary API to StreamPeer, fixes #2863
2015-12-13 12:53:29 -03:00
01f063e2fe
reverted mouse stuff
...
t Please enter the commit message for your changes. Lines starting
2015-12-13 01:28:42 -03:00
d6f9426748
isim
2015-12-12 19:13:40 -03:00
890b462ffb
added rotation and scale support to gui controls
2015-12-12 13:54:26 -03:00
cc7880fba5
-added windowed mode with -w, fixes #3020
...
-changed default windowed resolution to 1280x720
2015-12-12 12:06:53 -03:00
25d19e08bb
Merge pull request #590 from marynate/PR-fix-ios-release-event
...
Fixed ios release event not been dispatched when app entering background
2015-12-11 21:30:02 -03:00
708ff381d6
changed a bit to use system()
2015-12-08 20:36:48 -03:00
78b5404434
improve detection of linux, fixes #3201
2015-12-08 20:35:40 -03:00
ac414c5581
Merge pull request #2849 from a12n/compobsd2
...
Compile on OpenBSD
2015-12-08 17:16:45 -03:00
eff81965af
Merge pull request #2956 from est31/add_system_wide_export_path
...
Add way to look for templates at system wide level too
2015-12-08 17:04:24 -03:00
7ba484bc74
some fixes
...
-fix compilation on tres/tscn on MSVC
-fixed theora playback performance, closes #3004
2015-12-06 20:22:45 -03:00
4b1f0afb01
-several fixes to Android to work better on Tegra 3/4 devices, uses 16 bits FBOs so all 2D shader effects should now work in every single Android device.
2015-12-02 11:15:48 -03:00
e4e7e8f396
Merge pull request #2963 from akien-mga/pr-opus-arm-opt
...
Enable opus ARM optimisations only on ARM
2015-12-01 10:18:41 +01:00
99e7641f3d
Enable opus ARM optimisations only on ARM
...
i.e. do not enable it for x86.
Fixes #2962 .
2015-12-01 09:34:51 +01:00
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
bd396c5cfa
Enabled debug symbols for x11 when using platform=release_debug and debug_release=yes together
2015-11-29 20:56:27 +01:00
55d56d9b7c
Replace hardcoded references to Okam Studio by Godot Engine
...
Since the engine development is now independent.
Fixes #2836 .
2015-11-27 18:54:09 +01:00
b987d2113b
0theora compilation fixes
2015-11-25 00:28:03 -03:00
082e3fbb29
Merge branch 'master' of https://github.com/okamstudio/godot
...
Conflicts:
main/main.cpp
2015-11-24 10:52:41 -03:00
ccd40f76e8
-work in progress resourceparser and .tscn parser. Still non-functional
...
-fixed theora so it can compile theoralib but not theora
-fixed generation of windows icon in .rc, which didn't previously work in 32 bits
2015-11-24 10:42:05 -03:00
d6b317a2c1
tegra 3 fix
2015-11-21 23:21:36 +01:00
b14c90801f
Disable X11 joystick functions also for OpenBSD
2015-11-20 23:36:34 +03:00
523e64d30b
Include string.h for memset() on OpenBSD
2015-11-20 23:36:14 +03:00
52f1bab6d5
Include stdlib.h for alloca() on OpenBSD
2015-11-20 23:35:53 +03:00
0931eed7be
Enable ALSA only for Linux
2015-11-20 23:35:19 +03:00
2769da7744
compile fixes
2015-11-19 20:24:43 -03:00
dd09215c90
Revert "libao audio driver"
2015-11-19 20:05:26 -03:00
6127f17368
Merge pull request #2756 from trond/bugfix_udp
...
UDP fixes
2015-11-19 19:33:04 -03:00
43ce972ddb
Merge pull request #903 from a12n/libao
...
libao audio driver
2015-11-19 19:31:56 -03:00
a8a2458f0b
Fixed mistake where available buffer size would not be updated for each recvfrom-call in PacketPeerUDPWinsockPposix.
2015-11-19 19:06:01 +01:00
ce3216429e
Added missing \n in script error output.
2015-11-19 15:35:18 +01:00
a5683def19
Nice error output padding. Code location behind " At: " is now aligned with the error message above. Also removed the dot after the file location.
2015-11-19 15:19:25 +01:00
42beb83178
Set console background color on windows in SetConsoleTextAttribute, otherwise text background will be black, which looks strange if the terminal color is not black.
2015-11-19 15:19:22 +01:00
a89c861931
Set output color of ERR_SCRIPT messages to purple. Same as on linux.
2015-11-19 15:19:20 +01:00
9f9452d023
Removed ANSI error codes from windows terminal error output. Windows does not support them.
...
See: http://stackoverflow.com/questions/16755142/how-to-make-win32-console-recognize-ansi-vt100-escape-sequences
See: http://stackoverflow.com/questions/22777142/is-there-a-way-to-make-windows-output-ansi-escape-sequences?lq=1
2015-11-19 15:19:18 +01:00
e23734363e
Inconsistent code formatting in print_error (Newlines and spaces)
2015-11-19 15:19:16 +01:00
d3eb9e8c54
-remove Vector2.atan2() replaced by Vector2.angle(), fixes #2260
2015-11-19 10:41:20 -03:00
0168947084
Merge pull request #2518 from masoudbh3/godot-icons
...
Add icon to exe file in windows export
2015-11-19 00:08:47 -03:00
33aa019e4f
Merge pull request #2699 from ZuBsPaCe/visual-studio-2015-compilation
...
Visual studio 2015 compilation
2015-11-18 23:56:06 -03:00
0c3386b2ed
Merge pull request #2707 from akien-mga/master
...
Cosmetic fixes to SCons buildsystem
2015-11-18 19:43:28 -03:00
067c96d26f
Merge pull request #2718 from SaracenOne/audio_system_crash_fix
...
Fixed Audio System Crash
2015-11-18 19:35:22 -03:00
5fb95859e1
Merge pull request #2814 from masoudbh3/android-fa-locale
...
Android add FA(persian) locale strings
2015-11-18 19:21:54 -03:00
f2704eb162
Android add FA(persian) locale strings
2015-11-19 01:40:29 +03:30
34a558ee8d
Merge pull request #2691 from volzhs/android_payment
...
improve android payments
2015-11-18 19:02:40 -03:00
f738906519
Merge pull request #2737 from akien-mga/type-specific-error-output
...
Display error type (error, warning, script error) in OS::print_error + cleanup error ANSI coloring
2015-11-18 18:58:22 -03:00
4fdb4452b8
Merge pull request #2784 from masoudbh3/resigning-android-template
...
Skip META-INF from Android Template
2015-11-18 18:35:08 -03:00
e68c2c6c2a
Use macros to determine which iOS SDK we have in order to be backwards compatible with older SDKs when fixing template compilation issues.
2015-11-16 12:35:54 +11:00
402c24ec8b
iOS compile fixes.
2015-11-16 11:10:07 +11:00
14b9579748
Skip META-INF from Android Template
2015-11-14 20:40:22 +03:30
8adc4ef65b
windows crash and bind placeholder method
2015-11-14 11:14:17 -03:00
9ab7de243f
Fix error messages forcing a white font for subsequent messages
...
This is achieved using the "no specific formatting" \E[0m tag.
Fixes #2566 .
Also remove the hardcoded black background colour and use default bolded terminal font for error message.
Error logs should now look good both on terminals with a dark and light background colour.
2015-11-10 18:30:40 +01:00
6334895088
Display error type (error, warning, script error) in OS::print_error
...
Previously all types of errors would be shown as ERROR, thus making for example warnings (WARN_PRINT) somewhat aggressive.
ERROR is displayed in red, WARNING in yellow and SCRIPT ERROR in magenta (though the latter does not seem used so far).
Fixes #1127 .
2015-11-10 18:29:34 +01:00
41a161647d
* Winsock UDP messages sent to an unavailable target causing WSAECONNRESET will no longer close the socket.
...
* Ensured that unsigned<->signed conversion would not cause wrong buffer size values sent to recvfrom.
2015-11-09 01:33:16 +01:00
f809cd44ea
Fixed PacketPeerUDP getting wrongly closed due to recvfrom using rb.data_left instead of rb.space_left.
2015-11-09 00:22:05 +01:00
55b8c3ee48
change pe_bliss parent directory from /drivers to /tools
2015-11-09 02:24:01 +03:30
24f3f43457
Add icon to exe file in windows export
...
add version_info and icon sections in "export to windows platform".
add version_info and icon to godot exe file (editor & template exe).
fix an problem in image class.
change all default icons to android export icon (a little more rounded).
create an python script for convert file to cpp byte array for use in
'splash.h'.
2015-11-09 02:23:58 +03:30
3b9868d2e4
Merge branch 'master' of github.com:okamstudio/godot
2015-11-02 20:25:01 +03:00
e723488aa3
Moved deleting sample player in OS finalize methods to before deleting audio server to prevent crash when exiting.
2015-11-02 16:36:41 +00:00
399b1b0474
Cosmetic fixes to SCons buildsystem
...
- Removed trailing spaces
- Made sure all indentation is done using tabs (fixes #39 )
- Potentially fixed an identation issue for openssl check
2015-11-01 20:53:26 +01:00
fff7cedbe1
Fixes Visual Studio 2015 parallel builds (-j switch)
...
Reference: http://stackoverflow.com/questions/284778/what-are-the-implications-of-using-zi-vs-z7-for-visual-studio-c-projects
fatal error C1041: cannot open program database 'C:\godot\vc140.pdb'; if multiple CL.EXE write to the same .PDB file, please use /FS
2015-10-30 03:13:55 +01:00
3fbaa479e3
improve android payments
...
GodotPaymentV3 currently consumes purchased item right after purchasing.
But, some in-app item should not consume like "remove ads permanently"
So, I added "setAutoConsume(boolean)", "requestPurchased()",
"consume(sku_string)".
AutoConsume is true by default as before.
usage:
func _ready():
var payment = Globals.get_singleton("GodotPayments")
payment.setPurchaseCallbackId(get_instance_ID())
payment.setAutoConsume(false) # default : true
payment.requestPurchased() # callback : has_purchased
payment.purchase("item_name") # callback : purchase_success,
purchase_fail, purchase_cancel, purchase_owned
payment.consume("item_name") # callback : consume_success
func purchase_success(receipt, signature, sku):
print("purchase_success : ", sku)
func purchase_fail():
print("purchase_fail")
func purchase_cancel():
print("purchase_cancel")
func purchase_owned(sku):
print("purchase_owned : ", sku)
func consume_success(receipt, signature, sku):
print("consume_success : ", sku)
func has_purchased(receipt, signature, sku):
if sku == "":
print("has_purchased : nothing")
else:
print("has_purchased : ", sku)
2015-10-28 15:48:37 +09:00
2d2ab92680
Made the Atom net_wm_icon local
2015-10-26 01:36:27 +08:00
746ef7cbd6
Fixing memory leaks
2015-10-25 22:15:56 +08:00
15a826571c
Added setting for CADisplayLink on iOS, so you no longer need to recompile to change it
2015-10-22 17:31:09 -07:00
c2aedde7e3
rasterizer comparison fix
2015-10-18 20:28:51 -05:00
97f483af0a
fixes broken 3D in editor
2015-10-17 23:05:39 -03:00
3d121b474b
Merge pull request #2203 from volzhs/fix_android_payments
...
Fix android payments
2015-10-17 12:12:34 -03:00
c2515d352e
Merge pull request #2369 from Max-Might/master
...
Haiku: platform support
2015-10-17 10:48:57 -03:00
b217e1417a
Merge pull request #2479 from firefly2442/cppcheck-unusedvars
...
ran cppcheck, found unused variables
2015-10-17 10:25:36 -03:00
13d2710fed
Merge pull request #2474 from masoudbh3/android-armeabi-v7a
...
Fix android build script
2015-10-17 10:20:47 -03:00
4a8bc25f18
Merge pull request #2485 from masoudbh3/fix-x11-editor-boot-splash
...
Fix X11 Editor Boot Splash (Maximized Boot Splash)
2015-10-17 10:12:34 -03:00
782444d366
Merge pull request #2602 from sanikoyes/Pr-REUSE_ADDR_WIN32
...
Pr-REUSE_ADDR_WIN32
2015-10-17 09:44:07 -03:00
c925fbce2d
Haiku: fix build
2015-10-17 15:41:01 +03:00
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
15f6991064
REUSE_ADDR under windows platform
2015-10-13 13:11:33 +08:00
b3cda43a0f
Merge branch 'master' of https://github.com/okamstudio/godot
...
Conflicts:
platform/windows/detect.py
2015-10-13 01:19:32 -03:00
29caf2bb5b
Merge remote-tracking branch 'upstream/master'
2015-10-13 05:01:54 +03:00
aad2bbdb6f
newline fixes
2015-10-08 15:00:40 -03:00
6e87314d83
Add support for Opus audio format
2015-10-02 14:25:38 -03:00
e055247b17
-Added ability to use cubic interpolation on image resize (little more quality on non-po2 resizing)
...
-Added ability for exporter to shrink images to non-integer values. Helps if you want to convert your game artwork from 1080->720 or similar
2015-10-01 16:25:36 -03:00
0840303a9c
Merge pull request #2548 from romulox-x/iCloud
...
Initial iCloud implementation
2015-09-28 17:20:16 +02:00
b4daeda48b
improved iCloud build option description
2015-09-27 17:21:32 -07:00
1fe5cc8e1d
Initial iCloud implementation, supporting key value pairs
2015-09-27 16:54:20 -07:00
be51861310
Hide stderr when trying to detect mingw binaries on posix
2015-09-27 16:31:19 +02:00
092f84642c
Rename voice_set_volume argument to p_volume to avoid confusion
...
This argument is indeed expected to be a volume on a linear scale (not dB),
typically from 0.0 to 1.0, though it can go higher than 1.0.
2015-09-26 22:43:34 +02:00
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
9962518ffd
Merge branch 'master' of https://github.com/okamstudio/godot
2015-09-24 18:07:13 -03:00
82a3304458
Added ability to set custom mouse cursors. Not hardware accelerated yet.
2015-09-24 18:06:15 -03:00
ce6fefced8
Properly implement OS.alert() from script, and use xmessage on X11
2015-09-21 09:39:46 -03:00
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
3c466afb68
Fix X11 Editor Boot Splash
2015-09-17 05:19:43 +04:30
afbb6c064c
ran cppcheck, found unused variables
2015-09-16 15:35:30 -05:00
9d540afd1c
android remove "gen" folder from git.
2015-09-16 16:28:01 +04:30
867c95223d
Fix android build script
...
some fixes for android build script.
remove armv6,x86 options and add "android_arch" option for select
compiler architecture (armv7,armv6,x86)(default armv7).
add architecture suffix for output files and you can compile for several
architecture simultaneously.
example:
libgodot.android.opt.debug.armv7.so
libgodot.android.opt.debug.armv7.neon.so
libgodot.android.opt.debug.armv6.so
libgodot.android.opt.debug.x86.so
now we can enable/disable neon on armv7 with "android_neon" option
(default enable).
add "NDK_TARGET_X86" option for select toolchain to use for the NDK x86
(default x86-4.8).
change inputs model for "ndk_platform" option (default android-15).
fix armv7 ccflags.
with this patch, must put libgodot_android.so file in specific
architecture folder:
armv7 (default): <android-java>/libs/armeabi-v7a/
armv6: <android-java>/libs/armeabi/
x86: <android-java>/libs/x86/
2015-09-16 16:14:38 +04:30
89a901c4b6
Merge branch 'master' of https://github.com/okamstudio/godot
2015-09-12 10:56:13 -03:00
a88f67821c
HTML5 exporter seems to be fully functional
...
-user:// filesystem implemented
-default template page could look prettier, help appreciated
2015-09-12 10:54:47 -03:00
943714c015
Merge pull request #2461 from romulox-x/iphoneSplash
...
fixed iOS splash screen
2015-09-12 00:17:24 -03:00
56c907ad04
fix to builtin freetype defines on linux
2015-09-10 22:15:00 -03:00
751202768c
fix to freetype detection
2015-09-10 21:40:34 -03:00
c7426717d3
Merge branch 'master' of https://github.com/okamstudio/godot
2015-09-10 20:31:34 -03:00
83b69f8fef
remotion of some c++ includes to avoid dependency on libstdc++
2015-09-10 20:30:46 -03:00
b0e5031f1f
ios now displays splash screen between launch image and main scene, instead of a black screen
2015-09-10 15:01:02 -07:00
59e1ad2773
disabling theora for now (will be re-written, re-enabled later)
2015-09-10 13:27:15 -03:00
3013a83f2f
Merge branch 'master' of https://github.com/okamstudio/godot
2015-09-10 00:12:05 -03:00
0fb7b5aa0c
HTML5 exporter Improvements
...
-Better template handling
-Voice support
-Stream support
2015-09-10 00:10:54 -03:00
4d900859e2
ios build with osxcross
2015-09-09 21:57:49 +02:00
c5f574b914
Merge remote-tracking branch 'upstream/master'
2015-09-05 12:03:17 +03:00
b0aa49accb
merged some stuff for okam
2015-09-03 23:24:55 -03:00
cf57a654d7
new editor settings customization of where to run the game from the editor
2015-08-30 23:36:46 -03:00
3a59747c62
-fixes to capture mode
...
-ability to drag spinboxes and tree ranges to change values, like in Unity or Unreal
2015-08-29 01:43:21 -03:00
700fdf5c0c
fix build issue with ssl, closes #2384
2015-08-23 20:54:13 -03:00
e1e54d39e4
damn github built-in editor
2015-08-21 22:33:49 -03:00
2de5e12116
fix for built-in ssl (easier to build 32 bits export)
2015-08-21 22:31:06 -03:00
2a757a6ad4
Haiku: move the audio driver to platform/haiku
2015-08-14 22:52:28 +03:00
b038a2c3c2
Haiku: update logo.png
2015-08-13 22:36:43 +03:00
ced44b45d3
Haiku: remove unneeded code
2015-08-12 22:14:40 +03:00
f48ce8901a
Haiku: remove unneeded code
2015-08-12 21:40:45 +03:00
cdf1ac7d58
Merge remote-tracking branch 'upstream/master'
2015-08-09 12:45:21 +03:00
0a139aaef9
Merge pull request #2302 from antonyjones67/AndroidTemplateCompileWindows
...
Fixes compile bug for Android template on Windows.
2015-08-08 11:14:28 -03:00
6f9a084ac8
Add OS.get_system_time_msec
2015-08-06 10:29:33 -07:00
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
dc8df8a91a
Merge branch 'master' of github.com:okamstudio/godot
2015-07-29 23:01:36 +03:00
f5bfd497aa
Haiku: add sound support
2015-07-26 02:18:32 +03:00
9983ceecf2
Fixes compile bug for Android template on Windows.
2015-07-24 13:12:23 -06:00
983fd0dfc3
Use tabs instead of spaces.
2015-07-23 19:35:47 +03:00
8027a3f004
Fix audio driver setup if the first driver fails.
2015-07-23 19:32:10 +03:00
f8db8b7215
Haiku: update detect.py
2015-07-20 22:45:22 +03:00
07e76a3f2c
Haiku: add keyboard support
2015-07-12 00:52:47 +03:00
77e78cdb20
Haiku: gl context locking
2015-07-02 18:41:32 +03:00
1d22b0265b
fixed ios compilation error
2015-07-01 23:07:01 -07:00
f6668dc9db
Merge branch 'master' of https://github.com/okamstudio/godot into fix_android_payments
2015-07-01 15:13:10 +09:00
55b34e05b3
-some changes by okam
2015-06-30 11:28:43 -03:00
95047562d7
Several performance improvements, mainly in loading and instancing scenes and resources.
...
A general speedup should be apparent, with even more peformance increase when compiling optimized.
WARNING: Tested and it seems to work, but if something breaks, please report.
2015-06-29 00:29:49 -03:00
903e6b37c0
fix crash by payments when run on android 5.1.1 device.
...
(http://stackoverflow.com/questions/24480069/google-in-app-billing-illegalargumentexception-service-intent-must-be-explicit )
2015-06-29 02:56:38 +09:00
e0e54ea7d4
Merge remote-tracking branch 'upstream/master'
2015-06-26 21:35:47 +03:00
7ad89c7e83
Haiku: implement some more window-related methods
2015-06-23 21:22:12 +03:00
2f33f820e9
Fixed compilation error on MacOS X.
2015-06-22 00:56:49 -04:00
174df9a276
Haiku: add support for mouse wheel
2015-06-21 22:18:27 +03:00
6f48ddc61d
Haiku: add some screen and window-related methods
2015-06-21 02:08:31 +03:00
b59e95ce1c
Haiku: implemet get_widow_size() get/set_window_position()
2015-06-20 15:35:54 +03:00
d44dfc2440
Haiku: cleanup, add TODOs
2015-06-20 03:43:11 +03:00
Ariel Manzur
punto-
hondres
Ariel Manzur
hondres
santiagopf
Juan Linietsky
Rémi Verschelde
est31
koalefant
Rémi Verschelde
mikica1986vee
Anton Yabchinskiy
Trond Abusdal
ZuBsPaCe
masoud bh
Aren Villanueva
Saracen
volzhs
Phobos Tro
steve
firefly2442
Kostadin Damyanov
Didier Vandekerckhove
sanikoyes
reduz
George Marques
steve
Maximillian
PeaceSells
Jari Ronkainen
James McLean