preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-11-15 02:29:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
31,496 Commits 85 Branches 131 Tags
v1.12.3+
Commit Graph
133 Commits
Author SHA1 Message Date
LunaMoo d60b332536 Changes to make use of the dual atlas mode 
Merge branch 'master' into TemporaryHackishBranch

# Conflicts:
#	CMakeLists.txt
#	Common/UI/Context.cpp
#	Core/Config.cpp
#	GPU/D3D11/TextureCacheD3D11.cpp
#	GPU/Directx9/TextureCacheDX9.cpp
#	GPU/GLES/TextureCacheGLES.cpp
#	GPU/Vulkan/TextureCacheVulkan.cpp
#	README.md
#	UI/GameSettingsScreen.cpp
#	UI/MainScreen.cpp
#	UI/NativeApp.cpp
#	android/assets/ui_atlas.meta
#	android/assets/ui_atlas.zim
#	assets/ui_atlas.meta
#	assets/ui_atlas.zim
 2021-11-11 21:47:23 +01:00
Unknown W. Brackets 931ba43216 UI: Remove scroll to top on size change. 
It wasn't actually used anywhere, and I don't see a reason for it now.
 2021-09-27 23:39:33 -07:00
Unknown W. Brackets fc78b408b2 UI: Have scroll views directly remember their pos. 
Kinda like checkboxes, cleaner this way.
 2021-09-27 23:25:41 -07:00
LunaMoo 34d138a12f Fix UI crash on import cheat without cheat.db present 
Some changes to ParseCheatDB to make it easier to merge updates in the future
 2021-05-24 23:12:11 +02:00
LunaMoo 8e66239404 Fix UI import cheat crash. 2021-05-24 22:54:04 +02:00
LunaMoo 0ee43104e4 Merge branch 'master' into TemporaryHackishBranch 
# Conflicts:
#	Core/SaveState.cpp
#	UI/ControlMappingScreen.cpp
#	UI/CwCheatScreen.cpp
#	UI/GameSettingsScreen.cpp
#	UI/PauseScreen.cpp
#	android/assets/ppge_atlas.zim
#	android/assets/ppge_atlas_luna.meta
#	android/assets/ui_atlas.zim
#	android/assets/ui_atlas_luna.meta
#	android/res/drawable-hdpi/ic_launcher.png
#	android/res/drawable-ldpi/ic_launcher.png
#	android/res/drawable-mdpi/ic_launcher.png
#	android/res/drawable-xhdpi/ic_launcher.png
#	android/res/drawable-xhdpi/tv_banner.png
#	android/res/drawable-xxhdpi/ic_launcher.png
#	android/res/drawable/ic_banner.png
#	assets/ppge_atlas.zim
#	assets/ppge_atlas_luna.meta
#	assets/ui_atlas.zim
#	assets/ui_atlas_luna.meta
 2021-05-24 15:17:07 +02:00
Henrik Rydgård ae06499a0c Change Copy, Rename to use Path. Remove std::string version of Exists(). 
Buildfixes

Buildfix
 2021-05-13 10:39:16 +02:00
Henrik Rydgård 025bcb1673 Introduce Path, start using it all over the place. 
Still lots left to convert!

Convert GetSysDirectory to return Path.

More buildfixing

