d43ae8e010
Take updates from various revisions in trunk with slight modifications for the older setup.
...
Originally committed to SVN as r3848.
2009-12-01 09:23:04 +00:00
4a428a8605
Really remove osx_bevelButton.h in rr3843.
...
Originally committed to SVN as r3847.
2009-12-01 08:34:31 +00:00
be785191b1
Merge r3485,r3488 (osx/wx2.9 fixes)
...
Originally committed to SVN as r3846.
2009-12-01 07:53:56 +00:00
88e2b7c126
Merge r3396 (partial) and r3483 (osx/wx2.9 fixes)
...
Originally committed to SVN as r3845.
2009-12-01 05:13:27 +00:00
1ef9e9a556
Merge r3344,r3296 (osx/wx2.9 fixes).
...
Originally committed to SVN as r3844.
2009-12-01 04:55:17 +00:00
96aeeb7287
Merge r3339,r3484 (osx fixes).
...
Originally committed to SVN as r3843.
2009-12-01 04:51:06 +00:00
ff563785b8
Merge r3221 for wx2.9 compat.
...
Originally committed to SVN as r3841.
2009-12-01 04:13:54 +00:00
ba1395a7db
Merge framerate transform fixes in r3838-r3839 from trunk. Closes #1007 .
...
Originally committed to SVN as r3840.
2009-12-01 02:00:02 +00:00
c3248ee509
Merge error message changes in r3835 from trunk. Updates #1020 .
...
Originally committed to SVN as r3836.
2009-12-01 00:43:43 +00:00
9089f212d2
Add a bunch more info to the update checker query string, updates #970 .
...
Originally committed to SVN as r3834.
2009-11-30 04:32:31 +00:00
8ddfdf89d8
Merge r3802 which is a verbatium merge, and also includes the glue required to support LUA 5.0.
...
Originally committed to SVN as r3824.
2009-11-29 11:47:20 +00:00
b5d3a6ec09
Merge r3081 (add two new custom macros for finding libraries/headers)
...
Originally committed to SVN as r3823.
2009-11-29 10:22:09 +00:00
56a8c9ee74
Merge r3820 into 2.1.8. Updates #1048 .
...
Originally committed to SVN as r3821.
2009-11-28 20:06:16 +00:00
4b7cef9ce9
Merge r3818.
...
Originally committed to SVN as r3819.
2009-11-21 22:22:36 +00:00
a5cb5d490a
Merge r3815. Compilation fixed again.
...
Originally committed to SVN as r3817.
2009-11-21 21:24:25 +00:00
6a9b1b8e5d
Merge r3814. Compilation broken.
...
Originally committed to SVN as r3816.
2009-11-21 21:21:06 +00:00
9188c2af45
Fix regression introduced by r3797.
...
The OnPaint handler would be skipped if origImage was 0, but the only thing that could initialise origImage to non-0 was DoUpdateImage called on the next line, thus never called.
Originally committed to SVN as r3812.
2009-11-21 13:00:09 +00:00
df132fb529
Merge r3810, closes #894 . Yay!
...
Originally committed to SVN as r3811.
2009-11-18 18:48:22 +00:00
7eb720251e
During old and legacy installation clean up, check the targets of shell links before they are deleted. Only delete those links that point to something in the folder the old version is being removed from. (Use a simple string prefix check.) Closes #1046 .
...
Originally committed to SVN as r3809.
2009-11-18 16:10:41 +00:00
80aa875c8c
Minor change to support (actually require) the Unicode version of InnoSetup 5.3 rather than the ACP version.
...
Originally committed to SVN as r3808.
2009-11-18 13:51:27 +00:00
cf317aa6e7
InnoSetup sources to build a portable version of Aegisub.
...
Originally committed to SVN as r3807.
2009-11-18 11:40:23 +00:00
531d580b5b
Add upgrade installer for 2.1.8. Only upgrades 2.1.7 to 2.1.8. Closes #1038 .
...
Originally committed to SVN as r3806.
2009-11-18 10:41:48 +00:00
957dc9ea21
Refactor the installer into a bunch of include files, preparing to make a simpler Upgrade installer build. While the ordering of some components in the list and some actions done during installation have changed slightly, the end result of installation is the same. Updates #1038 .
...
Originally committed to SVN as r3805.
2009-11-18 09:26:17 +00:00
d16ca8bcc9
Merge r3803, updates #894 .
...
Originally committed to SVN as r3804.
2009-11-17 05:33:58 +00:00
7a7a0f67cf
Merge r3798 from trunk.
...
Originally committed to SVN as r3799.
2009-11-17 01:54:40 +00:00
938161a7b9
Merge revisions r3675, r3676 and r3688 from trunk (detached video fixes).
...
Originally committed to SVN as r3797.
2009-11-17 01:26:30 +00:00
9c21f67543
Revert all of the changes made in r3795 other than the merging of r3794.
...
Originally committed to SVN as r3796.
2009-11-16 23:41:51 +00:00
a853ecc531
Merge r3794 updates #1040 .
...
Originally committed to SVN as r3795.
2009-11-15 21:18:45 +00:00
cb63a54ac0
Merge r3212 (silencing of a warning) into 2.1.8. Updates #1030 .
...
Originally committed to SVN as r3793.
2009-11-15 15:07:14 +00:00
dbd06433f8
Merge r3164 (trackmask mixup) into 2.1.8. Missed this earlier. Updates #1030 .
...
Originally committed to SVN as r3792.
2009-11-15 15:05:13 +00:00
aa82b4a80a
Redo the merge of r3576. Should be done the proper way now. Updates #1030 .
...
Originally committed to SVN as r3791.
2009-11-15 14:50:21 +00:00
b075133d21
Revert r3789, conflict resolution was done wrong which screwed up the merge. Updates #1030 .
...
Originally committed to SVN as r3790.
2009-11-15 14:47:33 +00:00
a6fdee5821
Complete backporting of ffms2 providers by merging r3576 into 2.1.8. Fixes compilation that was broken in r3787 and closes #1030 .
...
Originally committed to SVN as r3789.
2009-11-15 14:27:46 +00:00
55a77ebdd9
Merge r3224 (removal of unnecessary string conversions) into 2.1.8. Updates #1030 .
...
Originally committed to SVN as r3788.
2009-11-15 14:24:01 +00:00
3bed129b9a
Backport all trunk updates of libffms to 2.1.8. Merges r3574-3575,3577-3578,3580,3585-3586,3639,3664,3690 and 3769. Updates #1030 . Note: compilation BROKEN in this revision!
...
Originally committed to SVN as r3787.
2009-11-15 14:12:46 +00:00
2d1260cfee
Backport the removal of Aegisub::String into 2.1.8. Merges r3215, r3216 and r3220. Updates #940 and #1030 .
...
Originally committed to SVN as r3786.
2009-11-15 13:59:04 +00:00
3cd1052d39
Merge r3214 into 2.1.8. Updates #1030 .
...
Originally committed to SVN as r3785.
2009-11-15 13:51:58 +00:00
44ae38d584
Merge r3452 into 2.1.8. Updates #1030 .
...
Originally committed to SVN as r3784.
2009-11-15 13:47:27 +00:00
30eab72611
Merge r3377 (reindexing bugfix) into 2.1.8. Updates #1030 .
...
Originally committed to SVN as r3783.
2009-11-15 13:46:05 +00:00
ecaabf9c2a
Merge r3248 (log option for ffms2) into 2.1.8. Updates #1030 .
...
Originally committed to SVN as r3782.
2009-11-15 13:44:45 +00:00
00444f08b9
Merge the Great Colorspace Reworking into 2.1.8. Merges r3180 and r3185; updates #926 and #1030 .
...
Originally committed to SVN as r3781.
2009-11-15 13:32:33 +00:00
53bee779d3
Merge r3178 (removal of fps parameter to video provider constructors) into 2.1.8. Updates #1030 .
...
Originally committed to SVN as r3780.
2009-11-15 13:13:37 +00:00
459ec4626e
Merge r3155 into 2.1.8. Updates #1030 .
...
Originally committed to SVN as r3779.
2009-11-15 13:07:15 +00:00
8ee2a7123c
Merge r3145 (multiple tracks support in the ffms2 providers) into 2.1.8. Updates #1030 .
...
Originally committed to SVN as r3778.
2009-11-15 12:58:31 +00:00
33cc95ca47
Merge r3776 to fix non-PCH compilation. Updates #1040 .
...
Originally committed to SVN as r3777.
2009-11-14 01:08:29 +00:00
ba6e686f36
Merge r3774, closes #1040 .
...
Originally committed to SVN as r3775.
2009-11-14 00:51:23 +00:00
a1f8cc5a22
Merge r3772, closes #1044 .
...
Originally committed to SVN as r3773.
2009-11-13 22:16:46 +00:00
55a4d04681
Add a quick hack from plork as a workaround. The issue is caused by DrawSubtitles being called before LoadSubtitles, csri can handle this just fine but libass crashes. This should be fixed in libass and our hack removed. updates #1035 .
...
Originally committed to SVN as r3771.
2009-11-13 02:27:07 +00:00
4f77428592
Merge r3769.
...
Originally committed to SVN as r3770.
2009-11-07 03:10:10 +00:00
c06e4eb8ac
Add dialog_associations.cpp to Makefile.am. updates #1037 .
...
Originally committed to SVN as r3768.
2009-11-05 21:21:28 +00:00
Amar Takhar