← Back to branch summary

~sithlord48/makoureactor/trunk

~sithlord48/makoureactor/trunk

Viewing all changes in revision 338.

Committer: myst6re
Date: 2016-03-05 19:24:32 UTC
mfrom: (335.1.124)
Revision ID: git-v1:92e407189293b5539293cd87edfd01b1e4a612d4

Merge branch 'develop'

Conflicts:
.travis.yml

files added:
Makou_Reactor_fr.ts

README.md

compat

compat/QtWidgets

deploy.bat

widgets/FieldList.cpp

widgets/FieldList.h

widgets/ScriptManager.cpp

widgets/ScriptManager.h

widgets/Splitter.cpp

widgets/Splitter.h

files removed:
txt - Copie.cpp

files modified:
.travis.yml

Data.cpp

Data.h

FieldModelThread.cpp

FieldModelThread.h

Makou_Reactor.desktop

Makou_Reactor.pro

Makou_Reactor_en.ts

Makou_Reactor_ja.ts

Parameters.h

Window.cpp

Window.h

core/Archive.cpp

core/Archive.h

core/Config.cpp

core/Config.h

core/FF7Font.cpp

core/FF7Font.h

core/FF7Text.cpp

core/FF7Text.h

core/GZIP.cpp

core/GZIP.h

core/GZIPPS.cpp

core/GZIPPS.h

core/IsoArchive.cpp

core/IsoArchive.h

core/IsoArchiveFF7.cpp

core/IsoArchiveFF7.h

core/LZS.cpp

core/LZS.h

core/Lgp.cpp

core/Lgp.h

core/Lgp_p.cpp

core/Lgp_p.h

core/PsColor.cpp

core/PsColor.h

core/QLockedFile.cpp

core/QLockedFile.h

core/TexFile.cpp

core/TexFile.h

core/TextureFile.cpp

core/TextureFile.h

core/TimFile.cpp

core/TimFile.h

core/Var.cpp

core/Var.h

core/WindowBinFile.cpp

core/WindowBinFile.h

core/field/AFile.cpp

core/field/AFile.h

core/field/BackgroundFile.cpp

core/field/BackgroundFile.h

core/field/BackgroundFilePC.cpp

core/field/BackgroundFilePC.h

core/field/BackgroundFilePS.cpp

core/field/BackgroundFilePS.h

core/field/BackgroundIO.cpp

core/field/BackgroundIO.h

core/field/BackgroundTextures.cpp

core/field/BackgroundTextures.h

core/field/BackgroundTexturesIO.cpp

core/field/BackgroundTexturesIO.h

core/field/BackgroundTiles.cpp

core/field/BackgroundTiles.h

core/field/BackgroundTilesIO.cpp

core/field/BackgroundTilesIO.h

core/field/BcxFile.h

core/field/BsxFile.cpp

core/field/BsxFile.h

core/field/CaFile.cpp

core/field/CaFile.h

core/field/EncounterFile.cpp

core/field/EncounterFile.h

core/field/Field.cpp

core/field/Field.h

core/field/FieldArchive.cpp

core/field/FieldArchive.h

core/field/FieldArchiveIO.cpp

core/field/FieldArchiveIO.h

core/field/FieldArchiveIOPC.cpp

core/field/FieldArchiveIOPC.h

core/field/FieldArchiveIOPS.cpp

core/field/FieldArchiveIOPS.h

core/field/FieldArchivePC.cpp

core/field/FieldArchivePC.h

core/field/FieldArchivePS.cpp

core/field/FieldArchivePS.h

core/field/FieldIO.cpp

core/field/FieldIO.h

core/field/FieldModelAnimation.cpp

core/field/FieldModelAnimation.h

core/field/FieldModelFile.cpp

core/field/FieldModelFile.h

core/field/FieldModelFilePC.cpp

core/field/FieldModelFilePC.h

core/field/FieldModelFilePS.cpp

core/field/FieldModelFilePS.h

core/field/FieldModelLoader.cpp

core/field/FieldModelLoader.h

core/field/FieldModelLoaderPC.cpp

core/field/FieldModelLoaderPC.h

core/field/FieldModelLoaderPS.cpp

core/field/FieldModelLoaderPS.h

core/field/FieldModelPart.cpp

core/field/FieldModelPart.h

core/field/FieldModelSkeleton.cpp

core/field/FieldModelSkeleton.h

core/field/FieldModelTextureRef.cpp

core/field/FieldModelTextureRef.h

core/field/FieldModelTextureRefPC.cpp

core/field/FieldModelTextureRefPC.h

core/field/FieldModelTextureRefPS.cpp

core/field/FieldModelTextureRefPS.h

core/field/FieldPC.cpp

core/field/FieldPC.h

core/field/FieldPS.cpp

core/field/FieldPS.h

core/field/FieldPSDemo.h