Remove unnecessary Path( constructors
 2021-05-13 10:39:16 +02:00
Unknown W. Brackets 2f1cfd993c Cheats: Avoid OpenCPPFile for cheat import. 
This code is a mess, just trying to keep it the same for now.
 2021-05-09 17:00:48 -07:00
Henrik Rydgård a2a0551a83 Buildfix, and more renaming while we're at it. 2021-04-25 22:25:29 +02:00
Henrik Rydgård 77b8a14770 Merge GetFileInfo/GetFileDetails into GetFileInfo 2021-04-25 20:52:29 +02:00
Henrik Rydgård 1b13badeb4 Move remaining FileUtil functions into the File namespace. 2021-04-25 20:38:22 +02:00
LunaMoo a5ed04b1b6 Merge branch 'master' into TemporaryHackishBranch 
# Conflicts:
#	Common/GPU/Vulkan/VulkanRenderManager.cpp
#	Core/Config.cpp
#	Core/HW/MediaEngine.cpp
#	UI/CwCheatScreen.cpp
#	UI/MainScreen.cpp
#	UI/MiscScreens.cpp
#	Windows/resource.h
 2021-03-13 01:48:32 +01:00
Unknown W. Brackets 13ec384dbe Build: Explicitly include ppsspp_config.h. 
This adds it to all files that use it.  Not all our builds include the
file.
 2021-03-02 21:04:03 -08:00
Unknown W. Brackets 3360121b5c UI: Expose lists better in descriptions. 
Explicitly marks several lists, which should make exposing text better.
 2021-02-21 18:41:08 -08:00
Unknown W. Brackets f32f89dd90 Global: Remove some unused variables. 2021-02-15 11:59:45 -08:00
LunaMoo 4b6855cd6e New Atlas 
Merge branch 'master' into TemporaryHackishBranch

# Conflicts:
#	UI/MainScreen.cpp
#	android/assets/ui_atlas.zim
#	android/assets/ui_atlas_luna.meta
#	assets/ui_atlas.zim
#	assets/ui_atlas_luna.meta
 2021-01-20 01:52:27 +01:00
iota97 0e122f13fa Fix adding extra new line on checkbox change 2021-01-06 10:26:44 +01:00
LunaMoo 431e19977c Merge branch 'master' into TemporaryHackishBranch 
# Conflicts:
#	Common/GPU/OpenGL/GLQueueRunner.cpp
#	Common/GPU/OpenGL/GLRenderManager.h
#	Common/GPU/OpenGL/thin3d_gl.cpp
#	Common/GPU/Vulkan/VulkanRenderManager.cpp
#	Common/GPU/Vulkan/thin3d_vulkan.cpp
#	Common/UI/Context.cpp
#	Core/Config.cpp
#	Core/Config.h
#	Core/HLE/proAdhoc.cpp
#	Core/HLE/proAdhocServer.cpp
#	Core/HLE/sceKernelThread.cpp
#	Core/HLE/sceNet.cpp
#	Core/HLE/sceNetAdhoc.cpp
#	Core/Util/PPGeDraw.cpp
#	GPU/Common/PresentationCommon.cpp
#	GPU/Common/TextureCacheCommon.cpp
#	GPU/GLES/TextureCacheGLES.cpp
#	GPU/Vulkan/TextureCacheVulkan.cpp
#	README.md
#	UI/EmuScreen.cpp
#	UI/GameSettingsScreen.cpp
#	UI/NativeApp.cpp
#	UI/ProfilerDraw.cpp
#	Windows/git-version-gen.cmd
#	ext/native/base/logging.h
 2020-10-07 03:55:13 +02:00
Henrik Rydgård 4f43cff5ca Move fileutil, net, image loaders, ui to Common. (#13506) 
* Move and rename file_util/fd_util to Common/File/FileUtil and DirListing

Let's also move net while we're at it.

Move the ZIM/PNG loaders over to Common.

Move the UI framework into Common

iOS buildfix

* Buildfix

* Buildfixes

* Apple buildfix

* This typo again..

* UWP buildfix

* Fix build of PPSSPPQt, such as it is (it's not in good condition...)

* Guess what? Another buildfix.
 2020-10-04 20:48:47 +02:00
Henrik Rydgård f01ba6dc84 Move NativeApp.h to Common/System, split into NativeApp.h and System.h 
Buildfix
 2020-10-04 11:42:16 +02:00
Henrik Rydgård ff8148dd92 Move native/util, native/data and native/i18 to Common/Data. 
Also move colorutil.cpp/h

linking build fix experiment

Delete a bunch of unused CMakeLists.txt files

CMakeLists.txt linking fix

Don't include NativeApp.h from any headers.

Android.mk buildfix

Half of the UWP fix

Buildfix

Minor project file cleanup

Buildfixes

Guess what? More buildfixes!
 2020-10-04 07:28:29 +02:00
Henrik Rydgård ed88761ecc Merge ext/native/stringutil.cpp/h into Common/StringUtils.cpp/h. 2020-09-29 15:51:51 +02:00
Unknown W. Brackets 53d9c10b22 irjit: Switch to XXH3. 2020-08-27 20:40:55 -07:00
Henrik Rydgård 5ec2da0f2d Move Section out of IniFile so it can be forward declared. Unlocked further improvements to build speed. 2020-08-10 15:53:52 +02:00
LunaMoo f3047a3928 Merge branch 'master' into TemporaryHackishBranch 
# Conflicts:
#	UI/CwCheatScreen.cpp
#	UI/CwCheatScreen.h
 2020-04-12 22:45:28 +02:00
Unknown W. Brackets 5ba7cca5f3 Cheats: Cleanup global usage. 2020-04-11 13:56:06 -07:00
Unknown W. Brackets dbc838565c UI: Cleanup old specialized checkbox. 2020-04-11 12:59:06 -07:00
Unknown W. Brackets 698dfa74b4 UI: Monitor cheat file changes on cheat editor. 
This way if they switch apps or whatever, it'll update when they come
back.  This also means constant disk access, but it should be cached
anyway.
 2020-04-11 12:57:35 -07:00
Unknown W. Brackets 29808ae53b UI: Update cheat file more safely. 
This uses the common parsing logic (which supports multiple games in a
single cheat file), and prevents reverting the file if edited outside.
 2020-04-11 12:43:55 -07:00
Unknown W. Brackets 4c061e9212 UI: Use standard back and checkbox in cheats UI. 
This makes cheat names wrap and grow smartly automatically, since
checkboxes normally do that.
 2020-04-11 11:22:11 -07:00
LunaMoo 6e202e5bdd Merge branch 'master' into TemporaryHackishBranch 
# Conflicts:
#	.gitignore
#	CMakeLists.txt
#	Core/HLE/sceNet.cpp
#	UI/GameSettingsScreen.cpp
#	UI/MainScreen.cpp
#	UI/MiscScreens.cpp
#	UI/ui_atlas.cpp
#	UI/ui_atlas.h
#	Windows/resource.h
#	android/.gitignore
#	android/assets/ui_atlas.zim
#	assets/ui_atlas.zim
#	assets/ui_atlas_lowmem.zim
#	atlasscript_lowmem.txt
#	ext/native/tools/atlastool/atlastool.vcxproj
#	ext/native/tools/tools.sln
#	ext/native/ui/ui_context.cpp
#	gradle/wrapper/gradle-wrapper.properties

also fix atlas generation.
 2020-04-05 19:34:24 +02:00
iota97 d89a858dcd Rember cheat scroll position 2020-03-26 10:59:08 +01:00
Henrik Rydgård 45d94c4877 Switch all images to dynamic lookup in the atlas by string ID. 
SLN fix

It works, but with the wrong images and the wrong characters!

Fix another bug in atlastool's binary output

Get Android building again.

Oops, didn't mean to disable this permanently.

Error checking

Minor cleanup

Gotta tweak my git ignores...

Regenerate metadata
 2020-03-01 12:06:47 +01:00
LunaMoo 18c822742d Merge branch 'master' into TemporaryHackishBranch 
# Conflicts:
#	UI/DevScreens.cpp
Also some changes to placement of the new option on dev menu.
 2020-02-23 17:03:42 +01:00
Unknown W. Brackets 5009698cc0 Core: Use a shared_ptr for i18n categories. 
This does not make them thread safe, but it reduces the chances of a crash
a bit (see #12594.)
 2020-02-09 07:35:16 -08:00
LunaMoo 9d37e80dbf Revert some formatting to make future updates easier 
also remove some oopsies / buildfix
 2019-05-12 02:00:56 +02:00
LunaMoo c46de369bb Merge branch 'master' into TemporaryHackishBranch 
# Conflicts:
#	Core/Compatibility.cpp
#	Core/Compatibility.h
#	Core/Config.cpp
#	Core/Config.h
#	Core/CoreTiming.cpp
#	Core/HLE/sceDisplay.cpp
#	GPU/Common/DrawEngineCommon.h
#	GPU/Common/SplineCommon.cpp
#	GPU/D3D11/DrawEngineD3D11.cpp
#	GPU/D3D11/ShaderManagerD3D11.cpp
#	GPU/Directx9/ShaderManagerDX9.cpp
#	GPU/Directx9/VertexShaderGeneratorDX9.cpp
#	GPU/GLES/DrawEngineGLES.cpp
#	GPU/GPUCommon.cpp
#	GPU/Vulkan/DrawEngineVulkan.cpp
#	UI/CwCheatScreen.cpp
#	UI/EmuScreen.cpp
#	UI/GameSettingsScreen.cpp
#	UI/MainScreen.cpp
#	Windows/GEDebugger/VertexPreview.cpp
#	Windows/MainWindowMenu.cpp
#	Windows/ppsspp.rc
#	Windows/resource.h
#	assets/compat.ini
#	ext/native/thin3d/VulkanRenderManager.cpp
#	libretro/libretro.cpp
 2019-02-14 02:50:01 +01:00
Henrik Rydgård cbf735e2e2 CwCheat warning fixes 2019-02-12 21:00:20 +01:00
LunaMoo 9929eedbc9 Fix database comments ending the cheat import. 2018-11-03 08:48:38 +01:00
LunaMoo 631bc78400 Fix database comments ending the cheat import. 2018-11-03 08:35:22 +01:00
LunaMoo c98ce8338a Merge branch 'master' into TemporaryHackishBranch 2017-12-01 12:10:04 +01:00
LunaMoo d5d82d4577 Oops:] 2017-12-01 11:22:12 +01:00
LunaMoo aa7b2430a0 Merge branch 'master' into TemporaryHackishBranch 
# Conflicts:
#	Core/Util/AudioFormat.cpp
# bad path was disabled so let's just sync
#	UI/CwCheatScreen.cpp
# just because I keep parse function to use multiply cheat.db files
 2017-11-30 23:17:57 +01:00
LunaMoo 689637ca5a Oops;p, I always mess this up. 2017-11-30 06:14:36 +01:00
LunaMoo 5805cba736 Change some other substr used with cheats and smuggle a fix for another problem 2017-11-30 05:05:52 +01:00
LunaMoo 36a8b5b8c8 Merge branch 'master' into TemporaryHackishBranch 2017-11-10 01:49:23 +01:00
Unknown W. Brackets c62a53c223 Cheats: Split parsing and execution. 
This makes the code easier to read, and makes it easier to add other types
later on.

Also, the parser can now handle a file with multiple game ids.
 2017-11-07 19:51:32 -08:00
LunaMoo b37cd1bcdc Hackish changes to a bunch of stuff. 2017-09-16 11:33:03 +02:00
LunaMoo ce74423381 Simplify some cwc detection code, respect _C2 as activation. 2017-05-31 11:58:24 +02:00