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

Basic Lua Scripting Support #1671

Open
wants to merge 39 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
2f19ab8
Next Attempt (2024)!
NPO-197 Sep 25, 2024
8d0de89
New Class "LuaBundle"
NPO-197 Sep 27, 2024
5eccaae
Update CMakeLists.txt find lua package...
NPO-197 Sep 28, 2024
11909c3
Update build-ubuntu.yml
NPO-197 Sep 28, 2024
fbfbf51
Update vcpkg.json
NPO-197 Sep 28, 2024
226053b
Update CMakeLists.txt
NPO-197 Sep 28, 2024
5c00b0b
Update CMakeLists.txt
NPO-197 Sep 28, 2024
0a1e420
Update flake.nix
NPO-197 Sep 28, 2024
e7e15a6
Update CMakeLists.txt
NPO-197 Sep 28, 2024
1cdf447
Update CMakeLists.txt
NPO-197 Sep 28, 2024
f144f75
Using `lua_getextraspace(` instead of redefining lua_State
NPO-197 Sep 29, 2024
487b80c
Update CMakeLists.txt & build-ubuntu.yml
NPO-197 Oct 15, 2024
7283efc
Fixed some broken functions, added Lua test script to tools
NPO-197 Oct 16, 2024
4f1b1d1
fixed LuaSaveState
NPO-197 Oct 17, 2024
4f4619d
Update LuaScriptTest.lua
NPO-197 Oct 17, 2024
ba82d93
Fixing qpainter font to work on MacOS
NPO-197 Oct 18, 2024
92fc1f9
Update LuaMain.cpp
NPO-197 Oct 18, 2024
5376f5a
Update LuaMain.cpp
NPO-197 Oct 18, 2024
3ee3abf
Update LuaMain.cpp
NPO-197 Oct 18, 2024
bc40d89
Update LuaMain.cpp
NPO-197 Oct 18, 2024
d92fb25
replaced QString with const char* while passing args
NPO-197 Oct 19, 2024
f16fe76
Create Lua_Docs.md
NPO-197 Oct 22, 2024
b828181
Update Lua_Docs.md
NPO-197 Oct 22, 2024
db78366
Code Clean Up
NPO-197 Oct 23, 2024
cc8b7f0
Merge branch 'master' of https://github.com/NPO-197/melonDS-lua
NPO-197 Oct 23, 2024
c1921f9
Clean LuaMain
NPO-197 Oct 23, 2024
a6dd236
Code Clean Up
NPO-197 Oct 23, 2024
b16912a
Changed MelonPrint to print,
NPO-197 Oct 27, 2024
a312d4d
Update Lua_Docs.md
NPO-197 Oct 28, 2024
c21d794
Running Lua Script on the main GUI thread
NPO-197 Oct 28, 2024
5196151
Merge branch 'master' into master
NPO-197 Oct 28, 2024
e3e31b8
Code Cleanup
NPO-197 Nov 1, 2024
e7e5ccb
Merge branch 'master' into master
NPO-197 Nov 1, 2024
359fbfb
Merge branch 'melonDS-emu:master' into master
NPO-197 Nov 5, 2024
839f733
Revised Keyboard input, currentDir
NPO-197 Nov 5, 2024
9180d4f
Merge branch 'master' of https://github.com/NPO-197/melonDS-lua
NPO-197 Nov 5, 2024
ecd943d
Merge branch 'melonDS-emu:master' into master
NPO-197 Nov 5, 2024
c43feca
Merge branch 'master' into master
NPO-197 Nov 17, 2024
36a54cb
Merge branch 'melonDS-emu:master' into master
NPO-197 Nov 21, 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
Prev Previous commit
Next Next commit
Merge branch 'master' into master
  • Loading branch information
NPO-197 authored Nov 1, 2024
commit e7e5ccb1041887055319aed91b7d186f9216aa23
6 changes: 6 additions & 0 deletions src/frontend/qt_sdl/EmuInstance.h
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,12 @@ class EmuInstance
SDL_Joystick* getJoystick() { return joystick; }

std::vector<int> keyStrokes;

void touchScreen(int x, int y);
void releaseScreen();

QMutex renderLock;

private:
static int lastSep(const std::string& path);
std::string getAssetPath(bool gba, const std::string& configpath, const std::string& ext, const std::string& file);
Expand Down
4 changes: 4 additions & 0 deletions src/frontend/qt_sdl/EmuInstanceInput.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ void EmuInstance::inputInit()
for (int i=0;i<256;i++)
KeyboardMask[i]=false;

isTouching = false;
touchX = 0;
touchY = 0;

joystick = nullptr;
controller = nullptr;
hasRumble = false;
Expand Down
3 changes: 3 additions & 0 deletions src/frontend/qt_sdl/Screen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@
#include "main_shaders.h"
#include "OSD_shaders.h"
#include "font.h"

#include "version.h"

#include "LuaMain.h"

using namespace melonDS;
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.