core/field/FieldPart.cpp

core/field/FieldPart.h

core/field/GrpScript.cpp

core/field/GrpScript.h

core/field/HrcFile.cpp

core/field/HrcFile.h

core/field/IdFile.cpp

core/field/IdFile.h

core/field/InfFile.cpp

core/field/InfFile.h

core/field/Opcode.cpp

core/field/Opcode.h

core/field/PFile.cpp

core/field/PFile.h

core/field/Palette.cpp

core/field/Palette.h

core/field/PaletteIO.cpp

core/field/PaletteIO.h

core/field/RsdFile.cpp

core/field/RsdFile.h

core/field/Script.cpp

core/field/Script.h

core/field/Section1File.cpp

core/field/Section1File.h

core/field/TdbFile.cpp

core/field/TdbFile.h

core/field/TutFile.cpp

core/field/TutFile.h

core/field/TutFilePC.cpp

core/field/TutFilePC.h

core/field/TutFileStandard.cpp

core/field/TutFileStandard.h

core/world/TblFile.cpp

core/world/TblFile.h

debian/changelog

debian/install

main.cpp

txt.cpp

widgets/AnimEditorDialog.cpp

widgets/AnimEditorDialog.h

widgets/ApercuBG.cpp

widgets/ApercuBG.h

widgets/ApercuBGLabel.cpp

widgets/ApercuBGLabel.h

widgets/BGDialog.cpp

widgets/BGDialog.h

widgets/ColorDisplay.cpp

widgets/ColorDisplay.h

widgets/ConfigWindow.cpp

widgets/ConfigWindow.h

widgets/EncounterTableWidget.cpp

widgets/EncounterTableWidget.h

widgets/EncounterWidget.cpp

widgets/EncounterWidget.h

widgets/FieldModel.cpp

widgets/FieldModel.h

widgets/FontDisplay.cpp

widgets/FontDisplay.h

widgets/FontGrid.cpp

widgets/FontGrid.h

widgets/FontLetter.cpp

widgets/FontLetter.h

widgets/FontManager.cpp

widgets/FontManager.h

widgets/FontPalette.cpp

widgets/FontPalette.h

widgets/FontWidget.cpp

widgets/FontWidget.h

widgets/FormatSelectionWidget.cpp

widgets/FormatSelectionWidget.h

widgets/GrpScriptList.cpp

widgets/GrpScriptList.h

widgets/HexLineEdit.cpp

widgets/HexLineEdit.h

widgets/ImportDialog.cpp

widgets/ImportDialog.h

widgets/KeyEditorDialog.cpp

widgets/KeyEditorDialog.h

widgets/LgpDialog.cpp

widgets/LgpDialog.h

widgets/Listwidget.cpp

widgets/Listwidget.h

widgets/MassExportDialog.cpp

widgets/MassExportDialog.h

widgets/MassImportDialog.cpp

widgets/MassImportDialog.h

widgets/MiscWidget.cpp

widgets/MiscWidget.h

widgets/ModelManager.cpp

widgets/ModelManager.h

widgets/ModelManagerPC.cpp

widgets/ModelManagerPC.h

widgets/ModelManagerPS.cpp

widgets/ModelManagerPS.h

widgets/OpcodeList.cpp

widgets/OpcodeList.h

widgets/OperationsManager.cpp

widgets/OperationsManager.h

widgets/OrientationWidget.cpp

widgets/OrientationWidget.h

widgets/QTaskBarButton.cpp

widgets/QTaskBarButton.h

widgets/ScriptEditor.cpp

widgets/ScriptEditor.h

widgets/ScriptEditorWidgets/Delegate.cpp

widgets/ScriptEditorWidgets/Delegate.h

widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp

widgets/ScriptEditorWidgets/ScriptEditorGenericList.h

widgets/ScriptEditorWidgets/ScriptEditorMathPage.cpp

widgets/ScriptEditorWidgets/ScriptEditorMathPage.h

widgets/ScriptEditorWidgets/ScriptEditorMoviePage.cpp

widgets/ScriptEditorWidgets/ScriptEditorMoviePage.h

widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp

widgets/ScriptEditorWidgets/ScriptEditorStructPage.h

widgets/ScriptEditorWidgets/ScriptEditorView.cpp

widgets/ScriptEditorWidgets/ScriptEditorView.h

widgets/ScriptEditorWidgets/ScriptEditorWindowPage.cpp

widgets/ScriptEditorWidgets/ScriptEditorWindowPage.h

widgets/ScriptList.cpp

widgets/ScriptList.h

widgets/Search.cpp

widgets/Search.h

widgets/SearchAll.cpp

widgets/SearchAll.h

widgets/TextHighlighter.cpp

widgets/TextHighlighter.h

widgets/TextManager.cpp

widgets/TextManager.h

