From Pop!_Planet User, 1 Month ago, written in Plain Text.
Embed
  1. cervox@pop-os:~/Building/rpcs3/rpcs3$ git pull
  2. remote: Enumerating objects: 106, done.
  3. remote: Counting objects: 100% (106/106), done.
  4. remote: Compressing objects: 100% (9/9), done.
  5. remote: Total 120 (delta 98), reused 101 (delta 97), pack-reused 14
  6. Receiving objects: 100% (120/120), 21.92 KiB | 831.00 KiB/s, done.
  7. Resolving deltas: 100% (98/98), completed with 31 local objects.
  8. From https://github.com/elad335/rpcs3
  9.  + 74d0fda81...200ad3900 rawspu-fixup   -> origin/rawspu-fixup  (forced update)
  10.  * [new branch]          more-segfault-the-betterr -> origin/more-segfault-the-betterr
  11.  + 14f7a7b95...4cc894669 savedata-wip   -> origin/savedata-wip  (forced update)
  12.  + 70e020a20...db8b16ada savedata-wip-2 -> origin/savedata-wip-2  (forced update)
  13. Merge made by the 'recursive' strategy.
  14.  rpcs3/Emu/CPU/CPUTranslator.cpp         |  2 +-
  15.  rpcs3/Emu/Cell/Modules/cellSail.cpp     |  2 +-
  16.  rpcs3/Emu/Cell/Modules/cellSaveData.cpp | 28 ++++++++++++++++++++++++++++
  17.  rpcs3/Emu/Cell/PPUModule.cpp            |  9 ++++++++-
  18.  rpcs3/Emu/Cell/lv2/sys_ss.cpp           | 31 ++++++-------------------------
  19.  rpcs3/Emu/Cell/lv2/sys_timer.cpp        | 24 ++++++++----------------
  20.  rpcs3/Emu/RSX/GL/GLVertexProgram.cpp    |  2 +-
  21.  rpcs3/Emu/RSX/RSXThread.cpp             | 19 +++++++++++++++++--
  22.  rpcs3/Emu/RSX/RSXThread.h               |  2 +-
  23.  rpcs3/Emu/RSX/VK/VKRenderTargets.h      |  8 ++++++++
  24.  rpcs3/Emu/RSX/VK/VKVertexProgram.cpp    |  2 +-
  25.  11 files changed, 80 insertions(+), 49 deletions(-)
  26. cervox@pop-os:~/Building/rpcs3/rpcs3$ git fetch origin
  27. cervox@pop-os:~/Building/rpcs3/rpcs3$ git reset --hard origin/master
  28. warning: unable to rmdir '3rdparty/FAudio': Directory not empty
  29. warning: unable to rmdir '3rdparty/span': Directory not empty
  30. HEAD is now at 1f9a62c80 update
  31. cervox@pop-os:~/Building/rpcs3/rpcs3$ git log
  32. commit 1f9a62c806390659e98a88a4599342e652b9e357 (HEAD -> rawspu-fixup, origin/master)
  33. Author: Eladash <elad3356p@gmail.com>
  34. Date:   Tue Oct 29 22:05:52 2019 +0200
  35.  
  36.     update
  37.  
  38. commit d2d5a61352af79a254a7431ae087a0c722f3cd49
  39. Author: Eladash <elad3356p@gmail.com>
  40. Date:   Tue Jul 16 21:39:43 2019 +0300
  41.  
  42.     wip
  43.  
  44. commit 397e5dd1ea1a63a4169f5c960840b0b7a85e9b45
  45. Author: Alex James <theracermaster@gmail.com>
  46. Date:   Mon Jul 15 19:26:22 2019 -0500
  47.  
  48.     Qt/game_list_frame: Ignore file entries when adding disc/game directories
  49.    
  50.     Fixes #6212.
  51.  
  52. commit 736ec4035edf32b1a9fad02d83acc3ba2bb7f958
  53. Author: Nekotekina <nekotekina@gmail.com>
  54. Date:   Mon Jul 15 19:51:58 2019 +0300
  55.  
  56.     Fixup for SPU Recompilers, regression after #6210
  57.  
  58. commit c062000288b1ab074af65c66cbff05c498205a94
  59. Author: Nekotekina <nekotekina@gmail.com>
  60. Date:   Mon Jul 15 17:20:12 2019 +0300
  61.  
  62.     Add experimental TSC frequency detection
  63.  
  64. commit cb5c26f2b51c65aad067f1030190d5c629908987
  65. Author: Nekotekina <nekotekina@gmail.com>
  66. Date:   Mon Jul 15 16:16:30 2019 +0300
  67.  
  68.     Fix SPU Interpreter regression after #6147
  69.  
  70. commit 1e2f81dd33ed465e3ac8ce576120e5144d592226
  71. Author: Eladash <elad3356p@gmail.com>
  72. Date:   Sat Jul 13 12:31:33 2019 +0300
  73.  
  74.     kernel explorer typo fix
  75.  
  76. commit c01f1a8968da98912f8b3f2e17ee39c5142ecdb7
  77. Author: Nekotekina <nekotekina@gmail.com>
  78. Date:   Mon Jul 15 15:46:46 2019 +0300
  79.  
  80.     Avoid transitive include of vm_ref.h
  81. cervox@pop-os:~/Building/rpcs3/rpcs3$
  82.