Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop.gurpreet.codeeditor2 #147

Merged
merged 58 commits into from
Dec 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
ed82737
[feature] basic setup; fix feather see also
gurpreetsinghmatharoo Jan 5, 2024
4f43ed2
[Feature] structural work for the text editor; working on main page
gurpreetsinghmatharoo Jan 8, 2024
404dc9f
[Feature] editor frame main contents finished
gurpreetsinghmatharoo Jan 8, 2024
60950e8
[Feature] working on Editing Code page
gurpreetsinghmatharoo Jan 8, 2024
5ffc13a
[Feature] more work towards the Editing Code page
gurpreetsinghmatharoo Jan 8, 2024
41bae4b
[Feature] work on Editing Code page done till Selection menu
gurpreetsinghmatharoo Jan 9, 2024
9539837
[Feature] further work on editing code page; up to indentation mode
gurpreetsinghmatharoo Jan 9, 2024
96f5998
[Feature] More work on the Editing Code page
gurpreetsinghmatharoo Jan 19, 2024
3c9c845
Merge branch 'develop' into develop.gurpreet.codeeditor2
gurpreetsinghmatharoo Mar 28, 2024
b23f300
Merge branch 'develop' into develop.gurpreet.codeeditor2
gurpreetsinghmatharoo Apr 3, 2024
4876730
docs(feature): Smaller updates to CE2; mentioned on Notes page now
gurpreetsinghmatharoo Apr 3, 2024
844a482
docs(feature): Added variables for legacy and new code editor
gurpreetsinghmatharoo Apr 4, 2024
084282e
docs(feature): More work for CE2
gurpreetsinghmatharoo Apr 5, 2024
0dd26a4
docs(feature): Lots of CE2 updates
gurpreetsinghmatharoo Apr 8, 2024
eb82168
docs(feature): Documented the main options for CE2 preferences
gurpreetsinghmatharoo Apr 9, 2024
212e34d
docs(feature): Finish CE2 prefs
gurpreetsinghmatharoo Apr 9, 2024
24b4390
docs(feature): CE2 updates
gurpreetsinghmatharoo Apr 10, 2024
08a08af
docs(feature): Some CE2 screenshots, updates to asset pages to mentio…
gurpreetsinghmatharoo Apr 10, 2024
e951e5a
docs(feature): Finished screenshots for main CE2 page
gurpreetsinghmatharoo Apr 11, 2024
a1658a8
docs(feature): Finish screenshots on Editing Code page
gurpreetsinghmatharoo Apr 11, 2024
fa7b8e3
docs(feature): Finish screenshots for Code Completion page
gurpreetsinghmatharoo Apr 11, 2024
c90003c
docs(feature): Finish images for CE2 prefs
gurpreetsinghmatharoo Apr 11, 2024
ce26cf2
docs(feature): Extension file RMB menu
gurpreetsinghmatharoo Apr 11, 2024
0275204
docs(general): Improved Surfaces documentation
gurpreetsinghmatharoo Apr 12, 2024
20da4ac
docs(feature): CE2 docs review finished
gurpreetsinghmatharoo Apr 12, 2024
0fa00c6
docs(feature): Link to CE2 prefs'
gurpreetsinghmatharoo Apr 12, 2024
416eb71
docs(feature): Add back shortcuts for Legacy CE
gurpreetsinghmatharoo Apr 12, 2024
2a17597
docs(feature): Closing CE2 will save all changes
gurpreetsinghmatharoo Apr 15, 2024
e7fb95e
docs(feature): Mention you can delete themes
gurpreetsinghmatharoo Apr 18, 2024
80921a1
Merge branch 'develop' into develop.gurpreet.codeeditor2
gurpreetsinghmatharoo Apr 25, 2024
9e007c6
Merge branch 'develop' into develop.gurpreet.codeeditor2
gurpreetsinghmatharoo May 6, 2024
46a1f4a
docs(feature): CE2 text improvements
gurpreetsinghmatharoo May 6, 2024
c30ba03
docs(feature): Moved @func JSDoc identifier to Legacy CE only
gurpreetsinghmatharoo May 17, 2024
dbd4509
Merge branch 'develop' into develop.gurpreet.codeeditor2
gurpreetsinghmatharoo May 22, 2024
be0aaa1
docs(feature): CE2 - "Restore Default Colours" button documented; you…
gurpreetsinghmatharoo May 28, 2024
16e8dad
docs(feature): Update Code Snippets page according to CE2 functionality
gurpreetsinghmatharoo Jun 27, 2024
da6e564
Merge branch 'develop' into develop.gurpreet.codeeditor2
gurpreetsinghmatharoo Jun 27, 2024
e8ea624
docs(feature): https://github.com/YoYoGames/GameMaker-Bugs/issues/6244
gurpreetsinghmatharoo Jul 1, 2024
10befc4
docs(feature): Fix for two shortcuts on mac for CE2
gurpreetsinghmatharoo Jul 1, 2024
b830285
Merge branch 'develop.gurpreet' into develop.gurpreet.codeeditor2
gurpreetsinghmatharoo Jul 11, 2024
161fb1f
docs(feature): new C2 shortcuts
gurpreetsinghmatharoo Jul 11, 2024
b9f418d
docs(feature): Change "Create Event" back to "Add Event" to avoid con…
gurpreetsinghmatharoo Aug 28, 2024
3ff64e3
docs(feature): CE2 splitter RMB behaviour documented
gurpreetsinghmatharoo Aug 28, 2024
5e179ae
docs(feature): Fragment/Vertex shader icons are being used by the wro…
gurpreetsinghmatharoo Aug 29, 2024
e74d36e
docs(feature): CE2 preferences update
gurpreetsinghmatharoo Aug 29, 2024
0df34a1
docs(feature): CE2 preferences clarification
gurpreetsinghmatharoo Sep 2, 2024
b371b2d
docs(feature): CE2 improvements
gurpreetsinghmatharoo Sep 12, 2024
2b37c12
docs(feature): CE2 - Commenting one line selection with control k sho…
gurpreetsinghmatharoo Sep 20, 2024
0661944
Merge branch 'develop' into develop.gurpreet.codeeditor2
gurpreetsinghmatharoo Sep 30, 2024
b21d9bd
docs(feature): update CE2 undo limit to 200
gurpreetsinghmatharoo Nov 6, 2024
746fd2b
Merge branch 'develop' into develop.gurpreet.codeeditor2
gurpreetsinghmatharoo Nov 11, 2024
de96979
docs(feature): Enforce restarting GameMaker immediately whenever togg…
gurpreetsinghmatharoo Nov 19, 2024
c41b70a
Merge branch 'develop.gurpreet' into develop.gurpreet.codeeditor2
gurpreetsinghmatharoo Nov 21, 2024
a3f9207
docs(feature): CE2 (Beta) update
gurpreetsinghmatharoo Nov 21, 2024
8478cff
Merge branch 'develop' into develop.gurpreet.codeeditor2
gurpreetsinghmatharoo Nov 27, 2024
3ec5576
docs(feature): Fixed var file formatting
gurpreetsinghmatharoo Dec 6, 2024
86bacb4
Revert "docs(feature): Fixed var file formatting"
gurpreetsinghmatharoo Dec 6, 2024
52d2b86
Merge branch 'develop' into develop.gurpreet.codeeditor2
gurpreetsinghmatharoo Dec 6, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions Manual/contents/Additional_Information/Errors/Syntax_Errors.htm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Syntax Errors (Feather Messages)</title>
<meta name="generator" content="Adobe RoboHelp 2020" />
<meta name="generator" content="Adobe RoboHelp 2022" />
<link rel="stylesheet" href="../../assets/css/default.css" type="text/css" />
<script src="../../assets/scripts/main_script.js" type="module"></script>
<meta name="rh-authors" content="Mark Alexander" />
Expand All @@ -16,7 +16,17 @@
<!--<div class="body-scroll" style="top: 150px;">-->
<h1><span data-field="title" data-format="default">Syntax Errors (Feather Messages)</span></h1>
<p>The first level of error reporting when programming your games in <span data-keyref="GameMaker Name">GameMaker</span> is in the code or GML Visual editor, and it&#39;s the <a class="glossterm" data-glossterm="syntax" href="#">syntax</a> checker. As you write your code - or add your actions - <span data-keyref="GameMaker Name">GameMaker</span> will check that it follows the established syntax for the language, and flag any issues that it finds so you can fix them before it comes to running the game or compiling an executable.</p>
<p>Syntax error checking happens differently depending on whether you have enabled <a href="../../The_Asset_Editors/Code_Editor_Properties/Feather_Features.htm">Feather</a> in the <a href="../../Setting_Up_And_Version_Information/IDE_Preferences/Feather_Settings.htm">Feather Settings</a>.</p>
<p>Syntax error checking happens differently depending on whether you have enabled <a href="../../The_Asset_Editors/Code_Editor_Properties/Feather_Features.htm">Feather</a> in the <a href="../../Setting_Up_And_Version_Information/IDE_Preferences/Feather_Settings.htm">Feather Settings</a>. It is enabled by default.</p>
<h2 id="h">Feather Messages (Feather enabled)</h2>
<p>When Feather is enabled the Syntax Errors window is replaced by the Feather Messages window: </p>
<p><img class="center" src="../../assets/Images/Scripting_Reference/Additional_Information/Output_Feather_Searchable_Sortable.png" />The Feather Messages window lists the errors and warnings that Feather encounters in your code, as well as the suggestions that it gives when it finds certain specific code patterns. Which types of errors are shown here depends on the profile that you define in the <a href="../../Setting_Up_And_Version_Information/IDE_Preferences/Feather_Settings.htm">Feather Settings</a> under Message Severity.</p>
<p>In this window the list of messages can be sorted ascending or descending by message code, by message text (alphabetically) or by resource (alphabetically by resource name). You can also search using the search box in the top right corner of the window.</p>
<p>Feather messages fall into three categories:</p>
<ul class="colour">
<li><img src="../../assets/Images/Scripting_Reference/Additional_Information/i_Feather_Warning.png" /> <strong>Warnings</strong>: These are shown for possible errors, which, in most cases, won&#39;t stop the game from compiling, but might provoke runtime errors. The most common causes of these warnings is when a variable is used in an expression and it hasn&#39;t been defined yet anywhere else, or when a variable has been defined but hasn&#39;t been used.</li>
<li><img src="../../assets/Images/Scripting_Reference/Additional_Information/i_Feather_Error.png" /> <strong>Errors</strong>: These are problems that will not permit the game to compile, let alone run. These should be fixed before doing anything further with the code.</li>
<li><img src="../../assets/Images/Scripting_Reference/Additional_Information/i_Feather_Suggestion.png" /> <strong>Suggestions</strong>: These are suggestions for possible improvements to the code, related to a variety of things.</li>
</ul>
<h2>Syntax Errors (Feather disabled)</h2>
<p><img alt="Syntax Errors Example" class="center" src="../../assets/Images/Scripting_Reference/Additional_Information/Errors_Syntax_Example.png" /></p>
<p>These errors fall into two main categories:</p>
Expand Down Expand Up @@ -241,15 +251,7 @@ <h3>Syntax Error List</h3>
</tr>
</tbody>
</table>
<h2 id="h">Feather Messages (Feather enabled)</h2>
<p>When Feather is enabled the Syntax Errors window is replaced by the Feather Messages window: </p>
<p><img class="center" src="../../assets/Images/Scripting_Reference/Additional_Information/Output_Feather_Searchable_Sortable.png" />The Feather Messages window lists the errors and warnings that Feather encounters in your code, as well as the suggestions that it gives when it finds certain specific code patterns. Which types of errors are shown here depends on the profile that you define in the <a href="../../Setting_Up_And_Version_Information/IDE_Preferences/Feather_Settings.htm">Feather Settings</a> under Message Severity.</p>
<p>In this window the list of messages can be sorted ascending or descending by message code, by message text (alphabetically) or by resource (alphabetically by resource name). You can also search using the search box in the top right corner of the window.</p>
<p>Feather messages fall into three categories:</p>
<ul class="colour">
<li><img src="../../assets/Images/Scripting_Reference/Additional_Information/i_Feather_Warning.png" /> <strong>Warnings</strong>: These are shown for possible errors, which, in most cases, won&#39;t stop the game from compiling, but might provoke runtime errors. The most common causes of these warnings is when a variable is used in an expression and it hasn&#39;t been defined yet anywhere else, or when a variable has been defined but hasn&#39;t been used.</li>
<li><img src="../../assets/Images/Scripting_Reference/Additional_Information/i_Feather_Error.png" /> <strong>Errors</strong>: These are problems that will not permit the game to compile, let alone run. These should be fixed before doing anything further with the code.</li>
<li><img src="../../assets/Images/Scripting_Reference/Additional_Information/i_Feather_Suggestion.png" /> <strong>Suggestions</strong>: These are suggestions for possible improvements to the code, related to a variety of things.</li>
</ul>
<h3> </h3>
<p> </p>
Expand All @@ -260,7 +262,7 @@ <h3> </h3>
<div style="float:right">Next: <a href="Compiler_Errors.htm">Compiler Errors</a></div>
</div>
</div>
<h5><span data-keyref="Copyright Notice">© Copyright YoYo Games Ltd. 2022 All Rights Reserved</span></h5>
<h5><span data-keyref="Copyright Notice">© Copyright YoYo Games Ltd. 2024 All Rights Reserved</span></h5>
</div>
<!-- KEYWORDS
Syntax Errors
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ <h4>Returns:</h4>
<p class="code"><span data-keyref="Type_Void">N/A</span></p>
<p> </p>
<h4>Example:</h4>
<p class="code">if (lives = 0) <br />
<p class="code">if (lives == 0) <br />
{<br />
    audio_emitter_free(s_emit);<br />
    room_goto(rm_Menu);<br />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <h1>sprite_merge</h1>
<p>This function will merge the sprite indexed in argument 1 (&quot;ind2&quot;) with that which is indexed in argument 0 (&quot;ind1&quot;). The images themselves are <b>NOT</b> merged together, but rather the image indices are merged, with the sub images from sprite &quot;ind2&quot; appended onto those of sprite &quot;ind1&quot;, ie: they are added on at the end. Note that if the sprites are different sizes, then the appended sprites are stretched to fit the image size for &quot;ind1&quot;.</p>
<p>This change is permanent, and from the moment you use this function until the game is closed or the sprite deleted, the sprite that is being merged into will be changed, however the sprite that it is being merged with will remain the same.</p>
<p class="note"><span data-conref="../../../../../assets/snippets/Tag_note.hts"> </span> Neither the image asset that is being merged into, nor the image asset that is for merging, can be one of the original game resources. You must use <span style="font-size:1px;"><a href="sprite_duplicate.htm"><span class="inline">sprite_duplicate()</span></a></span> first to create two new resources (if you are merging included game assets) and then merge those.</p>
<p class="note"><span data-conref="../../../../../assets/snippets/Tag_note.hts"> </span> This function is only useful for <b>bitmap</b> sprites and will not work with vector or JSON (Spine) sprites.</p>
<p class="note"><span data-conref="../../../../../assets/snippets/Tag_note.hts"> </span> This function is only useful for <b>bitmap</b> sprites and will not work with SWF or JSON (Spine) sprites.</p>
<p> </p>
<h4>Syntax:</h4>
<p class="code">sprite_merge(ind1, ind2);</p>
Expand Down Expand Up @@ -50,7 +50,7 @@ <h4>Example:</h4>
tspr[0] = sprite_add(working_directory + &quot;Sprite Assets/explode1.png&quot;, 16, true, true, 0, 0);<br />
tspr[1] = sprite_duplicate(spr_Explosion);<br />
sprite_merge(tspr[0], tspr[1]);<br />
sprite_index = t_spr[0];<br />
sprite_index = tspr[0];<br />
sprite_delete(tspr[1]);</p>
<p>The above code loads a sprite into a local variable then merges it with another sprite that has been duplicated. Finally the merged sprite is assigned to the instance <span class="inline">sprite_index</span> while the loaded sprite is removed to free the memory it uses. Note that at some point after this operation, like in the Destroy or Room End events, you will also need to use <a href="sprite_delete.htm"><span class="inline">sprite_delete()</span></a> to remove the merged sprite from memory too.</p>
<p> </p>
Expand Down
1 change: 1 addition & 0 deletions Manual/contents/IDE_Navigation/IDE_Input.htm
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ <h2 id="related_topics">Related Topics</h2>
</div>
<p> </p>
<p> </p>
<p> </p>
<div class="footer">
<div class="buttons">
<div class="clear">
Expand Down
4 changes: 2 additions & 2 deletions Manual/contents/IDE_Navigation/Menus.htm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Menus</title>
<meta name="generator" content="Adobe RoboHelp 2020" />
<meta name="generator" content="Adobe RoboHelp 2022" />
<link rel="stylesheet" href="../assets/css/default.css" type="text/css" />
<script src="../assets/scripts/main_script.js" type="module"></script>
<meta name="rh-authors" content="Mark Alexander" />
Expand Down Expand Up @@ -51,7 +51,7 @@ <h1>Menus</h1>
<div style="float:right">Next: <a data-xref="{title}" href="Bookmarks.htm">Bookmarks</a></div>
</div>
</div>
<h5><span data-keyref="Copyright Notice">© Copyright YoYo Games Ltd. 2023 All Rights Reserved</span></h5>
<h5><span data-keyref="Copyright Notice">© Copyright YoYo Games Ltd. 2024 All Rights Reserved</span></h5>
</div>
<!-- KEYWORDS
IDE Navigation
Expand Down
Loading