Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: dimok789/loadiine_gx2
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: Loadiine-nightly-b13b1ca
Choose a base ref
...
head repository: dimok789/loadiine_gx2
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 6 commits
  • 116 files changed
  • 2 contributors

Commits on Aug 28, 2016

  1. Updated and fixed languages

    @Maschell
    Maschell committed Aug 28, 2016

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b80ba75 View commit details

Commits on Nov 16, 2016

  1. adaption to work with HBL channel

    @dimok789
    dimok789 committed Nov 16, 2016

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    42863b5 View commit details

Commits on Sep 8, 2017

  1. Updated the script for creating the languages files

    @Maschell
    Maschell committed Sep 8, 2017
    Copy the full SHA
    33ea151 View commit details

Commits on Oct 15, 2017

  1. - Make it compatible with devkitpro r29 

    - Improved logging
- Using broadcast logging
- updated the travis script to load devkitpro r29
- Updated the dynamic libs
- Updated the controller patcher
- Fixed the crash when to many .ini files were in the sd:/wiiu/controller folder
- Fixed a bug in the memory.c
- Fixed a possible bug when leaving the Application while a threads in running and still needs to delete data
- Added settings to enable/disable the Rumble/Network for HID Controllers
- Improved the Touchscreen handling
- Improved the font rendering
    @Maschell
    Maschell committed Oct 15, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f4125ab View commit details

  2. Changed Makefile of the installer to work with devkitpro r29

    @Maschell
    Maschell committed Oct 15, 2017
    Copy the full SHA
    d46e455 View commit details

  3. Fixing path for downloading the .ini

    @Maschell
    Maschell committed Oct 15, 2017
    Copy the full SHA
    2ae7fe4 View commit details