widgets/TextPreview.cpp

widgets/TextPreview.h

widgets/TutWidget.cpp

widgets/TutWidget.h

widgets/VarManager.cpp

widgets/VarManager.h

widgets/VarOrValueWidget.cpp

widgets/VarOrValueWidget.h

widgets/VertexWidget.cpp

widgets/VertexWidget.h

widgets/WalkmeshManager.cpp

widgets/WalkmeshManager.h

widgets/WalkmeshWidget.cpp

widgets/WalkmeshWidget.h

Show diffs side-by-side

added added

removed removed

FieldModelThread.cpp

FieldModelThread.h

Makou_Reactor.desktop

Makou_Reactor.pro

Makou_Reactor_en.ts

Makou_Reactor_fr.ts

Makou_Reactor_ja.ts

compat/QtWidgets

core/Archive.cpp

core/Config.cpp

core/FF7Font.cpp

core/FF7Text.cpp

core/GZIPPS.cpp

core/IsoArchive.cpp

core/IsoArchive.h

core/IsoArchiveFF7.cpp

core/IsoArchiveFF7.h

core/PsColor.cpp

core/QLockedFile.cpp

core/QLockedFile.h

core/TexFile.cpp

core/TextureFile.cpp

core/TextureFile.h

core/TimFile.cpp

core/WindowBinFile.cpp

core/WindowBinFile.h

core/field/AFile.cpp

core/field/AFile.h

core/field/BackgroundFile.cpp

core/field/BackgroundFile.h

core/field/BackgroundFilePC.cpp

core/field/BackgroundFilePC.h

core/field/BackgroundFilePS.cpp

core/field/BackgroundFilePS.h

core/field/BackgroundIO.cpp

core/field/BackgroundIO.h

core/field/BackgroundTextures.cpp

core/field/BackgroundTextures.h

core/field/BackgroundTexturesIO.cpp

core/field/BackgroundTexturesIO.h

core/field/BackgroundTiles.cpp

core/field/BackgroundTiles.h

core/field/BackgroundTilesIO.cpp

core/field/BackgroundTilesIO.h

core/field/BcxFile.h

core/field/BsxFile.cpp

core/field/BsxFile.h

core/field/CaFile.cpp

core/field/CaFile.h

core/field/EncounterFile.cpp

core/field/EncounterFile.h

core/field/Field.cpp

core/field/Field.h

core/field/FieldArchive.cpp

core/field/FieldArchive.h

core/field/FieldArchiveIO.cpp

core/field/FieldArchiveIO.h

core/field/FieldArchiveIOPC.cpp

core/field/FieldArchiveIOPC.h

core/field/FieldArchiveIOPS.cpp

core/field/FieldArchiveIOPS.h

core/field/FieldArchivePC.cpp

core/field/FieldArchivePC.h

core/field/FieldArchivePS.cpp

core/field/FieldArchivePS.h

core/field/FieldIO.cpp

core/field/FieldIO.h

core/field/FieldModelAnimation.cpp

core/field/FieldModelAnimation.h

core/field/FieldModelFile.cpp

core/field/FieldModelFile.h

core/field/FieldModelFilePC.cpp

core/field/FieldModelFilePC.h

core/field/FieldModelFilePS.cpp

core/field/FieldModelFilePS.h

core/field/FieldModelLoader.cpp

core/field/FieldModelLoader.h

core/field/FieldModelLoaderPC.cpp

core/field/FieldModelLoaderPC.h

core/field/FieldModelLoaderPS.cpp

core/field/FieldModelLoaderPS.h

core/field/FieldModelPart.cpp

core/field/FieldModelPart.h

core/field/FieldModelSkeleton.cpp

core/field/FieldModelSkeleton.h

core/field/FieldModelTextureRef.cpp

core/field/FieldModelTextureRef.h

core/field/FieldModelTextureRefPC.cpp

core/field/FieldModelTextureRefPC.h

core/field/FieldModelTextureRefPS.cpp

core/field/FieldModelTextureRefPS.h

core/field/FieldPC.cpp

core/field/FieldPC.h

core/field/FieldPS.cpp

core/field/FieldPS.h

core/field/FieldPSDemo.h

core/field/FieldPart.cpp

core/field/FieldPart.h

core/field/GrpScript.cpp

core/field/GrpScript.h

core/field/HrcFile.cpp

core/field/HrcFile.h

core/field/IdFile.cpp

core/field/IdFile.h

core/field/InfFile.cpp

core/field/InfFile.h

core/field/Opcode.cpp

core/field/Opcode.h

core/field/PFile.cpp

core/field/PFile.h

core/field/Palette.cpp

core/field/Palette.h

core/field/PaletteIO.cpp

core/field/PaletteIO.h

core/field/RsdFile.cpp

core/field/RsdFile.h

core/field/Script.cpp

core/field/Script.h

