summaryrefslogtreecommitdiff
path: root/main
AgeCommit message (Collapse)Author
2016-02-03Merge pull request #3493 from Hinsbart/wm_classRémi Verschelde
x11: use different strings for WM_CLASS depending on context
2016-02-01added more gamepad mappingsDana Olson
2016-01-31do not fail on invalid audio driver, fixes #3466Juan Linietsky
2016-01-27x11: use different strings for WM_CLASS depending on contexthondres
2016-01-26clear joystick state on disconnectionhondres
2016-01-22add mappings and increase max number of buttonshondres
2016-01-21html5 gamepad supportHinsbart
2016-01-16Add ability to set "keep screen on" for androidvolzhs
2016-01-13Fix wrong type check for autoloadRémi Verschelde
Regression from c633a29. Fixes #3342
2016-01-13improve reporting of error in wrong inheritance for autoload scriptJuan Linietsky
2016-01-13attempt another fixJuan Linietsky
2016-01-13Reworked how autoloads are load to make sure identifiers always exist, ↵Juan Linietsky
please check if this resolves bug #3156
2016-01-12Merge pull request #3272 from Hinsbart/joy-bindingpunto-
Add some joystick functions to input. Enables manipulation of mapping…
2016-01-11Update copyright in remaining files + prints in the UIRémi Verschelde
2016-01-08Add some joystick functions to input. Enables manipulation of mappings at ↵hondres
runtime
2016-01-02Analog values for gamepad triggers, using axes 6 & 7hondres
2016-01-01Update copyright to 2016 in headersGeorge Marques
2015-12-31force thread model to single-safe when running editor, fixes #2387Juan Linietsky
2015-12-29removed wron return types, fixes #2483reduz
removed console, which was obsolete and unused sine long long ago
2015-12-28Ability to set autoloads as singleton global variablesreduz
2015-12-20fix debouncing in axis buttonsAriel Manzur
2015-12-18Use tabs instead of spaces for new gamepad codehondres
2015-12-18Better gamepad supporthondres
2015-12-12-added windowed mode with -w, fixes #3020Juan Linietsky
-changed default windowed resolution to 1280x720
2015-11-26Print error if no export destination has been passedest31
2015-11-24Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky
Conflicts: main/main.cpp
2015-11-24-work in progress resourceparser and .tscn parser. Still non-functionalJuan Linietsky
-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-24Fix typo, missing quoteRémi Verschelde
2015-11-24Merge pull request #2876 from akien-mga/pr-boot-splash-debugRémi Verschelde
Silence too verbose boot splash debug info
2015-11-23Silence too verbose boot splash debug infoRémi Verschelde
2015-11-22Load main scene if defined when running editor from the command lineRémi Verschelde
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.
2015-11-19Merge pull request #2518 from masoudbh3/godot-iconsJuan Linietsky
Add icon to exe file in windows export
2015-11-18Merge pull request #2706 from phobos-tro/main_memleaksJuan Linietsky
Fixing memleaks in main/main.cpp
2015-11-18Merge pull request #2707 from akien-mga/masterJuan Linietsky
Cosmetic fixes to SCons buildsystem
2015-11-09Add icon to exe file in windows exportmasoud bh
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-01Cosmetic fixes to SCons buildsystemRémi Verschelde
- Removed trailing spaces - Made sure all indentation is done using tabs (fixes #39) - Potentially fixed an identation issue for openssl check
2015-11-01Fix arguments parsing in the main functionRémi Verschelde
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.
2015-10-30Fixing memleaks in main/main.cppPhobos Tro
2015-10-17Merge pull request #2395 from MrMormon/patch-1Juan Linietsky
Fixed misspelled local variable for code clarity
2015-10-17Merge pull request #2481 from firefly2442/cppcheck-arrayindexthencheckJuan Linietsky
ran cppcheck, fixed cases where array index is used before limits check
2015-10-13-A little More control about pixel snapping in 2DJuan Linietsky
2015-10-12ran cppcheck, fixed cases where array index is used before limits checkfirefly2442
2015-09-24Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky
2015-09-24Added ability to set custom mouse cursors. Not hardware accelerated yet.Juan Linietsky
2015-09-20Ability to visually debug geometry visually:Juan Linietsky
-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-18begin work on debugging collisions....Juan Linietsky
2015-09-10Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky
2015-09-10HTML5 exporter ImprovementsJuan Linietsky
-Better template handling -Voice support -Stream support
2015-09-05fix game window runs only 800x600volzhs
2015-09-03merged some stuff for okamJuan Linietsky