hipnosuer
/
Zuma
forked from ShuriZma/suyu
1
0
Fork 0
Code Pull Requests Activity
27,407 Commits 21 Branches 3 Tags 331 MiB
Commit Graph

27407 Commits

Author SHA1 Message Date
MattTheTekie b5ca0beb34 Merge branch 'MattTheTekie-dev-patch-da1f' into 'dev' 
Update file README.md

See merge request suyu-emu/suyu!56
 2024-03-06 23:31:46 +00:00
MattTheTekie 915331dc91 Update file README.md 2024-03-06 23:24:53 +00:00
MattTheTekie 1c9d3b7fe9 Merge branch 'dev-mattthetekie' into 'dev' 
Correct Readme

See merge request suyu-emu/suyu!55
 2024-03-06 23:18:46 +00:00
MattTheTekie 36e984c2f0 Update file README.md 2024-03-06 23:16:24 +00:00
MattTheTekie 72015483da Delete compatibility.yml 2024-03-06 23:04:47 +00:00
Crimson Hawk 70889bac6d Merge branch 'niansa-dev-patch-78313' into 'dev' 
Don't credit realmy for logo (he's fine with it)

See merge request suyu-emu/suyu!52
 2024-03-06 21:00:27 +00:00
Crimson Hawk 05c5ab14ff Merge branch 'MattTheTekie-dev-patch-98160' into 'dev' 
Implement compatibility links

See merge request suyu-emu/suyu!45
 2024-03-06 20:59:21 +00:00
niansa 04d60c245e Don't credit realmy (he's fine with it) 2024-03-06 18:08:39 +00:00
MattTheTekie 35e99a9bff Implement compatibility links 2024-03-06 16:07:40 +00:00
MattTheTekie b92e629884 Merge branch 'new-icons' into 'dev' 
Copy changes made to `master` branch into `dev`

See merge request suyu-emu/suyu!41
 2024-03-06 15:55:33 +00:00