core/field/Section1File.cpp

core/field/Section1File.h

core/field/TdbFile.cpp

core/field/TdbFile.h

core/field/TutFile.cpp

core/field/TutFile.h

core/field/TutFilePC.cpp

core/field/TutFilePC.h

core/field/TutFileStandard.cpp

core/field/TutFileStandard.h

core/world/TblFile.cpp

core/world/TblFile.h

debian/changelog

txt - Copie.cpp

widgets/AnimEditorDialog.cpp

widgets/AnimEditorDialog.h

widgets/ApercuBG.cpp

widgets/ApercuBG.h

widgets/ApercuBGLabel.cpp

widgets/ApercuBGLabel.h

widgets/BGDialog.cpp

widgets/BGDialog.h

widgets/ColorDisplay.cpp

widgets/ColorDisplay.h

widgets/ConfigWindow.cpp

widgets/ConfigWindow.h

widgets/EncounterTableWidget.cpp

widgets/EncounterTableWidget.h

widgets/EncounterWidget.cpp

widgets/EncounterWidget.h

widgets/FieldList.cpp

widgets/FieldList.h

widgets/FieldModel.cpp

widgets/FieldModel.h

widgets/FontDisplay.cpp

widgets/FontDisplay.h

widgets/FontGrid.cpp

widgets/FontGrid.h

widgets/FontLetter.cpp

widgets/FontLetter.h

widgets/FontManager.cpp

widgets/FontManager.h

widgets/FontPalette.cpp

widgets/FontPalette.h

widgets/FontWidget.cpp

widgets/FontWidget.h

widgets/FormatSelectionWidget.cpp

widgets/FormatSelectionWidget.h

widgets/GrpScriptList.cpp

widgets/GrpScriptList.h

widgets/HexLineEdit.cpp

widgets/HexLineEdit.h

widgets/ImportDialog.cpp

widgets/ImportDialog.h

widgets/KeyEditorDialog.cpp

widgets/KeyEditorDialog.h

widgets/LgpDialog.cpp

widgets/LgpDialog.h

widgets/Listwidget.cpp

widgets/Listwidget.h

widgets/MassExportDialog.cpp

widgets/MassExportDialog.h

widgets/MassImportDialog.cpp

widgets/MassImportDialog.h

widgets/MiscWidget.cpp

widgets/MiscWidget.h

widgets/ModelManager.cpp

widgets/ModelManager.h

widgets/ModelManagerPC.cpp

widgets/ModelManagerPC.h

widgets/ModelManagerPS.cpp

widgets/ModelManagerPS.h

widgets/OpcodeList.cpp

widgets/OpcodeList.h

widgets/OperationsManager.cpp

widgets/OperationsManager.h

widgets/OrientationWidget.cpp

widgets/OrientationWidget.h

widgets/QTaskBarButton.cpp

widgets/QTaskBarButton.h

widgets/ScriptEditor.cpp

widgets/ScriptEditor.h

widgets/ScriptEditorWidgets/Delegate.cpp

widgets/ScriptEditorWidgets/Delegate.h

widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp

widgets/ScriptEditorWidgets/ScriptEditorGenericList.h

widgets/ScriptEditorWidgets/ScriptEditorMathPage.cpp

widgets/ScriptEditorWidgets/ScriptEditorMathPage.h

widgets/ScriptEditorWidgets/ScriptEditorMoviePage.cpp

widgets/ScriptEditorWidgets/ScriptEditorMoviePage.h

widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp

widgets/ScriptEditorWidgets/ScriptEditorStructPage.h

widgets/ScriptEditorWidgets/ScriptEditorView.cpp

widgets/ScriptEditorWidgets/ScriptEditorView.h

widgets/ScriptEditorWidgets/ScriptEditorWindowPage.cpp

widgets/ScriptEditorWidgets/ScriptEditorWindowPage.h

widgets/ScriptList.cpp

widgets/ScriptList.h

widgets/ScriptManager.cpp

widgets/ScriptManager.h

widgets/Search.cpp

widgets/Search.h

widgets/SearchAll.cpp

widgets/SearchAll.h

widgets/Splitter.cpp

widgets/Splitter.h

widgets/TextHighlighter.cpp

widgets/TextHighlighter.h

widgets/TextManager.cpp

widgets/TextManager.h

widgets/TextPreview.cpp

widgets/TextPreview.h

widgets/TutWidget.cpp

widgets/TutWidget.h

widgets/VarManager.cpp

widgets/VarManager.h

widgets/VarOrValueWidget.cpp

widgets/VarOrValueWidget.h

widgets/VertexWidget.cpp

widgets/VertexWidget.h

widgets/WalkmeshManager.cpp

widgets/WalkmeshManager.h

widgets/WalkmeshWidget.cpp

widgets/WalkmeshWidget.h

Older »