aboutsummaryrefslogtreecommitdiff
path: root/main
Commit message (Collapse)AuthorAgeFilesLines
* Print error if no export destination has been passedest312015-11-261-0/+11
|
* Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2015-11-241-3/+4
|\ | | | | | | | | Conflicts: main/main.cpp
| * Fix typo, missing quoteRémi Verschelde2015-11-241-1/+1
| |
| * Merge pull request #2876 from akien-mga/pr-boot-splash-debugRémi Verschelde2015-11-241-5/+4
| |\ | | | | | | Silence too verbose boot splash debug info
| | * Silence too verbose boot splash debug infoRémi Verschelde2015-11-231-5/+4
| | |
| * | Load main scene if defined when running editor from the command lineRémi Verschelde2015-11-221-2/+2
| |/ | | | | | | | | | | | | If no main scene is defined, or if it's an empty string, the previous behaviour will still be used, i.e. launch the project manager. A small fix was also added not to maximize the window when opening the project manager via -editor (i.e. "godot" and "godot -e" will behave the same when no project is in the path). Fixes #2869.
* / -work in progress resourceparser and .tscn parser. Still non-functionalJuan Linietsky2015-11-241-10/+2
|/ | | | | -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
* Merge pull request #2518 from masoudbh3/godot-iconsJuan Linietsky2015-11-191-1/+1
|\ | | | | Add icon to exe file in windows export
| * Add icon to exe file in windows exportmasoud bh2015-11-091-1/+1
| | | | | | | | | | | | | | | | | | 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'.
* | Merge pull request #2706 from phobos-tro/main_memleaksJuan Linietsky2015-11-181-2/+3
|\ \ | | | | | | Fixing memleaks in main/main.cpp
| * | Fixing memleaks in main/main.cppPhobos Tro2015-10-301-2/+3
| |/
* | Merge pull request #2707 from akien-mga/masterJuan Linietsky2015-11-181-2/+0
|\ \ | | | | | | Cosmetic fixes to SCons buildsystem
| * | Cosmetic fixes to SCons buildsystemRémi Verschelde2015-11-011-2/+0
| |/ | | | | | | | | | | - Removed trailing spaces - Made sure all indentation is done using tabs (fixes #39) - Potentially fixed an identation issue for openssl check
* / Fix arguments parsing in the main functionRémi Verschelde2015-11-011-14/+20
|/ | | | | | | | | | | Fixes #2611 which was a regression from 692216b86ab97db91e7ff3903ffc9ac8e37433f6. The bogus behaviour considered that if there were more than one arguments left to parse, they would be a pair of arguments (switch and its parameter), and thus skipped the next argument in all cases (thus potentially skipping a "-editor", which triggered #2611). This is fixed by checking first for arguments that don't expect a parameter, and only afterwards for arguments that expect a parameter. And if a "pair" of arguments is not valid, we no longer increment the counter.
* Merge pull request #2395 from MrMormon/patch-1Juan Linietsky2015-10-171-3/+3
|\ | | | | Fixed misspelled local variable for code clarity
| * Fixed misspelled local variable for code clarityJoshua Olson2015-08-261-3/+3
| | | | | | Specifically, tar(g)et_fps
* | Merge pull request #2481 from firefly2442/cppcheck-arrayindexthencheckJuan Linietsky2015-10-171-49/+37
|\ \ | | | | | | ran cppcheck, fixed cases where array index is used before limits check
| * | ran cppcheck, fixed cases where array index is used before limits checkfirefly24422015-10-121-49/+37
| | |
* | | -A little More control about pixel snapping in 2DJuan Linietsky2015-10-131-0/+1
|/ /
* | Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2015-09-241-0/+13
|\ \
| * \ Ability to visually debug geometry visually:Juan Linietsky2015-09-201-0/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | -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
| * | | begin work on debugging collisions....Juan Linietsky2015-09-181-0/+7
| |/ /
* / / Added ability to set custom mouse cursors. Not hardware accelerated yet.Juan Linietsky2015-09-243-1/+444
|/ /
* | Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2015-09-101-1/+0
|\ \
| * | fix game window runs only 800x600volzhs2015-09-051-1/+0
| | |
* | | HTML5 exporter ImprovementsJuan Linietsky2015-09-101-2/+11
|/ / | | | | | | | | | | -Better template handling -Voice support -Stream support
* | merged some stuff for okamJuan Linietsky2015-09-031-6/+16
| |
* | new editor settings customization of where to run the game from the editorJuan Linietsky2015-08-301-4/+49
| |
* | -display/emulate_touchscreen now really emulates a touchscreenJuan Linietsky2015-08-291-1/+9
|/ | | | -icons to show node menus
* error debuggerJuan Linietsky2015-08-041-1/+1
| | | | | shows the list of errors that happened during running the game, traces can be analyzed
* -some changes by okamJuan Linietsky2015-06-301-0/+3
|
* Several performance improvements, mainly in loading and instancing scenes ↵Juan Linietsky2015-06-291-5/+5
| | | | | | | | 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.
* some editor window changesJuan Linietsky2015-06-131-1/+11
| | | | | -ability to make dock position configurable, and it gets saved -editor starts maximized default
* -fixed many memory initialization issuesJuan Linietsky2015-06-061-2/+2
| | | | | -fixed deadlock on previews thread -fixed compilation errors on unix
* Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2015-06-061-0/+2
|\ | | | | | | | | Conflicts: demos/2d/motion/engine.cfg
| * ability to run 2D physics in a threadJuan Linietsky2015-05-261-0/+2
| | | | | | | | | | also, 2D physics is now thread safe too. see physics_2d/thread_model
* | small fixesJuan Linietsky2015-06-011-2/+2
|/
* added a built-in scene changer API, closes #1928Juan Linietsky2015-05-171-1/+2
|
* Fix segment violation MINIZIP_ENABLEDDaniel T. Borelli2015-05-061-4/+13
|
* fix delete packed dataDaniel T. Borelli2015-05-051-2/+0
|
* -disabled thread model 2 for the time being, crashes on linux without ↵Juan Linietsky2015-04-271-0/+3
| | | | reason, fixes #1482
* -Changed Godot exit to be clean.Juan Linietsky2015-04-201-1/+14
| | | | | -Added more debug information on memory cleanliness on exit (if run with -v) -Fixed several memory leaks, fixes #1731, fixes #755
* Updated copyright year in all headersJuan Linietsky2015-04-185-18/+18
|
* Fix clipping when used in viewport or inside another viewport, fixes #1661Juan Linietsky2015-04-141-4/+6
|
* -Changed bootsplash option to use a file, fixes #1539Juan Linietsky2015-04-121-3/+13
| | | | -Added OS.get_splash_tick_msec() to query when splash appeared
* Implemented PulseAudio backend and fixed audio driver selection on X11Alexander Stillich2014-12-191-0/+1
|
* -Ability to ask for documents/pictures/etc system dirs.Juan Linietsky2014-12-021-1/+1
| | | | | -Fixes to animationplayer -fixes to collada importer
* UDP FixesJuan Linietsky2014-11-131-0/+2
| | | | | | | | | | | | | | -=-=-=-=- Curse the day I decided to port UDP code, as it ended up being two nights of work. At least It's done now (I hope). -Fixed UDP Support, API seems stable -Added UDP Chat demo (chat that can lose your packets, heh) -Added helpers to areas and bodies to get list of collided bodies and contained bodies. -Sped up screen/viewport capture code. -Added code to save an image as PNG -Small fix so scripts register their singletons after modules did.
* SceneMainLoop -> SceneTreeJuan Linietsky2014-11-052-13/+13
| | | | | | | | | | | | -=-=-=-=-=-=-=-=-=-=-=-=-=- *YOUR SOURCE MIGHT NOT WORK* For mor information on fix: https://github.com/okamstudio/godot/wiki/devel_scene_tree Other stuff: -Shower of bullets demo -Fixes all around
* Build System ChangesJuan Linietsky2014-10-072-14/+2
| | | | | | | | | | | | | -=-=-=-=-=-=-=-=-=-= Build System: -Big clean up of SCons, changed how builds are done to a much cleaner method (check the Github Wiki for instructions). -Deactivated BlackBerry10 (sorry), if no mantainer found (or BlackBerry does not send us a Passort ;), platform will be removed as we have no longer devices to test. Engine: -Removed deprecated object and scene format (was in there just for compatibility, not in use since a long time). -Added ability to open scenes even if a node type was removed (will try to guess the closest type). -Removed deprecated node types.