diff options
| author | ChrisDill <chrisdude134@gmail.com> | 2018-09-27 15:54:02 +0100 |
|---|---|---|
| committer | ChrisDill <chrisdude134@gmail.com> | 2018-09-27 15:54:02 +0100 |
| commit | 73701c12b224b8d0461d50bdd5e3b98f7aaa2297 (patch) | |
| tree | 74b35d743821ce193f14690cd961ff50d6f12555 | |
| parent | 1836e02c1ef9909d25bbb89b9d9fdd6ec934aada (diff) | |
| parent | 29eddb9ff3fda090ed416a2736a6d2db4cca77e9 (diff) | |
| download | raylib-73701c12b224b8d0461d50bdd5e3b98f7aaa2297.tar.gz raylib-73701c12b224b8d0461d50bdd5e3b98f7aaa2297.zip | |
Merge remote-tracking branch 'upstream/master'
88 files changed, 85 insertions, 6 deletions
diff --git a/examples/shapes/shapes_colors_palette.png b/examples/shapes/shapes_colors_palette.png Binary files differindex dd3cf4a5..4073b670 100644 --- a/examples/shapes/shapes_colors_palette.png +++ b/examples/shapes/shapes_colors_palette.png diff --git a/examples/text/resources/custom_alagard.png b/examples/text/resources/custom_alagard.png Binary files differindex c3eb63b7..63426555 100644 --- a/examples/text/resources/custom_alagard.png +++ b/examples/text/resources/custom_alagard.png diff --git a/examples/text/resources/custom_jupiter_crash.png b/examples/text/resources/custom_jupiter_crash.png Binary files differindex 451b591f..2deaaeff 100644 --- a/examples/text/resources/custom_jupiter_crash.png +++ b/examples/text/resources/custom_jupiter_crash.png diff --git a/examples/text/resources/custom_mecha.png b/examples/text/resources/custom_mecha.png Binary files differindex 59caab2c..a8c9e06e 100644 --- a/examples/text/resources/custom_mecha.png +++ b/examples/text/resources/custom_mecha.png diff --git a/examples/text/resources/fonts/alagard.png b/examples/text/resources/fonts/alagard.png Binary files differindex 3ac4bf1c..c0c54273 100644 --- a/examples/text/resources/fonts/alagard.png +++ b/examples/text/resources/fonts/alagard.png diff --git a/examples/text/resources/fonts/alpha_beta.png b/examples/text/resources/fonts/alpha_beta.png Binary files differindex c362bfb1..8a0c2733 100644 --- a/examples/text/resources/fonts/alpha_beta.png +++ b/examples/text/resources/fonts/alpha_beta.png diff --git a/examples/text/resources/fonts/jupiter_crash.png b/examples/text/resources/fonts/jupiter_crash.png Binary files differindex 1f5172fb..4972c02e 100644 --- a/examples/text/resources/fonts/jupiter_crash.png +++ b/examples/text/resources/fonts/jupiter_crash.png diff --git a/examples/text/resources/fonts/mecha.png b/examples/text/resources/fonts/mecha.png Binary files differindex 8022d18c..9213fa2d 100644 --- a/examples/text/resources/fonts/mecha.png +++ b/examples/text/resources/fonts/mecha.png diff --git a/examples/text/resources/fonts/pixantiqua.png b/examples/text/resources/fonts/pixantiqua.png Binary files differindex ce422e7e..17ad1ab7 100644 --- a/examples/text/resources/fonts/pixantiqua.png +++ b/examples/text/resources/fonts/pixantiqua.png diff --git a/examples/text/resources/fonts/pixelplay.png b/examples/text/resources/fonts/pixelplay.png Binary files differindex bf8f8818..fbf6430d 100644 --- a/examples/text/resources/fonts/pixelplay.png +++ b/examples/text/resources/fonts/pixelplay.png diff --git a/examples/text/resources/fonts/romulus.png b/examples/text/resources/fonts/romulus.png Binary files differindex 46ccc327..648aa8b0 100644 --- a/examples/text/resources/fonts/romulus.png +++ b/examples/text/resources/fonts/romulus.png diff --git a/examples/text/resources/fonts/setback.png b/examples/text/resources/fonts/setback.png Binary files differindex 086f3e27..1630a733 100644 --- a/examples/text/resources/fonts/setback.png +++ b/examples/text/resources/fonts/setback.png diff --git a/examples/textures/resources/custom_jupiter_crash.png b/examples/textures/resources/custom_jupiter_crash.png Binary files differindex 451b591f..2deaaeff 100644 --- a/examples/textures/resources/custom_jupiter_crash.png +++ b/examples/textures/resources/custom_jupiter_crash.png diff --git a/examples/textures/resources/scarfy.png b/examples/textures/resources/scarfy.png Binary files differindex beb5ffa0..4803ef77 100644 --- a/examples/textures/resources/scarfy.png +++ b/examples/textures/resources/scarfy.png diff --git a/games/drturtle/resources/fish.png b/games/drturtle/resources/fish.png Binary files differindex 894dd1ca..dca5956e 100644 --- a/games/drturtle/resources/fish.png +++ b/games/drturtle/resources/fish.png diff --git a/games/drturtle/resources/gamera.png b/games/drturtle/resources/gamera.png Binary files differindex 57127c10..9c2fea71 100644 --- a/games/drturtle/resources/gamera.png +++ b/games/drturtle/resources/gamera.png diff --git a/games/drturtle/resources/gframe.png b/games/drturtle/resources/gframe.png Binary files differindex 87796af2..5946589e 100644 --- a/games/drturtle/resources/gframe.png +++ b/games/drturtle/resources/gframe.png diff --git a/games/drturtle/resources/komika.png b/games/drturtle/resources/komika.png Binary files differindex 174d85b9..2c2ab714 100644 --- a/games/drturtle/resources/komika.png +++ b/games/drturtle/resources/komika.png diff --git a/games/drturtle/resources/mountains.png b/games/drturtle/resources/mountains.png Binary files differindex 16917703..f193f504 100644 --- a/games/drturtle/resources/mountains.png +++ b/games/drturtle/resources/mountains.png diff --git a/games/drturtle/resources/orca.png b/games/drturtle/resources/orca.png Binary files differindex 09aed574..b580ef07 100644 --- a/games/drturtle/resources/orca.png +++ b/games/drturtle/resources/orca.png diff --git a/games/drturtle/resources/sea.png b/games/drturtle/resources/sea.png Binary files differindex ad8f22ef..34593536 100644 --- a/games/drturtle/resources/sea.png +++ b/games/drturtle/resources/sea.png diff --git a/games/drturtle/resources/shark.png b/games/drturtle/resources/shark.png Binary files differindex 26c05ea5..24a56957 100644 --- a/games/drturtle/resources/shark.png +++ b/games/drturtle/resources/shark.png diff --git a/games/drturtle/resources/sky.png b/games/drturtle/resources/sky.png Binary files differindex 5af8b6f7..e75715c9 100644 --- a/games/drturtle/resources/sky.png +++ b/games/drturtle/resources/sky.png diff --git a/games/drturtle/resources/swhale.png b/games/drturtle/resources/swhale.png Binary files differindex be1d0c5c..5652928c 100644 --- a/games/drturtle/resources/swhale.png +++ b/games/drturtle/resources/swhale.png diff --git a/games/drturtle/resources/title.png b/games/drturtle/resources/title.png Binary files differindex abe0f5b0..9ddd0de3 100644 --- a/games/drturtle/resources/title.png +++ b/games/drturtle/resources/title.png diff --git a/games/drturtle/resources/turtle.png b/games/drturtle/resources/turtle.png Binary files differindex 4abe9f51..52ce9691 100644 --- a/games/drturtle/resources/turtle.png +++ b/games/drturtle/resources/turtle.png diff --git a/games/light_my_ritual/resources/font_arcadian.png b/games/light_my_ritual/resources/font_arcadian.png Binary files differindex 5c3df51a..7abcc197 100644 --- a/games/light_my_ritual/resources/font_arcadian.png +++ b/games/light_my_ritual/resources/font_arcadian.png diff --git a/games/light_my_ritual/resources/textures/back_title.png b/games/light_my_ritual/resources/textures/back_title.png Binary files differindex 54921247..c6cf9698 100644 --- a/games/light_my_ritual/resources/textures/back_title.png +++ b/games/light_my_ritual/resources/textures/back_title.png diff --git a/games/light_my_ritual/resources/textures/background.png b/games/light_my_ritual/resources/textures/background.png Binary files differindex 367bdd30..78dd3e21 100644 --- a/games/light_my_ritual/resources/textures/background.png +++ b/games/light_my_ritual/resources/textures/background.png diff --git a/games/light_my_ritual/resources/textures/circle_level_i_off.png b/games/light_my_ritual/resources/textures/circle_level_i_off.png Binary files differindex 7961af7d..4fe96618 100644 --- a/games/light_my_ritual/resources/textures/circle_level_i_off.png +++ b/games/light_my_ritual/resources/textures/circle_level_i_off.png diff --git a/games/light_my_ritual/resources/textures/circle_level_i_on.png b/games/light_my_ritual/resources/textures/circle_level_i_on.png Binary files differindex 1f217734..3ac21705 100644 --- a/games/light_my_ritual/resources/textures/circle_level_i_on.png +++ b/games/light_my_ritual/resources/textures/circle_level_i_on.png diff --git a/games/light_my_ritual/resources/textures/circle_level_ii_off.png b/games/light_my_ritual/resources/textures/circle_level_ii_off.png Binary files differindex 642adc3b..d97b7df1 100644 --- a/games/light_my_ritual/resources/textures/circle_level_ii_off.png +++ b/games/light_my_ritual/resources/textures/circle_level_ii_off.png diff --git a/games/light_my_ritual/resources/textures/circle_level_ii_on.png b/games/light_my_ritual/resources/textures/circle_level_ii_on.png Binary files differindex 93b71b3a..c4a1d710 100644 --- a/games/light_my_ritual/resources/textures/circle_level_ii_on.png +++ b/games/light_my_ritual/resources/textures/circle_level_ii_on.png diff --git a/games/light_my_ritual/resources/textures/circle_level_iii_off.png b/games/light_my_ritual/resources/textures/circle_level_iii_off.png Binary files differindex daf50be9..fe92c4f9 100644 --- a/games/light_my_ritual/resources/textures/circle_level_iii_off.png +++ b/games/light_my_ritual/resources/textures/circle_level_iii_off.png diff --git a/games/light_my_ritual/resources/textures/circle_level_iii_on.png b/games/light_my_ritual/resources/textures/circle_level_iii_on.png Binary files differindex e2256e95..2c986595 100644 --- a/games/light_my_ritual/resources/textures/circle_level_iii_on.png +++ b/games/light_my_ritual/resources/textures/circle_level_iii_on.png diff --git a/games/light_my_ritual/resources/textures/enemy.png b/games/light_my_ritual/resources/textures/enemy.png Binary files differindex dc0a911d..7f51ab59 100644 --- a/games/light_my_ritual/resources/textures/enemy.png +++ b/games/light_my_ritual/resources/textures/enemy.png diff --git a/games/light_my_ritual/resources/textures/foreground_level_i.png b/games/light_my_ritual/resources/textures/foreground_level_i.png Binary files differindex 32b96740..58a5797a 100644 --- a/games/light_my_ritual/resources/textures/foreground_level_i.png +++ b/games/light_my_ritual/resources/textures/foreground_level_i.png diff --git a/games/light_my_ritual/resources/textures/foreground_level_ii.png b/games/light_my_ritual/resources/textures/foreground_level_ii.png Binary files differindex 44f26003..b9e30648 100644 --- a/games/light_my_ritual/resources/textures/foreground_level_ii.png +++ b/games/light_my_ritual/resources/textures/foreground_level_ii.png diff --git a/games/light_my_ritual/resources/textures/foreground_level_iii.png b/games/light_my_ritual/resources/textures/foreground_level_iii.png Binary files differindex 0fc039d7..054aa8dc 100644 --- a/games/light_my_ritual/resources/textures/foreground_level_iii.png +++ b/games/light_my_ritual/resources/textures/foreground_level_iii.png diff --git a/games/light_my_ritual/resources/textures/light.png b/games/light_my_ritual/resources/textures/light.png Binary files differindex 5d08326f..98829c76 100644 --- a/games/light_my_ritual/resources/textures/light.png +++ b/games/light_my_ritual/resources/textures/light.png diff --git a/games/light_my_ritual/resources/textures/light_glow.png b/games/light_my_ritual/resources/textures/light_glow.png Binary files differindex d31356c6..a0bc845b 100644 --- a/games/light_my_ritual/resources/textures/light_glow.png +++ b/games/light_my_ritual/resources/textures/light_glow.png diff --git a/games/light_my_ritual/resources/textures/light_ray.png b/games/light_my_ritual/resources/textures/light_ray.png Binary files differindex f9f877fa..68c9e766 100644 --- a/games/light_my_ritual/resources/textures/light_ray.png +++ b/games/light_my_ritual/resources/textures/light_ray.png diff --git a/games/light_my_ritual/resources/textures/msg_ritual.png b/games/light_my_ritual/resources/textures/msg_ritual.png Binary files differindex 73f14d48..fa256cc7 100644 --- a/games/light_my_ritual/resources/textures/msg_ritual.png +++ b/games/light_my_ritual/resources/textures/msg_ritual.png diff --git a/games/light_my_ritual/resources/textures/player.png b/games/light_my_ritual/resources/textures/player.png Binary files differindex d6849478..637f1a25 100644 --- a/games/light_my_ritual/resources/textures/player.png +++ b/games/light_my_ritual/resources/textures/player.png diff --git a/games/light_my_ritual/resources/textures/time_over.png b/games/light_my_ritual/resources/textures/time_over.png Binary files differindex 9f7935be..971334ab 100644 --- a/games/light_my_ritual/resources/textures/time_over.png +++ b/games/light_my_ritual/resources/textures/time_over.png diff --git a/games/light_my_ritual/resources/textures/title.png b/games/light_my_ritual/resources/textures/title.png Binary files differindex 55eb593d..a1a0c86e 100644 --- a/games/light_my_ritual/resources/textures/title.png +++ b/games/light_my_ritual/resources/textures/title.png diff --git a/games/skully_escape/resources/textures/background_aisle01.png b/games/skully_escape/resources/textures/background_aisle01.png Binary files differindex 482056f8..32fe5b69 100644 --- a/games/skully_escape/resources/textures/background_aisle01.png +++ b/games/skully_escape/resources/textures/background_aisle01.png diff --git a/games/skully_escape/resources/textures/doors.png b/games/skully_escape/resources/textures/doors.png Binary files differindex f5a75d05..ff33169d 100644 --- a/games/skully_escape/resources/textures/doors.png +++ b/games/skully_escape/resources/textures/doors.png diff --git a/games/skully_escape/resources/textures/monster_chair_left.png b/games/skully_escape/resources/textures/monster_chair_left.png Binary files differindex b3ac070f..a4774032 100644 --- a/games/skully_escape/resources/textures/monster_chair_left.png +++ b/games/skully_escape/resources/textures/monster_chair_left.png diff --git a/games/skully_escape/resources/textures/monster_chair_right.png b/games/skully_escape/resources/textures/monster_chair_right.png Binary files differindex d29cc021..8d3007a3 100644 --- a/games/skully_escape/resources/textures/monster_chair_right.png +++ b/games/skully_escape/resources/textures/monster_chair_right.png diff --git a/games/skully_escape/resources/textures/monster_lamp_left.png b/games/skully_escape/resources/textures/monster_lamp_left.png Binary files differindex 3b31b77f..d95dd248 100644 --- a/games/skully_escape/resources/textures/monster_lamp_left.png +++ b/games/skully_escape/resources/textures/monster_lamp_left.png diff --git a/games/skully_escape/resources/textures/monster_lamp_right.png b/games/skully_escape/resources/textures/monster_lamp_right.png Binary files differindex 26491866..81bbc6d6 100644 --- a/games/skully_escape/resources/textures/monster_lamp_right.png +++ b/games/skully_escape/resources/textures/monster_lamp_right.png diff --git a/games/skully_escape/resources/textures/monster_picture.png b/games/skully_escape/resources/textures/monster_picture.png Binary files differindex 29549895..f4f9d84b 100644 --- a/games/skully_escape/resources/textures/monster_picture.png +++ b/games/skully_escape/resources/textures/monster_picture.png diff --git a/games/skully_escape/resources/textures/monster_window.png b/games/skully_escape/resources/textures/monster_window.png Binary files differindex 47d70a79..4a20a5c6 100644 --- a/games/skully_escape/resources/textures/monster_window.png +++ b/games/skully_escape/resources/textures/monster_window.png diff --git a/games/skully_escape/resources/textures/skully.png b/games/skully_escape/resources/textures/skully.png Binary files differindex 9ce6cd58..5fec5939 100644 --- a/games/skully_escape/resources/textures/skully.png +++ b/games/skully_escape/resources/textures/skully.png diff --git a/games/transmission/resources/textures/ending_background.png b/games/transmission/resources/textures/ending_background.png Binary files differindex 6577be63..20888658 100644 --- a/games/transmission/resources/textures/ending_background.png +++ b/games/transmission/resources/textures/ending_background.png diff --git a/games/transmission/resources/textures/message_background.png b/games/transmission/resources/textures/message_background.png Binary files differindex 78c00a59..fb544796 100644 --- a/games/transmission/resources/textures/message_background.png +++ b/games/transmission/resources/textures/message_background.png diff --git a/games/transmission/resources/textures/message_vignette.png b/games/transmission/resources/textures/message_vignette.png Binary files differindex 72234c59..6ef64b6b 100644 --- a/games/transmission/resources/textures/message_vignette.png +++ b/games/transmission/resources/textures/message_vignette.png diff --git a/games/transmission/resources/textures/mission_background.png b/games/transmission/resources/textures/mission_background.png Binary files differindex 4efe5815..da5f3f67 100644 --- a/games/transmission/resources/textures/mission_background.png +++ b/games/transmission/resources/textures/mission_background.png diff --git a/games/transmission/resources/textures/mission_backline.png b/games/transmission/resources/textures/mission_backline.png Binary files differindex 2a89d80a..6123a984 100644 --- a/games/transmission/resources/textures/mission_backline.png +++ b/games/transmission/resources/textures/mission_backline.png diff --git a/games/transmission/resources/textures/title_background.png b/games/transmission/resources/textures/title_background.png Binary files differindex c90d880d..e45bbec8 100644 --- a/games/transmission/resources/textures/title_background.png +++ b/games/transmission/resources/textures/title_background.png diff --git a/games/transmission/resources/textures/title_ribbon.png b/games/transmission/resources/textures/title_ribbon.png Binary files differindex 1526eba1..f75438dd 100644 --- a/games/transmission/resources/textures/title_ribbon.png +++ b/games/transmission/resources/textures/title_ribbon.png diff --git a/games/transmission/resources/textures/words_base.png b/games/transmission/resources/textures/words_base.png Binary files differindex a2139030..e79e9815 100644 --- a/games/transmission/resources/textures/words_base.png +++ b/games/transmission/resources/textures/words_base.png diff --git a/games/wave_collector/resources/textures/background.png b/games/wave_collector/resources/textures/background.png Binary files differindex f8613f82..b4f767f7 100644 --- a/games/wave_collector/resources/textures/background.png +++ b/games/wave_collector/resources/textures/background.png diff --git a/games/wave_collector/resources/textures/background_gameplay.png b/games/wave_collector/resources/textures/background_gameplay.png Binary files differindex c6a51070..9be7d17d 100644 --- a/games/wave_collector/resources/textures/background_gameplay.png +++ b/games/wave_collector/resources/textures/background_gameplay.png diff --git a/games/wave_collector/resources/textures/background_title.png b/games/wave_collector/resources/textures/background_title.png Binary files differindex 01fc46d3..19546d86 100644 --- a/games/wave_collector/resources/textures/background_title.png +++ b/games/wave_collector/resources/textures/background_title.png diff --git a/games/wave_collector/resources/textures/icon_synchro.png b/games/wave_collector/resources/textures/icon_synchro.png Binary files differindex b7172823..841f826b 100644 --- a/games/wave_collector/resources/textures/icon_synchro.png +++ b/games/wave_collector/resources/textures/icon_synchro.png diff --git a/games/wave_collector/resources/textures/icon_warp.png b/games/wave_collector/resources/textures/icon_warp.png Binary files differindex 2a5eb7bb..e91f43d4 100644 --- a/games/wave_collector/resources/textures/icon_warp.png +++ b/games/wave_collector/resources/textures/icon_warp.png diff --git a/games/wave_collector/resources/textures/lose.png b/games/wave_collector/resources/textures/lose.png Binary files differindex f01c0284..ba69a4c2 100644 --- a/games/wave_collector/resources/textures/lose.png +++ b/games/wave_collector/resources/textures/lose.png diff --git a/games/wave_collector/resources/textures/player.png b/games/wave_collector/resources/textures/player.png Binary files differindex c8913a8f..86b843b2 100644 --- a/games/wave_collector/resources/textures/player.png +++ b/games/wave_collector/resources/textures/player.png diff --git a/games/wave_collector/resources/textures/sample_big.png b/games/wave_collector/resources/textures/sample_big.png Binary files differindex b4c4be97..6fb20b63 100644 --- a/games/wave_collector/resources/textures/sample_big.png +++ b/games/wave_collector/resources/textures/sample_big.png diff --git a/games/wave_collector/resources/textures/sample_small.png b/games/wave_collector/resources/textures/sample_small.png Binary files differindex 7b624f7f..5fa7d01b 100644 --- a/games/wave_collector/resources/textures/sample_small.png +++ b/games/wave_collector/resources/textures/sample_small.png diff --git a/games/wave_collector/resources/textures/win.png b/games/wave_collector/resources/textures/win.png Binary files differindex d7afdc25..7d539f66 100644 --- a/games/wave_collector/resources/textures/win.png +++ b/games/wave_collector/resources/textures/win.png diff --git a/logo/raylib.ico b/logo/raylib.ico Binary files differindex afeb12b9..0cedcc55 100644 --- a/logo/raylib.ico +++ b/logo/raylib.ico diff --git a/logo/raylib_180x180.png b/logo/raylib_180x180.png Binary files differnew file mode 100644 index 00000000..1828fb33 --- /dev/null +++ b/logo/raylib_180x180.png diff --git a/logo/raylib_36x36.png b/logo/raylib_36x36.png Binary files differindex cc72255f..1346789b 100644 --- a/logo/raylib_36x36.png +++ b/logo/raylib_36x36.png diff --git a/logo/raylib_512x512.png b/logo/raylib_512x512.png Binary files differindex 0b8c48ec..59954911 100644 --- a/logo/raylib_512x512.png +++ b/logo/raylib_512x512.png diff --git a/logo/raylib_72x72.png b/logo/raylib_72x72.png Binary files differindex 34a6155e..b1c1f553 100644 --- a/logo/raylib_72x72.png +++ b/logo/raylib_72x72.png diff --git a/logo/raylib_96x96.png b/logo/raylib_96x96.png Binary files differindex f2774d22..d211d8f4 100644 --- a/logo/raylib_96x96.png +++ b/logo/raylib_96x96.png diff --git a/projects/VSCode/.vscode/c_cpp_properties.json b/projects/VSCode/.vscode/c_cpp_properties.json index 81efa19e..496a9b2d 100644 --- a/projects/VSCode/.vscode/c_cpp_properties.json +++ b/projects/VSCode/.vscode/c_cpp_properties.json @@ -38,6 +38,25 @@ "cStandard": "c11", "cppStandard": "c++14", "intelliSenseMode": "clang-x64" + }, + { + "name": "Linux", + "includePath": [ + "<path_to_raylib>/src/**", + "${workspaceFolder}/**" + ], + "defines": [ + "_DEBUG", + "UNICODE", + "_UNICODE", + "GRAPHICS_API_OPENGL_33", + "PLATFORM_DESKTOP" + ], + "compilerPath": "usr/bin/clang", + "cStandard": "c11", + "cppStandard": "c++14", + "intelliSenseMode": "clang-x64" + } ], "version": 4 diff --git a/projects/VSCode/.vscode/launch.json b/projects/VSCode/.vscode/launch.json index 5accab28..8c8a67ea 100644 --- a/projects/VSCode/.vscode/launch.json +++ b/projects/VSCode/.vscode/launch.json @@ -64,5 +64,47 @@ "cwd": "${workspaceFolder}", "preLaunchTask": "(OSX) build release" }, + { + "name": "(GNU) Debug", + "type": "cppdbg", + "request": "launch", + "program": "${workspaceFolder}/game", + "args": [], + "stopAtEntry": false, + "cwd": "${workspaceFolder}", + "environment": [], + "externalConsole": false, + "MIMode": "gdb", + "miDebuggerPath": "/usr/bin/gdb", + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "-enable-pretty-printing", + "ignoreFailures": false + } + ], + "preLaunchTask": "(GNU) build debug" + }, + { + "name": "(GNU) Run", + "type": "cppdbg", + "request": "launch", + "program": "${workspaceFolder}/game", + "args": [], + "stopAtEntry": false, + "cwd": "${workspaceFolder}", + "environment": [], + "externalConsole": false, + "MIMode": "gdb", + "miDebuggerPath": "/usr/bin/gdb", + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "-enable-pretty-printing", + "ignoreFailures": false + } + ], + "preLaunchTask": "(GNU) build release" + } ] } diff --git a/projects/VSCode/.vscode/tasks.json b/projects/VSCode/.vscode/tasks.json index 83e45c39..d94a2d69 100644 --- a/projects/VSCode/.vscode/tasks.json +++ b/projects/VSCode/.vscode/tasks.json @@ -33,18 +33,37 @@ "RAYLIB_PATH=<path_to_raylib>", "DEBUGGING=TRUE" ], + "group": "build" + }, + { + "label": "(OSX) build release", + "type": "process", + "command": "make", + "args": [ + "PLATFORM=PLATFORM_DESKTOP", + "RAYLIB_PATH=<path_to_raylib>", + ], + "group": "build" + }, + { + "label": "(GNU) build debug", + "type": "process", + "command": "make", + "args": [ + "PLATFORM=PLATFORM_DESKTOP", + "DEBUGGING=TRUE" + ], "group": { "kind": "build", "isDefault": true } }, { - "label": "(OSX) build release", + "label": "(GNU) build release", "type": "process", "command": "make", "args": [ "PLATFORM=PLATFORM_DESKTOP", - "RAYLIB_PATH=<path_to_raylib>", ], "group": "build" } diff --git a/projects/VSCode/Makefile b/projects/VSCode/Makefile index 6397fb29..9794c1ab 100644 --- a/projects/VSCode/Makefile +++ b/projects/VSCode/Makefile @@ -27,7 +27,7 @@ # WARNING: To compile to HTML5, code must be redesigned to use emscripten.h and emscripten_set_main_loop() PLATFORM ?= PLATFORM_DESKTOP RAYLIB_PATH ?= ../.. -PROJECT_NAME ?= standard_game +PROJECT_NAME ?= game DEBUGGING ?= FALSE # Default path for raylib on Raspberry Pi, if installed in different path, update it! diff --git a/raylib.rc.o b/raylib.rc.o Binary files differindex 28005c73..fa27177d 100644 --- a/raylib.rc.o +++ b/raylib.rc.o @@ -1424,8 +1424,7 @@ const char *GetDirectoryPath(const char *fileName) memset(filePath, 0, 256); lastSlash = strprbrk(fileName, "\\/"); - if (!lastSlash) - return NULL; + if (!lastSlash) return NULL; strncpy(filePath, fileName, strlen(fileName) - (strlen(lastSlash) - 1)); filePath[strlen(fileName) - strlen(lastSlash)] = '\0'; diff --git a/src/raylib.ico b/src/raylib.ico Binary files differindex afeb12b9..0cedcc55 100644 --- a/src/raylib.ico +++ b/src/raylib.ico diff --git a/src/raylib.rc b/src/raylib.rc index ee2a5fab..2aaa5e26 100644 --- a/src/raylib.rc +++ b/src/raylib.rc @@ -9,7 +9,7 @@ BEGIN //BLOCK "080904E4" // English UK BLOCK "040904E4" // English US BEGIN - VALUE "CompanyName", "raylib technologies" + //VALUE "CompanyName", "raylib technologies" VALUE "FileDescription", "Created using raylib (www.raylib.com)" VALUE "FileVersion", "2.0.0" VALUE "InternalName", "raylib app" diff --git a/templates/advance_game/resources/mecha.png b/templates/advance_game/resources/mecha.png Binary files differindex 8022d18c..9213fa2d 100644 --- a/templates/advance_game/resources/mecha.png +++ b/templates/advance_game/resources/mecha.png |