Showing with 3,048 additions and 1,499 deletions.
  1. +4 −4 .travis.yml
  2. +7 −2 Makefile
  3. +1 −1 installer/Makefile
  4. +79 −14 languages/chinese.lang
  5. +79 −14 languages/chinese_tr.lang
  6. +60 −17 languages/english.lang
  7. +95 −26 languages/french.lang
  8. +92 −22 languages/german.lang
  9. +92 −22 languages/hungarian.lang
  10. +77 −15 languages/italian.lang
  11. +82 −18 languages/japanese.lang
  12. +92 −22 languages/pt_BR.lang
  13. +80 −15 languages/pt_PT.lang
  14. +83 −17 languages/spanish.lang
  15. +250 −0 other/devkitPPCupdatePPCr29.pl
  16. +147 −0 other/devkitProUpdatePPCr29.ini
  17. BIN other/libogc.7z
  18. BIN other/portlibs.7z
  19. +23 −16 src/Application.cpp
  20. +13 −6 src/common/common.h
  21. +2 −0 src/common/retain_vars.c
  22. +2 −0 src/common/retain_vars.h
  23. +1 −1 src/controller_patcher
  24. +1 −1 src/dynamic_libs
  25. +17 −8 src/{entry.c → entry.cpp}
  26. +60 −18 src/fs/sd_fat_devoptab.c
  27. +2 −2 src/fs/sd_fat_devoptab.h
  28. +70 −70 src/game/GameLauncher.cpp
  29. +14 −14 src/gui/FreeTypeGX.cpp
  30. +2 −2 src/gui/FreeTypeGX.h
  31. +1 −1 src/gui/GameIcon.cpp
  32. +1 −1 src/gui/GameIcon.h
  33. +1 −1 src/gui/GameIconModel.h
  34. +2 −2 src/gui/GridBackground.cpp
  35. +2 −0 src/gui/Gui.h
  36. +31 −20 src/gui/GuiButton.cpp
  37. +7 −7 src/gui/GuiButton.h
  38. +33 −0 src/gui/GuiConfigurationScreen.h
  39. +9 −9 src/gui/GuiController.h
  40. +86 −0 src/gui/GuiDragListener.cpp
  41. +53 −0 src/gui/GuiDragListener.h
  42. +12 −11 src/gui/GuiElement.cpp
  43. +345 −335 src/gui/GuiElement.h
  44. +120 −104 src/gui/GuiFrame.cpp
  45. +69 −67 src/gui/GuiFrame.h
  46. +16 −16 src/gui/GuiImage.cpp
  47. +12 −12 src/gui/GuiImage.h
  48. +4 −3 src/gui/GuiImageAsync.cpp
  49. +2 −2 src/gui/GuiImageData.cpp
  50. +4 −4 src/gui/GuiImageData.h
  51. +5 −5 src/gui/GuiParticleImage.cpp
  52. +1 −1 src/gui/GuiParticleImage.h
  53. +17 −13 src/gui/GuiSelectBox.cpp
  54. +5 −3 src/gui/GuiSelectBox.h
  55. +9 −8 src/gui/GuiSound.cpp
  56. +1 −1 src/gui/GuiSound.h
  57. +8 −6 src/gui/GuiSwitch.cpp
  58. +10 −10 src/gui/GuiSwitch.h
  59. +55 −40 src/gui/GuiText.cpp
  60. +27 −25 src/gui/GuiText.h
  61. +2 −5 src/gui/GuiToggle.cpp
  62. +5 −5 src/gui/GuiTrigger.cpp
  63. +6 −1 src/gui/GuiTrigger.h
  64. +16 −14 src/gui/Scrollbar.cpp
  65. +17 −17 src/gui/Scrollbar.h
  66. +11 −8 src/gui/VPadController.h
  67. +2 −2 src/gui/WPadController.h
  68. +1 −0 src/kernel/kernel_functions.c
  69. +26 −40 src/main.cpp
  70. +14 −14 src/menu/GameLauncherMenu.cpp
  71. +2 −0 src/menu/MainWindow.cpp
  72. +1 −1 src/menu/SettingsCategoryMenu.cpp
  73. +1 −1 src/menu/SettingsCategoryMenu.h
  74. +3 −1 src/menu/SettingsMenu.cpp
  75. +4 −4 src/network/FileDownloader.cpp
  76. +8 −8 src/network/GameImageDownloader.cpp
  77. +1 −2 src/patcher/aoc_patcher.cpp
  78. +1 −1 src/patcher/aoc_patcher.h
  79. +1 −1 src/patcher/extra_log_patcher.cpp
  80. +1 −1 src/patcher/extra_log_patcher.h
  81. +2 −4 src/patcher/fs_patcher.cpp
  82. +1 −1 src/patcher/fs_patcher.h
  83. +1 −1 src/patcher/fs_sd_patcher.cpp
  84. +1 −1 src/patcher/fs_sd_patcher.h
  85. +38 −14 src/patcher/hid_controller_function_patcher.cpp
  86. +1 −1 src/patcher/hid_controller_function_patcher.h
  87. +1 −1 src/patcher/pygecko.c
  88. +3 −3 src/patcher/rplrpx_patcher.cpp
  89. +7 −7 src/patcher/rplrpx_patcher.h
  90. +8 −0 src/settings/CSettings.cpp
  91. +2 −0 src/settings/CSettings.h
  92. +10 −10 src/sounds/BufferCircle.cpp
  93. +11 −11 src/sounds/BufferCircle.hpp
  94. +7 −7 src/sounds/Mp3Decoder.cpp
  95. +3 −3 src/sounds/Mp3Decoder.hpp
  96. +7 −7 src/sounds/OggDecoder.cpp
  97. +3 −3 src/sounds/OggDecoder.hpp
  98. +12 −12 src/sounds/SoundDecoder.cpp
  99. +7 −7 src/sounds/SoundDecoder.hpp
  100. +9 −9 src/sounds/SoundHandler.cpp
  101. +6 −6 src/sounds/SoundHandler.hpp
  102. +1 −1 src/sounds/Voice.h
  103. +6 −6 src/sounds/WavDecoder.cpp
  104. +2 −2 src/sounds/WavDecoder.hpp
  105. +2 −3 src/system/AsyncDeleter.cpp
  106. +20 −3 src/system/AsyncDeleter.h
  107. +12 −11 src/system/CThread.h
  108. +4 −30 src/system/exception_handler.c
  109. +43 −24 src/system/memory.c
  110. +3 −3 src/system/memory.h
  111. +5 −5 src/utils/FileReplacer.cpp
  112. +127 −77 src/utils/function_patcher.cpp
  113. +37 −12 src/utils/function_patcher.h
  114. +14 −25 src/utils/logger.c
  115. +20 −9 src/utils/logger.h
  116. +14 −0 updatelang.sh
