Skip to content

Commit

Permalink
Pull dev branch to master (stable) march 2020 (#274)
Browse files Browse the repository at this point in the history
* Update reach weap plugin (#259)

* Fix reach weap plugin updates (#260)

* Fix reach weap plugin updates

* Fix spacing (whoops)

* rename debugtools to addresstools

also splits the convert button of both so usage is more clear

* move tag information again

now its in the tag editor

* Update DataRef.cs

* Some styling tweaks

gets rid of padding in some areas

* clear my backlog of plugin changes

whats it been, a few years? also contains what I managed to port from h5 at the time, still unfinished lol and most of it didnt make it past h4

* update reach/mcc script xmls

other games coming someday

* add the new h2 plugins to the project

oops

* color field overhaul

colorf now uses scRGB, integer-based colors all use color32 now, with color24 removed completely

* Updated plugins to support previous color commit

* rename a couple tag header things

"important tags" to "global tags" and "polyart" to "tag interop"

* rename stringid sets to namespaces

* change writeascii to use latin encoding

fixes an issue where regular ascii wouldnt preserve some of the odd characters found in stringids

* remove h2 "head" plugin

must have been a holdout from wherever the original h2v set came from

* remove forced endianness in plugin generator

* update h3 beta plugins

i was trying to keep them separate for the h3b branch but meh

* update plugineditor autocorrect for color

* missed a spot on the tag header commit

* rename reflexive to tagblock

at last

* replaced reflexive with tagblock

plugins for the previous commit

* correct typo in h2v layout

* rename tag class to tag group

if im gonna make big broad changes might as well do everything i can

* rename bitfield to flags

more stops on the proper names tour 2020

* replaced bitfield with flags

plugins for previous commit

* implement the previous 64bit flags

also fixed the bits actually displaying properly

* correct a nasty wrong name

also some small things, one of which might not even matter but oh well

* Actually kill off polyart

includes renaming related things and providing some more info in the plugins

* improve address tools tab

can now convert to/from the contracted addresses within mcc tag data

* Improve zoneset handling

This should help with some injection issues

* dataref improvements

length and address boxes are no longer readonly and will update the content in realtime. unicode option removed because its not used in any plugins and likely isnt ever used period. #65 #263

* Add an allocator tool for datarefs

Because manually changing sizes can be bad.

* remove "meta" from ui

dunno about all the code references

* Clean up unused files

Found some ghost files, also some images and dlls that aren't referenced/used anymore

* simplify logo path data

* Update forgotten element name refs

* Swap unit boost recharge rate/delay in affected plugins

#257

* dataref error protection

prevents the combo of a nonzero length but invalid address horribly balooning the map file.

* Update DataRefAllocator.xaml

Forgot to change to button text.

* finish adding datarefs to h2 plugins

* correct scanned issues in plugins

* update some plugins

add in rectangle fields, fix up cutscene titles blocks

* begin applying some of the new field types

more basic/easy spots first

* Add support for tooltips in plugins

fields, bits, and enum options can use them, also adjusted related controls to better display them

* increase buffer size on some stream copying stuff

speeds up larger tag injections

* Fix cusc sorting

my backlog commit had the wrong block set for sorting

* Big field control commit

All fields "recreated" to use a similar grid layout instead of stackpanels. Previous tooltip commit toned down, only the name area will display the tooltip outside flags/enums, along with a bonobo-inspired indicator when one is present. MultiValue has been split up so it isn't such a pain to manage. Comment now hides its scrollviewer when there is nothing to display (bandaid for it eating scroll events). Tagrefs now use a default null group instead of a fake null group that would show errors in the output window. Degree no longer needs its own control.

* Adjust left margin in tag editor

Adding the tooltip indicator made things look off

* Adjust treeview child margin

* Update MetaEditor.xaml

Uses rows instead of large margins

* Move a particular object comment to a tooltip

* Comment wasnt displaying the scrollbar

* update all hlmt plugins

* standardize damage reporting types a little

* name some scnr stuff

* make tag field textboxes invariant culture

"Negative 'Infinity', I don't like it." ~Windows 10

* Show a validation tooltip on textboxes

Also adjusts the exception for invalid pointers that displays.

* mode-related plugins

* small hud changes

* more tooltip tweaks

wrapping and max width, more info is displayed

* Re-implement enum index option

Now handled through binding, even updates in realtime too.

* Add a quaternion converter

* fix appveyor

guess that isn't supported

* Add more fields

64-bit number, 16-bit quaternion, and 16 bit point2, and adjust the quat converter to support 16-bit

* Plugins using some of the new fields

* Clarify licensing

* More plugins

big char stuff, touched up jmad, fixed some errors

* Update WidthCalculator.cs

how did i fuck this up so bad

* add poking support for jan 29 update

* some plugins

* change inherited style for gear buttons

tag block in particular the behavior didnt match the togglebutton next to it

* try to reduce memory usage

patch tab in particular #268

* Update mode.xml

oops

* Fix degree range fields

#273

* support for todays update

Co-authored-by: camden-smallwood <52939755+camden-smallwood@users.noreply.github.com>
Co-authored-by: Lord-Zedd <Lord-Zedd@users.noreply.github.com>
Co-authored-by: Aaron Dierking <aarond@fb.com>
  • Loading branch information
4 people committed Mar 4, 2020
1 parent 0ef0ac0 commit e840d9f
Show file tree
Hide file tree
Showing 1,407 changed files with 123,208 additions and 108,575 deletions.
674 changes: 674 additions & 0 deletions LICENSE

Large diffs are not rendered by default.

9 changes: 7 additions & 2 deletions src/Assembly/App.xaml
Expand Up @@ -36,14 +36,19 @@
<Style x:Key="AsmLogo" TargetType="Path">
<Setter Property="IsHitTestVisible" Value="False" />
<Setter Property="Fill" Value="{DynamicResource ExtryzeAccentBrush}" />
<Setter Property="Data" Value="M898,1859C845,1855 757,1844 703,1835 613,1820 602,1816 571,1783 545,1755 518,1742 441,1718 307,1676 184,1611 106,1538 14,1454 12,1448 59,1411L98,1380 157,1437C295,1574 516,1650 860,1680 923,1685 1001,1690 1034,1690L1093,1690 1037,1628C1006,1593 977,1566 971,1567 966,1569 936,1542 906,1507L850,1445 901,1442C946,1439,957,1442,982,1467L1012,1495 1091,1410C1134,1363 1170,1323 1170,1320 1170,1317 1099,1316 1013,1318 926,1320 846,1319 835,1316 824,1313 807,1297 797,1280 780,1253 774,1250 726,1250L674,1250 531,1090 388,930 339,930 290,930 290,890 290,850 414,850C535,850 539,849 542,828 545,803 575,795 775,764 864,750 893,741 929,717L974,687 1189,698C1812,733,2092,844,2291,1135L2345,1215 2448,1218 2550,1221 2550,1260 2550,1300 2457,1300C2344,1300 2330,1308 2290,1396 2222,1547 2049,1671 1781,1760 1510,1851 1207,1885 898,1859z M1332,1679C1673,1642 1964,1475 1987,1302 1994,1246 1967,1171 1920,1117 1869,1059 1783,1003 1765,1016 1746,1029 1140,1678 1140,1685 1140,1693 1221,1691 1332,1679z M1406,1068L1522,935 1486,932C1456,929 1450,925 1450,906 1450,886 1443,881 1393,871 1361,865 1277,855 1205,849 1067,837 842,848 690,875L615,887 748,889C873,890 880,891 880,910 880,929 873,930 789,930 739,930 700,934 702,939 704,944 753,1004 813,1074L920,1200 1105,1200 1289,1200 1406,1068z" />
<Setter Property="Data" Value="M1122.8,589.7c0,0-32.2,6.1-46.3-37.3c-14.1-43.4-80.5-145.9-328.8-203c-248.3-57.1-467.7,0-467.7,0
l-29.9,32.8c0,0-172.6,32.3-242.1,141.8l40.3,29.9c0,0,54.9-112.1,319.8-138.8c52.4-5.3,100.4-8,144.5-8.2l-54.8,61.3l-7.5-4.5
l-54.9,61.2h53.4l25.4-26.9l77.7,85.1H384.6l-19.4,28.4h-47.4L179.8,765.2H135v34.3h119.5v21.6c0,0,51.4,13.9,161.4,28.4
l35.9,25.4c0,0,258.6,4.5,415.4-50.8c156.8-55.3,206.8-158.7,215.2-171.7c8.4-13,14.2-27.9,37.4-25.4h73.2v-37.3H1122.8z
M679,765.2v20.4c-95.3,21.3-226.4,29.2-399.7-3l0.7-1h133v-17.9h-89.7l107.6-126.9h173.3l112.1,128.4H679z M886.7,689.8
c-3,2.5-20.8,19.4-56.1,39.4L528.9,406.9c169.7,1.4,279.6,40.2,356.3,106.7C983.8,599.2,896.7,681.3,886.7,689.8z" />
<Setter Property="Stretch" Value="Fill" />
<Setter Property="RenderTransformOrigin" Value="0.5,0.5" />
<Setter>
<Setter.Property>RenderTransform</Setter.Property>
<Setter.Value>
<TransformGroup>
<ScaleTransform ScaleY="-0.5" />
<ScaleTransform ScaleY="0.5" />
<SkewTransform />
<RotateTransform />
<TranslateTransform />
Expand Down
2 changes: 1 addition & 1 deletion src/Assembly/App.xaml.cs
Expand Up @@ -27,7 +27,7 @@ public bool SignalExternalCommandLineArgs(IList<string> args)

#endregion

public static Storage AssemblyStorage;
public static Storage AssemblyStorage { get; set; }

[STAThread]
public static void Main()
Expand Down
162 changes: 121 additions & 41 deletions src/Assembly/Assembly.csproj

Large diffs are not rendered by default.

28 changes: 0 additions & 28 deletions src/Assembly/Helpers/Plugins/BasicPluginEntry.cs

This file was deleted.

18 changes: 0 additions & 18 deletions src/Assembly/Helpers/Plugins/BasicPluginType.cs

This file was deleted.

23 changes: 0 additions & 23 deletions src/Assembly/Helpers/Plugins/NamedPluginEntry.cs

This file was deleted.

49 changes: 0 additions & 49 deletions src/Assembly/Helpers/Plugins/PluginEntry.cs

This file was deleted.

0 comments on commit e840d9f

Please sign in to comment.