forked from Gang-Garrison-2/Gang-Garrison-2
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge commit 'dea49b2fc2408ee4f9410c9095d9f360e4c312db' into antispyhax
Conflicts: Source/gg2/Constants.xml Source/gg2/Objects/InGameElements/Character.events/Begin Step.xml Source/gg2/Objects/InGameElements/Character.events/User Event 12.xml
- Loading branch information
Showing
105 changed files
with
565 additions
and
433 deletions.
There are no files selected for viewing
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,3 +4,4 @@ gg2.exe | |
gg2.ini | ||
gg2updater.gmk | ||
gg2updater.gb1 | ||
gg2b |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
<extensionPackages> | ||
<package>Faucet Networking Extension</package> | ||
<package>Faucet Networking</package> | ||
<package>GG2DLL</package> | ||
<package>Hobbl Download Manager Ext Wrapper</package> | ||
</extensionPackages> |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.