8 changes: 4 additions & 4 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -31,13 +31,13 @@ before_install:
- export DEVKITPPC=${DEVKITPRO}/devkitPPC
- mkdir -p $DEVKITPRO
- cd $DEVKITPRO
- wget -N http://sourceforge.net/projects/devkitpro/files/Automated%20Installer/devkitPPCupdate.pl
- wget -N https://github.com/dimok789/loadiine_gx2/releases/download/v0.2/libogc.7z
- wget -N https://github.com/dimok789/loadiine_gx2/releases/download/v0.2/portlibs.7z
- wget -N https://raw.githubusercontent.com/dimok789/loadiine_gx2/master/other/devkitPPCupdatePPCr29.pl
- wget -N https://raw.githubusercontent.com/dimok789/loadiine_gx2/master/other/libogc.7z
- wget -N https://raw.githubusercontent.com/dimok789/loadiine_gx2/master/other/portlibs.7z

install:
- cd $DEVKITPRO
- perl devkitPPCupdate.pl
- perl devkitPPCupdatePPCr29.pl
- 7z x -y libogc.7z
- 7z x -y portlibs.7z
- cp -R portlibs/ppc/* devkitPPC/
9 changes: 7 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -50,7 +50,11 @@ SOURCES := src \
src/utils \
src/video \
src/video/shaders \
src/controller_patcher
src/controller_patcher \
src/controller_patcher/config \
src/controller_patcher/network \
src/controller_patcher/patcher \
src/controller_patcher/utils
DATA := data \
data/images \
data/fonts \
@@ -64,7 +68,7 @@ INCLUDES := src
CFLAGS := -std=gnu11 -mrvl -mcpu=750 -meabi -mhard-float -ffast-math \
-O3 -Wall -Wextra -Wno-unused-parameter -Wno-strict-aliasing $(INCLUDE)
CXXFLAGS := -std=gnu++11 -mrvl -mcpu=750 -meabi -mhard-float -ffast-math \
-O3 -Wall -Wextra -Wno-unused-parameter -Wno-strict-aliasing $(INCLUDE)
-O3 -Wall -Wextra -Wno-unused-parameter -D_GNU_SOURCE -Wno-strict-aliasing $(INCLUDE)
ASFLAGS := -mregnames
LDFLAGS := -nostartfiles -Wl,-Map,$(notdir $@).map,-wrap,malloc,-wrap,free,-wrap,memalign,-wrap,calloc,-wrap,realloc,-wrap,malloc_usable_size,-wrap,_malloc_r,-wrap,_free_r,-wrap,_realloc_r,-wrap,_calloc_r,-wrap,_memalign_r,-wrap,_malloc_usable_size_r,-wrap,valloc,-wrap,_valloc_r,-wrap,_pvalloc_r,--gc-sections

@@ -102,6 +106,7 @@ export DEPSDIR := $(CURDIR)/$(BUILD)
#---------------------------------------------------------------------------------
FILELIST := $(shell bash ./filelist.sh)
GIT_REV := $(shell bash ./gitrev.sh)
LANGUAGES := $(shell bash ./updatelang.sh)
export CFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
export CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
export HFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.h)))
2 changes: 1 addition & 1 deletion installer/Makefile
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ AS = $(PREFIX)gcc
CFLAGS = -std=gnu99 -Os -nostdinc -fno-builtin
ASFLAGS = -mregnames -x assembler-with-cpp
LD = $(PREFIX)ld
LDFLAGS=-Ttext 1800000 --oformat binary -L$(DEVKITPPC)/lib/gcc/powerpc-eabi/4.8.2 -lgcc
LDFLAGS=-Ttext 1800000 --oformat binary -L$(DEVKITPPC)/lib/gcc/powerpc-eabi/6.3.0 -lgcc
OBJDUMP ?= $(PREFIX)objdump
project := .
root := $(CURDIR)
93 changes: 79 additions & 14 deletions languages/chinese.lang
View file
Original file line number Diff line number Diff line change
@@ -5,191 +5,256 @@ msgid ""
msgstr ""
"Project-Id-Version: Loadiine GX2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-05-08 08:20+0200\n"
"POT-Creation-Date: 2016-08-28 11:40+0200\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: kavid by 91wii.com \n"
"Language-Team: 91wii.com\n"
"Language: Simplified Chinese\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"

#: src/menu/CreditsMenu.cpp:69
msgid "Loadiine GX2"
msgstr "Loadiine GX2"

#: src/menu/CreditsMenu.cpp:76
msgid "Official Site:"
msgstr "官方网站"

#: src/menu/CreditsMenu.cpp:89
msgid "Coding:"
msgstr "代码编写："

#: src/menu/CreditsMenu.cpp:102
msgid "Design:"
msgstr "界面设计："

#: src/menu/CreditsMenu.cpp:108
msgid "Some guy who doesn't want to be named."
msgstr "有些人不想被提到名字。"

#: src/menu/CreditsMenu.cpp:115
msgid "Testing:"
msgstr "测试者："

#: src/menu/CreditsMenu.cpp:121
msgid "Cyan / Maschell / n1ghty / OnionKnight and many more"
msgstr "Cyan / Maschell / n1ghty / OnionKnight 等等更多人"

#: src/menu/CreditsMenu.cpp:128
msgid "Social Presence:"
msgstr "参与人员："

#: src/menu/CreditsMenu.cpp:141
msgid "Based on:"
msgstr "基于："

#: src/menu/CreditsMenu.cpp:147
msgid "Loadiine v4.0 by Golden45 and Dimok"
msgstr "Loadiine v4.0作者Golden45和Dimok"

#: src/menu/CreditsMenu.cpp:154
msgid "Big thanks to:"
msgstr "强烈感谢："

#: src/menu/CreditsMenu.cpp:160
msgid "lustar for GameTDB and hosting covers / disc images"
msgstr "lustar的GameTDB与提供的封面和光盘封面"

#: src/menu/CreditsMenu.cpp:167
msgid "Marionumber1 for his kernel exploit"
msgstr "Marionumber1开发的内核破解程序"

#: src/menu/CreditsMenu.cpp:174
msgid "The whole libwiiu team and it's contributors."
msgstr "还有libwiiu小组和其他人所做出贡献"

#: src/menu/GameLauncherMenu.cpp:52
msgid "Extra Save:"
msgstr "扩展存档："

#: src/menu/GameLauncherMenu.cpp:53
msgid "Enable DLC Support:"
msgstr "启用DLC支持："

#: src/menu/GameLauncherMenu.cpp:76
msgid "Update Folder"
msgstr "更新文件夹"

#: src/menu/GameLauncherMenu.cpp:77
msgid "Save Mode"
msgstr "存档模式"

#: src/menu/GameLauncherMenu.cpp:78 src/menu/SettingsMenu.cpp:75
msgid "Launch Mode"
msgstr "运行模式"

#: src/menu/GameLauncherMenu.cpp:89 src/menu/GameLauncherMenu.cpp:94
#, fuzzy
msgid "<Settings Default>"
msgstr "<默认设置>"

#: src/menu/GameLauncherMenu.cpp:492
msgid "Saving game settings!"
msgstr "保存游戏设置！"

#: src/menu/SettingsMenu.cpp:32
msgid "Off"
msgstr "关闭"

#: src/menu/SettingsMenu.cpp:33
msgid "On"
msgstr "开启"

#: src/menu/SettingsMenu.cpp:38
msgid "Icon Carousel"
msgstr "旋转图标模式"

#: src/menu/SettingsMenu.cpp:39
msgid "Grid View"
msgstr "网格视图"

#: src/menu/SettingsMenu.cpp:40
msgid "Cover Carousel"
msgstr "旋转封面模式"

#: src/menu/SettingsMenu.cpp:52
msgid "Background customizations"
msgstr "自定义背景"

#: src/menu/SettingsMenu.cpp:52
msgid "GUI"
msgstr "图形化"

#: src/menu/SettingsMenu.cpp:52
msgid "Game View Selection"
msgstr "游戏查看选择"

#: src/menu/SettingsMenu.cpp:53
msgid "Adjust log server IP and port"
msgstr "更改日志服务器的ip和端口"

#: src/menu/SettingsMenu.cpp:53
msgid "Customize games path"
msgstr "自定义游戏路径"

#: src/menu/SettingsMenu.cpp:53
msgid "Customize save path"
msgstr "自定义保存路径"

#: src/menu/SettingsMenu.cpp:53
msgid "Loader"
msgstr "加载器"

#: src/menu/SettingsMenu.cpp:53
msgid "Set save mode"
msgstr "设置存档模式"

#: src/menu/SettingsMenu.cpp:54
msgid "Game"
msgstr "游戏"

#: src/menu/SettingsMenu.cpp:54
#, fuzzy
msgid "HID settings"
msgstr "HID设置"

#: src/menu/SettingsMenu.cpp:54
msgid "Launch method selection"
msgstr "运行模式选择"

#: src/menu/SettingsMenu.cpp:54
msgid "Log server control"
msgstr "日志服务器控制"

#: src/menu/SettingsMenu.cpp:54
msgid "Padcon settings"
msgstr "屏幕控制设置"

#: src/menu/SettingsMenu.cpp:54
msgid "PyGecko settings"
msgstr "金手指设置"

#: src/menu/SettingsMenu.cpp:55
msgid "Credits"
msgstr "感谢"

#: src/menu/SettingsMenu.cpp:55
msgid "Credits to all contributors"
msgstr "感谢所有为此项目的贡献者"

#: src/menu/SettingsMenu.cpp:60
msgid "Game View TV"
msgstr "电视显示样式"

#: src/menu/SettingsMenu.cpp:61
msgid "Game View DRC"
msgstr "平板显示样式"

#: src/menu/SettingsMenu.cpp:66
msgid "Show Game Settings"
msgstr "显示游戏设置"

#: src/menu/SettingsMenu.cpp:67
msgid "Host IP"
msgstr "主机IP"

#: src/menu/SettingsMenu.cpp:68
msgid "Game Path"
msgstr "游戏路径"

#: src/menu/SettingsMenu.cpp:69
msgid "Game Save Path"
msgstr "游戏存档路径"

#: src/menu/SettingsMenu.cpp:70
msgid "Game Save Mode"
msgstr "游戏存档模式"

#: src/menu/SettingsMenu.cpp:76
msgid "Log Server Control"
msgstr "日志服务器控制"

#: src/menu/SettingsMenu.cpp:77
msgid "PyGecko"
msgstr "金手指"

#: src/menu/SettingsMenu.cpp:78
msgid "Padcon"
msgstr "平板屏幕控制"

#: src/menu/SettingsMenu.cpp:79
msgid "HID-Pad"
msgstr "HID转PAD控制"

msgid "Shared Mode"
msgstr "共享模式"
#: src/menu/SettingsMenu.cpp:80
#, fuzzy
msgid "HID-Pad Rumble"
msgstr "HID转PAD控制"

#: src/menu/SettingsMenu.cpp:81
#, fuzzy
msgid "HID-Pad Network"
msgstr "HID转PAD控制"

#~ msgid "Art Atelier Mode"
#~ msgstr "绘心教室模式"

msgid "Unique Mode"
msgstr "独享模式"
#~ msgid "Shared Mode"
#~ msgstr "共享模式"

msgid "Mii Maker Mode"
msgstr "Mii Maker模式"
#~ msgid "Unique Mode"
#~ msgstr "独享模式"

msgid "Smash Bros Mode"
msgstr "超级大乱斗模式"
#~ msgid "Mii Maker Mode"
#~ msgstr "Mii Maker模式"

msgid "Karaoke Mode"
msgstr "卡拉OK模式"
#~ msgid "Smash Bros Mode"
#~ msgstr "超级大乱斗模式"

msgid "Art Atelier Mode"
msgstr "绘心教室模式"
#~ msgid "Karaoke Mode"
#~ msgstr "卡拉OK模式"

#~ msgid "Log Server IP"
#~ msgstr "日志服务器IP"
Loading