Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
143 commits
Select commit Hold shift + click to select a range
80bda6a
Massive surgery & Documentation rampage
LB-- Oct 20, 2012
db92fa9
Added missing files from last commit
LB-- Oct 20, 2012
b16d9a1
bells and whistles
LB-- Oct 20, 2012
cca724d
Fix header extension inconsistency
LB-- Oct 20, 2012
546deed
Make EditData::Serialize unavailable for RUN_ONLY
LB-- Oct 21, 2012
ca940e0
Changed README to GitHub Flavored MarkDown
LB-- Oct 21, 2012
e3e00ce
Add title
LB-- Oct 21, 2012
a6bbcce
Fix broken links
LB-- Oct 21, 2012
7f18873
"works-for-now" fix broken links
LB-- Oct 21, 2012
284ea0b
Miscellaneous fixes
LB-- Oct 21, 2012
96562ce
Fixed char/TCHAR inconsistency
LB-- Oct 24, 2012
f8de715
Fix urf8String typo, reduce spacing in RD
LB-- Oct 24, 2012
5c0d363
Show MessageBox when MFX is still "Template.mfx"
LB-- Oct 24, 2012
d8dcdb6
Fix spacing in message
LB-- Oct 24, 2012
49b32be
GitHib being a spazz
LB-- Oct 24, 2012
f661976
Fix Command-Line Warning D9007
LB-- Oct 25, 2012
8787547
Make it 9 times easier to change the ext filename
LB-- Oct 25, 2012
12c9527
Adjust Template.mfx message, put ObjSel in Riggs
LB-- Oct 25, 2012
16bbf6a
Exclude filename check from runtime MFX
LB-- Oct 25, 2012
098dff2
"when the click" -> "when they click"
LB-- Oct 28, 2012
bbf2286
hInstLib is already declared in Edif.h
LB-- Oct 28, 2012
88ae24e
Update json-parser
LB-- Oct 28, 2012
14ac685
Add link to Tutorials on wiki
LB-- Oct 28, 2012
2262b6a
Fix links to point to wiki
LB-- Oct 28, 2012
8d14a24
Update to latest json parser
LB-- Oct 30, 2012
2e7122f
Correct CT Forum Thread URL
LB-- Oct 30, 2012
206fd87
Make all configs compile, del using namespace std
LB-- Nov 3, 2012
5a0a029
Fix typo ("spaces"->"letters")
LB-- Nov 3, 2012
b83d78e
Made Template.mfx dialog more helpful
LB-- Nov 3, 2012
2dcff22
Group MMF2 SDK files in project tree, fix old bug
LB-- Nov 3, 2012
8b80d3a
Undo fix (actually doesn't compile)
LB-- Nov 4, 2012
ee386f9
Add static Read/WriteGlobal funcs, add examples
LB-- Nov 4, 2012
2d806d4
Ignore build & built files from template
LB-- Nov 4, 2012
7c02e5e
Minor Unicode fix
LB-- Nov 5, 2012
d020829
Fix dangling pointer crashes in example
LB-- Nov 5, 2012
363ca52
Fix outdated comment
LB-- Nov 5, 2012
5bde1f3
Add per-ext support for relaxed commas in json
LB-- Nov 6, 2012
e4031b6
Add support for comparison params in conditions
LB-- Nov 6, 2012
1a46993
Add example of disabled menu item to Ext.json
LB-- Nov 6, 2012
6a09d94
misc cleanup
LB-- Nov 6, 2012
3eecdc0
Prepare for submodulization
LB-- Nov 10, 2012
68ff0f5
more prep
LB-- Nov 10, 2012
8dcc86a
Convert to json-parser submodule
LB-- Nov 10, 2012
45aa8be
Finish submodulizing json-parser
LB-- Nov 10, 2012
419aae1
git LF normalization
LB-- Nov 10, 2012
caedd9d
Make more convenient for users
LB-- Nov 10, 2012
0119b35
Revert "Make more convenient for users"
LB-- Nov 10, 2012
b0b5c10
Update json-parser
LB-- Dec 4, 2012
2f61e4f
Update json-parser
LB-- Dec 13, 2012
09435b2
Fix issue with spaces in project path
LB-- Dec 29, 2012
891e0e7
Update json-parser
LB-- Jan 20, 2013
864880f
Fix typo
LB-- Feb 2, 2013
65d676b
Revert json-parser submodulization (too many issues)
LB-- Feb 11, 2013
3365831
Update json-parser
LB-- Mar 19, 2013
df4bdf2
Add EDIStream
LB-- Mar 31, 2013
8c35d00
Add EDOStream
LB-- Apr 1, 2013
76cb3b0
Add warning
LB-- Apr 1, 2013
1eb2fd0
Add missing explicit destructor
LB-- Apr 1, 2013
fe44dfd
Fix gitignore to only track Template
LB-- Apr 6, 2013
212bf51
Merge in Looki's HWA fixes
LB-- Apr 6, 2013
6d8f5f0
Merge pull request #2 from ClickteamLLC/master
LB-- Apr 8, 2013
74fbe50
Fix gitignore to only track Template
LB-- Apr 9, 2013
fcbd639
Merge pull request #3 from LB--/master
LB-- Apr 9, 2013
c7b4de1
Use Project name as MFX name instead
LB-- Apr 9, 2013
ac0d06d
Rename high-level template project
LB-- Apr 9, 2013
2ff8d64
Merge branch 'master' into stream-editdata
LB-- Apr 9, 2013
44d1a93
Update Template.mfx warning message
LB-- Apr 12, 2013
7061a32
Add back original EDIF template project
LB-- Apr 13, 2013
59272bd
Move EDStream in project tree
LB-- Apr 13, 2013
c564596
Integrate EDStream
LB-- Apr 14, 2013
29dc9a8
Merge pull request #8 from LB--/stream-editdata
LB-- Apr 14, 2013
59bb253
Update json-parser
LB-- Apr 26, 2013
39c5da9
Rename power template project
LB-- May 10, 2013
2dc07bf
Update gitignore
LB-- May 10, 2013
f29492e
Copy TemplatePlus to TemplatePlusPlus
LB-- May 10, 2013
2bfb4a8
Add readme for template projects
LB-- May 10, 2013
d7d27bb
Fix copyright symbol
LB-- May 10, 2013
992ebaa
Add Pre- and Post-Injection for RunData
LB-- May 15, 2013
33db448
Fix garbage value being returned with optimizations enabled
LB-- Jul 14, 2013
8423c82
Merge branch 'fix'
LB-- Jul 14, 2013
9ed126b
Merge remote-tracking branch 'upstream/master'
LB-- Jul 16, 2013
4ac90c5
Pull in Andos' OSF changes
LB-- Aug 29, 2013
9df37fa
Merge branch 'master' of https://github.com/LB--/windows-edif
LB-- Aug 31, 2013
b43cef3
Update json-parser
LB-- Sep 1, 2013
38b39e0
Add basic CMakeLists.txt (incomplete)
LB-- Nov 6, 2013
cba8182
Fix unquoted arguments
LB-- Nov 7, 2013
a94b64d
Partial CMake support, incomplete MinGW support
LB-- Nov 8, 2013
a8a9cdd
Fix MinGW ACE calling
LB-- Nov 11, 2013
1e29fb5
Update json-parser, partially fix double SDK init in F2.5
LB-- Mar 3, 2014
9bf769c
Workaround for double init/free calls
LB-- Mar 16, 2014
9721dd2
Update values returned to Fusion
LB-- Mar 16, 2014
b7f07be
Update AutoInstall.bat for Fusion 2.5
LB-- Mar 16, 2014
b415dc0
Merge update-autoinstall
LB-- Mar 16, 2014
2ae614e
Merge branch 'fusion-2.5-fixes'
LB-- Mar 16, 2014
246ca30
Remove TemplatePlusPlus
LB-- Mar 16, 2014
e1b9189
Update readmes
LB-- Mar 16, 2014
4fb2507
Update Fusion headers with F2.5 SDK
LB-- Mar 16, 2014
dbd37c8
Update json-parser
LB-- Mar 16, 2014
819e4d9
Make template project trees more similar
LB-- Mar 16, 2014
fe07730
Update plain template extension files and Common.h
LB-- Mar 16, 2014
cd9f346
Start splitting F2.0 from F2.5
LB-- Mar 16, 2014
9a23d95
Fully separate F2.0 and F2.5 configurations
LB-- Mar 16, 2014
1ac80cf
Add back missing FILTERID_PNG
LB-- Mar 16, 2014
f04d82a
Reduce number of configurations
LB-- Mar 16, 2014
cad77f5
Clean up .def files
LB-- Mar 16, 2014
e3f2c11
Clarify HWA build configs
LB-- Mar 17, 2014
a959f4f
Add non-HWA/Unicode build configs back for MMF2.0
LB-- Mar 17, 2014
98b4333
Update wiki links
LB-- Mar 17, 2014
01eb909
Update copyright year in template JSONs
LB-- Mar 17, 2014
83046a0
Fix Unicode Properties in TemplatePlus
LB-- Mar 17, 2014
e50404c
Fix non-HWA MFX path
LB-- Mar 26, 2014
bafe9b5
Update json-parser
LB-- Dec 3, 2014
8533891
Merge upstream icon crash fix
LB-- May 23, 2015
3f32d9a
Merge branch 'fusion-2.5-fixes' into fusion-2.x
LB-- May 25, 2015
d22bd77
Clarify that Unicode builds are HWA as well
LB-- May 25, 2015
0f6beb6
Add separator to end of condition menu
LB-- Jul 15, 2015
ecb4926
Allow numeric object identifiers too
LB-- Jul 15, 2015
69f02dd
Allow intercepting menu selections
LB-- Jul 15, 2015
b5f5341
Use PARAM_FILENAME2 instead of PARAM_FILENAME
LB-- Jul 15, 2015
8e0ffb3
Add A/C/E intercepting to the regular template too
LB-- Jul 19, 2015
0015518
Update the TemplatePlus gitignore
LB-- Jul 19, 2015
231179b
Update the ID for `PROPID_TAB_CUSTOM1`
LB-- Jul 19, 2015
792450f
Finally fix EditData corruption
LB-- Jul 19, 2015
18ea937
Make all conditions negatable (because why not?)
LB-- Jul 19, 2015
1f742b5
Add VS2015 project for TemplatePlus
LB-- Jul 21, 2015
78afbf0
Fix icon not being included
LB-- Jul 21, 2015
0a49858
Add vanilla Template2015
LB-- Jul 21, 2015
f866c1a
Oops, unhide solution nodes
LB-- Jul 21, 2015
09daac3
Try to reduce excess files in MFX folder
LB-- Jul 21, 2015
1562426
Drop old templates
LB-- Feb 8, 2016
270d133
Rename template project
LB-- Feb 8, 2016
1cfefbb
Minor doc update
LB-- Feb 8, 2016
3c66e31
Misc improvements
LB-- Apr 2, 2016
323f2b3
Replace MMF2 with Fusion where appropriate
LB-- Apr 10, 2016
b7d3fac
Fix sketchy JSON code in Edif::Init
LB-- Apr 11, 2016
d964552
Refactor Edif::GetDependency to make it less sketchy
LB-- Apr 11, 2016
6de87f3
Fix memory leak in GetDependencies
LB-- Apr 11, 2016
cb1a7ff
Improved gitignores, XP support, and no more iobj/ipdb files
LB-- May 15, 2016
d0713ca
Fix crashing on XP
LB-- May 15, 2016
67d4857
Add bacck support for Fusion 2.0 non-Unicode
LB-- May 20, 2016
b8936a2
Use correct libs and add non-HWA variants of non-Unicode
LB-- May 20, 2016
858dae3
Merge branch 'fusion-2.5', remote-tracking branch 'upstream/master' i…
LB-- May 20, 2016
ea949f7
More Visual Studio files to ignore
LB-- May 22, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Auto detect text files and perform LF normalization
* text=auto

# Custom for Visual Studio
*.cs diff=csharp
*.sln merge=union
*.csproj merge=union
*.vbproj merge=union
*.fsproj merge=union
*.dbproj merge=union

# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
172 changes: 170 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,170 @@
#Ignore any local extensions
Extensions/
# Only keep template projects
/Extensions/*
!/Extensions/Template*/
!/Extensions/AutoInstall.bat
!/Extensions/README.md


#################
## Eclipse
#################

*.pydevproject
.project
.metadata
bin/
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.classpath
.settings/
.loadpath

# External tool builders
.externalToolBuilders/

# Locally stored "Eclipse launch configurations"
*.launch

# CDT-specific
.cproject

# PDT-specific
.buildpath


#################
## Visual Studio
#################

## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.sln.docstates

# Build results
[Dd]ebug/
[Rr]elease/
*_i.c
*_p.c
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.vspscc
.builds
*.dotCover

## TODO: If you have NuGet Package Restore enabled, uncomment this
#packages/

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf

# Visual Studio profiler
*.psess
*.vsp

# ReSharper is a .NET coding add-in
_ReSharper*

# Installshield output folder
[Ee]xpress

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish

# Others
[Bb]in
[Oo]bj
sql
TestResults
*.Cache
ClientBin
stylecop.*
~$*
*.dbmdl
Generated_Code #added for RIA/Silverlight projects

# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML



############
## Windows
############

# Windows image file caches
Thumbs.db

# Folder config file
Desktop.ini


#############
## Python
#############

*.py[co]

# Packages
*.egg
*.egg-info
dist
build
eggs
parts
bin
var
sdist
develop-eggs
.installed.cfg

# Installer logs
pip-log.txt

# Unit test / coverage reports
.coverage
.tox

#Translations
*.mo

#Mr Developer
.mr.developer.cfg

# Mac crap
.DS_Store
131 changes: 87 additions & 44 deletions Extensions/AutoInstall.bat
Original file line number Diff line number Diff line change
@@ -1,44 +1,87 @@
echo MFX File: %1
echo MFX Destination: %2

:mfd
set status=ERROR
for /F "tokens=*" %%A in ('REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Clickteam\Multimedia Fusion Developer 2\Settings" /v "ProPath"') do set status=%%A
set status=%status:~0,5%
if %status%==ERROR goto nmfd

for /F "tokens=3* delims= " %%A in ('REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Clickteam\Multimedia Fusion Developer 2\Settings" /v "ProPath" ^| find "REG_SZ"') do set mmfpath=%%A %%B

echo MMF2 Dev Path: %mmfpath%

copy /y "%1" "%mmfpath%%2"

set mmfpath=
set status=

goto mfs

:nmfd
echo You don't have MMF2 Developer :(

:mfs
set status=ERROR
for /F "tokens=1 delims=:" %%A in ('REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Clickteam\Multimedia Fusion 2\Settings" /v "StdPath"') do set status=%%A
set status=%status:~0,5%
if %status%==ERROR goto nmfs

for /F "tokens=3* delims= " %%A in ('REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Clickteam\Multimedia Fusion 2\Settings" /v "StdPath" ^| find "REG_SZ"') do set mmfpath=%%A %%B

echo MMF2 Std Path: %mmfpath%

copy /y "%1" "%mmfpath%%2"

set mmfpath=
set status=

goto end

:nmfs
echo You don't have MMF2 Standard

:end
echo MFX File: %1
echo MFX Destination: %2

:mfd
set status=ERROR
for /F "tokens=*" %%A in ('REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Clickteam\Multimedia Fusion Developer 2\Settings" /v "ProPath"') do set status=%%A
set status=%status:~0,5%
if %status%==ERROR goto nmfd

for /F "tokens=3* delims= " %%A in ('REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Clickteam\Multimedia Fusion Developer 2\Settings" /v "ProPath" ^| find "REG_SZ"') do set mmfpath=%%A %%B

echo MMF2.0 Dev Path: %mmfpath%

copy /y "%1" "%mmfpath%%2"

set mmfpath=
set status=

goto mfs

:nmfd
echo You don't have MMF2.0 Developer :(

:mfs
set status=ERROR
for /F "tokens=1 delims=:" %%A in ('REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Clickteam\Multimedia Fusion 2\Settings" /v "StdPath"') do set status=%%A
set status=%status:~0,5%
if %status%==ERROR goto nmfs

for /F "tokens=3* delims= " %%A in ('REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Clickteam\Multimedia Fusion 2\Settings" /v "StdPath" ^| find "REG_SZ"') do set mmfpath=%%A %%B

echo MMF2.0 Std Path: %mmfpath%

copy /y "%1" "%mmfpath%%2"

set mmfpath=
set status=

goto cfd

:nmfs
echo You don't have MMF2.0 Standard

:cfd
set status=ERROR
for /F "tokens=1 delims=:" %%A in ('REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Clickteam\Fusion Developer 2.5\Settings" /v "InstallPath"') do set status=%%A
set status=%status:~0,5%
if %status%==ERROR goto ncfd

for /F "tokens=3* delims= " %%A in ('REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Clickteam\Fusion Developer 2.5\Settings" /v "InstallPath" ^| find "REG_SZ"') do set mmfpath=%%A %%B

echo CTF2.5 Dev Path: %mmfpath%

copy /y "%1" "%mmfpath%%2"

set mmfpath=
set status=

goto cfs

:ncfd
echo You don't have CTF2.5 Developer :(

:cfs
set status=ERROR
for /F "tokens=1 delims=:" %%A in ('REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Clickteam\Fusion 2.5\Settings" /v "InstallPath"') do set status=%%A
set status=%status:~0,5%
if %status%==ERROR goto ncfs

for /F "tokens=3* delims= " %%A in ('REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Clickteam\Fusion 2.5\Settings" /v "InstallPath" ^| find "REG_SZ"') do set mmfpath=%%A %%B

echo CTF2.5 Std Path: %mmfpath%

copy /y "%1" "%mmfpath%%2"

set mmfpath=
set status=

goto end

:ncfs
echo You don't have CTF2.5 Standard

:end

(call )
exit /b 0
4 changes: 4 additions & 0 deletions Extensions/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Extensions Directory
====================

This folder is where your extensions will stay. Copy the Template folder and rename it to start a new extension.
Loading