Realmy 72fa5ff724 Fix some capitalization 2024-03-06 16:32:01 +01:00
Realmy 2442980941 Update link to logo (will be visible once it's been merged into the main repo) 2024-03-06 16:31:53 +01:00
Realmy 7267e8ca0d Added logo to readme 2024-03-06 16:31:46 +01:00
Realmy 9a78717925 Better wording for the notes at the top 2024-03-06 16:31:40 +01:00
niansa e6d53818b7 Link to Merge request guidelines in `CONTRIBUTING.md` 2024-03-06 16:30:54 +01:00
MattTheTekie 5ea1dc73d4 Update README.md 2024-03-06 16:30:39 +01:00
MattTheTekie 8761ca2983 Add new file 2024-03-06 16:30:28 +01:00
niansa 758e12daa2 Remaining icons 2024-03-06 16:24:42 +01:00
Crimson Hawk 6df2ff2592 Merge branch 'patch-4' into 'dev' 
Fixed building on Debian Trixie

See merge request suyu-emu/suyu!12
 2024-03-06 14:29:03 +00:00
Crimson Hawk 069482a788 Merge branch 'fix-windows' into 'dev' 
Windows build + remove dependency from github.com

See merge request suyu-emu/suyu!11
 2024-03-06 13:02:11 +00:00
Crimson Hawk c6b015394b Merge branch 'zqpvr-master-patch-36851' into 'dev' 
change github to gitlab in readme

See merge request suyu-emu/suyu!13
 2024-03-06 13:00:56 +00:00
zqpvr 600f66ebbd change github to gitlab in readme 2024-03-06 13:00:56 +00:00
Crimson Hawk 885161d45f Merge branch 'dev' into 'dev' 
Reverted Copyright headers and added suyu

See merge request suyu-emu/suyu!30
 2024-03-06 13:00:10 +00:00
JuanCStar 1f7a8ed4ed Reverted Copyright headers and added suyu 2024-03-06 13:32:29 +01:00
Crimson Hawk d3a82480da Merge branch 'dev' into 'dev' 
Changed app window name, logo and other references related

See merge request suyu-emu/suyu!29
 2024-03-06 11:56:24 +00:00
JuanCStar f772e7d776 Changed app window name, logo and other references related 2024-03-06 11:19:34 +01:00
Crimson Hawk 93102c4140 Merge branch 'dev' into 'dev' 
Replace yuzu.bmp references

See merge request suyu-emu/suyu!25
 2024-03-06 10:19:19 +00:00
Andrea V 4b917ac0c7 Merge remote-tracking branch 'origin/dev' into fix-windows 2024-03-06 09:56:42 +01:00
Jamie 292d02c039 Replace yuzu.bmp references 
Changing the icon to branding as well as replace the references to it
 2024-03-06 03:51:23 -05:00
Crimson Hawk ed20ee50f5 Merge branch 'master' into 'dev' 
Build success for Android and Windows: cleaned up external packages

See merge request suyu-emu/suyu!23
 2024-03-06 07:09:04 +00:00
blitzingeagle 2611f474e2 Merge from @jermzxL 2024-03-06 01:13:46 -05:00
Jermz c6de190c91 Merge branch 'dev' into 'dev' 
# Conflicts:
#   CMakeLists.txt
#   CMakeModules/DownloadExternals.cmake
 2024-03-06 05:55:02 +00:00
blitzingeagle 13e4a1df23 Merge with upstream/dev 2024-03-06 00:38:58 -05:00
Crimson Hawk e0c5a304e2 Merge branch 'revert-fdadc50f' into 'dev' 
Revert "Merge branch 'master' into 'dev'"

See merge request suyu-emu/suyu!24
 2024-03-06 05:27:21 +00:00
Crimson Hawk cdbdf63ebe Revert "Merge branch 'master' into 'dev'" 
This reverts merge request !17
 2024-03-06 05:26:38 +00:00
blitzingeagle b9e198f0a8 Merge with upstream/dev 2024-03-05 23:40:19 -05:00
blitzingeagle 9c12172ffe Clean up and resolve externals for build 2024-03-05 21:19:13 -05:00
Crimson Hawk 91a6777e9c Merge branch 'zqpvr-master-patch-55236' into 'master' 
Update README.md

See merge request suyu-emu/suyu!21
 2024-03-06 01:02:55 +00:00
Crimson Hawk 56ab794ed3 Merge branch 'blitzingeagle-master-patch-30432' into 'master' 
Fix typo in README.md

See merge request suyu-emu/suyu!22
 2024-03-06 01:02:28 +00:00
blitzingeagle ba17a5688f Fix typo in README.md 2024-03-06 00:57:49 +00:00
Jamie ac9963aea8 Project moving to suyu-emu instead of suyu2 2024-03-05 19:50:36 -05:00
zqpvr e15ab4929c Update README.md 2024-03-06 00:38:47 +00:00
Jamie c4d58ce508 Migrate the downloads to suyu gitlab 2024-03-05 18:40:22 -05:00
Jamie b108b5a8aa Add fixes to compile under windows 2024-03-05 17:41:53 -05:00
Crimson Hawk 9cee46b38b Merge branch 'niansa-master-patch-97019' into 'master' 
Fixed wiki links in README.md

See merge request suyu2/suyu!7
 2024-03-05 22:27:00 +00:00
Crimson Hawk 6e1a5b35ac Merge branch 'zqpvr-master-patch-37684' into 'master' 
Update README.md

See merge request suyu2/suyu!8
 2024-03-05 22:26:37 +00:00
Crimson Hawk 5fb6db78bc Merge branch 'niansa-master-patch-41092' into 'master' 
Fixed link in CONTRIBUTING.md

See merge request suyu2/suyu!6
 2024-03-05 22:26:00 +00:00
Crimson Hawk 978297fc81 Merge branch 'fix-compile-ubuntu-22.04' into 'master' 
Fix Linux compile

See merge request suyu2/suyu!9
 2024-03-05 22:25:39 +00:00
Crimson Hawk fdadc50fff Merge branch 'master' into 'dev' 
modifying all the files to match the app

See merge request suyu2/suyu!17
 2024-03-05 22:25:19 +00:00
Crimson Hawk 5382be9787 Merge branch 'zqpvr-master-patch-32885' into 'master' 
Update README.md

See merge request suyu2/suyu!14
 2024-03-05 22:23:29 +00:00