 Henrik Andersson
|
acef983c05
|
Merge
|
2011-07-30 19:30:36 +02:00 |
|
|
Henrik Andersson
|
7e19df685b
|
Merge
|
2011-07-30 19:29:13 +02:00 |
|
|
Henrik Andersson
|
1133667ad1
|
Readding the taskbar progress display.
|
2011-07-30 19:28:06 +02:00 |
|
|
Henrik Andersson
|
0335c40625
|
Revert "fix compile on windows"
This reverts commit 7bd6462929.
|
2011-07-20 23:25:02 +02:00 |
|
|
Henrik Andersson
|
899b16a796
|
[loading window->deafult] Noone could think of a good reason not to merge into default.
|
2011-07-20 22:19:07 +02:00 |
|
|
Henrik Andersson
|
759c7cac7e
|
[default->loading window] Just a little merge.
|
2011-07-20 21:58:22 +02:00 |
|
|
Henrik Andersson
|
363947d46a
|
[default->loading window] Catching up.
|
2011-07-20 20:06:28 +02:00 |
|
|
Henrik Andersson
|
68eec5aa0f
|
Merge with default
|
2011-07-16 19:37:31 +02:00 |
|
|
Henrik Andersson
|
4083036c56
|
[default -> loading window] Almost sounds like an important change
|
2011-07-15 15:51:49 +02:00 |
|
|
Henrik Andersson
|
b808bac1bf
|
[default -> loading window] Booring.
|
2011-07-14 20:56:47 +02:00 |
|
|
Henrik Andersson
|
a8872d4de4
|
[default -> loading window] All these merges could be avoided if someone could say that this code works fine.
|
2011-07-13 16:13:04 +02:00 |
|
|
Henrik Andersson
|
abc715276e
|
[default -> loading window] Hye look, another merge.
|
2011-07-12 21:45:49 +02:00 |
|
|
Henrik Andersson
|
a0cac8f677
|
[default -> loading window] YMA
|
2011-07-12 15:19:46 +02:00 |
|
|
Henrik Andersson
|
594506ec27
|
[default -> loading window] Catching up again.
|
2011-07-11 14:58:26 +02:00 |
|
|
Henrik Andersson
|
1ee1bd384b
|
[loading window] Hey look, the load can be aborted now!
Also, loading messages are now in the language file.
|
2011-07-11 14:56:44 +02:00 |
|
|
Henrik Andersson
|
6bae095ccb
|
Merge with default
|
2011-07-08 17:57:19 +02:00 |
|
|
Henrik Andersson
|
672ecc0221
|
[default -> loading window] Trying to keep up the best I can.
|
2011-07-07 21:57:00 +02:00 |
|
|
Henrik Andersson
|
899b16473e
|
[default -> loading window] Pulling in latest work.
|
2011-07-07 11:20:24 +02:00 |
|
|
Henrik Andersson
|
5008b6f641
|
Merge with default, again.
|
2011-07-03 20:12:11 +02:00 |
|
|
Henrik Andersson
|
9773bfc3ce
|
Merge with default
|
2011-07-03 20:03:06 +02:00 |
|
|
Henrik Andersson
|
7bf7a701ea
|
[loading window] Now it should build with old SDKs, if you change the constant.
|
2011-07-01 02:27:22 +02:00 |
|
|
Henrik Andersson
|
36b9864dfc
|
[default -> loading window] YAM
|
2011-07-01 00:10:46 +02:00 |
|
|
Henrik Andersson
|
f8468f93eb
|
Merge with default
|
2011-06-29 21:27:37 +02:00 |
|
|
Henrik Andersson
|
582466042e
|
[default -> loading window] YAM
|
2011-06-21 19:36:05 +02:00 |
|
|
Henrik Andersson
|
8f66346c06
|
Merge
|
2011-06-15 15:00:41 +02:00 |
|
|
Henrik Andersson
|
cd2561ef50
|
[loading window] And we are back, now with some win 7 custom features.
|
2011-06-15 14:59:15 +02:00 |
|
|
Henrik Andersson
|
5e16209850
|
[loading window -> default] I can't stand the previous loading window, and nobody else should see it either.
|
2011-06-11 13:04:51 +02:00 |
|
|
Henrik Andersson
|
6f0533d5b1
|
[default] I guess people don't find it amusing when everything is in the common app data when in portable mode.
|
2011-06-11 13:03:40 +02:00 |
|
|
Henrik Andersson
|
d7022c715a
|
[default -> loading window] YAM
|
2011-06-11 12:22:06 +02:00 |
|
|
Henrik Andersson
|
33bf96f212
|
[default -> loading window] YAM
|
2011-06-07 12:26:46 +02:00 |
|
|
Henrik Andersson
|
92c5eaeea0
|
[loading window] This is nicer than the thread termination. But now we need to find a way to end the load early.
|
2011-06-07 12:25:29 +02:00 |
|
|
Henrik Andersson
|
e249542093
|
[loading window] Might as well use this simple fallback graphic that I made in paint.
|
2011-06-06 20:49:34 +02:00 |
|
|
Henrik Andersson
|
50e180851e
|
[loading window] Let's try to dodge a crash when existing while reloading songs.
|
2011-06-05 22:54:45 +02:00 |
|
|
Henrik Andersson
|
17814f3638
|
[loading window] Oops, forgot to add the new files to the project.
|
2011-06-05 15:41:20 +02:00 |
|
|
Henrik Andersson
|
6d0f3f9db4
|
[loading window] Might as well expose thread specific versions too.
|
2011-06-05 15:40:41 +02:00 |
|
|
Henrik Andersson
|
881a6534e8
|
[loading window] Unloading should be reported as well.
|
2011-06-05 15:37:22 +02:00 |
|
|
Henrik Andersson
|
98204d5b56
|
[loading window] Forgot to refresh before commiting, again.
|
2011-06-05 12:25:07 +02:00 |
|
|
Henrik Andersson
|
1679709981
|
[loading window] Now it uses the correct instance. I hate stupid errors like this.
|
2011-06-05 12:24:04 +02:00 |
|
|
Henrik Andersson
|
167cd9238a
|
[loading window] Should really have included this in the initial design. Now it can be indeterminate too.
|
2011-06-05 11:32:51 +02:00 |
|
|
Henrik Andersson
|
9721c0d66a
|
[loading window] Trying to clean up the in game song reloading.
|
2011-06-05 01:39:15 +02:00 |
|
|
Henrik Andersson
|
6c7ebfafe8
|
[loading window] Note to self #2: Refresh the file list before commiting.
|
2011-06-04 23:37:36 +02:00 |
|
|
Henrik Andersson
|
a233c21188
|
[loading window] Note to self: check if it compiles before commiting.
|
2011-06-04 23:36:14 +02:00 |
|
|
Henrik Andersson
|
1dfb3a6f9a
|
[loading window] More use of the global instead of as an argument.
|
2011-06-04 23:21:33 +02:00 |
|
|
Henrik Andersson
|
9bff0653c0
|
[loading window]It's now a global, and it wasn't even used.
|
2011-06-04 23:10:07 +02:00 |
|
|
Henrik Andersson
|
813c2d8f09
|
[loading window] Theme loading should also list itself in the loading window.
|
2011-06-04 16:09:47 +02:00 |
|
|
Henrik Andersson
|
9956525d46
|
[loading window] Die thread die!
|
2011-06-04 15:37:20 +02:00 |
|
|
Henrik Andersson
|
75d595878a
|
[loading window] Reporting progress for more than just song loading.
|
2011-06-04 14:55:38 +02:00 |
|
|
Henrik Andersson
|
483b6d0170
|
[loading window] Merge with default
|
2011-06-04 14:27:19 +02:00 |
|
|
Henrik Andersson
|
e0eae90f23
|
[loading window] Destruction now works correctly.
|
2011-06-04 14:26:35 +02:00 |
|
|
Henrik Andersson
|
cbb933939a
|
Merge with default
|
2011-06-04 11:08:17 +02:00 |
|
|
Henrik Andersson
|
86cc2818e0
|
[loading window] Now the loading window has it's own thread. As such, the paint method is no longer needed.
|
2011-06-04 02:12:08 +02:00 |
|
|
Henrik Andersson
|
ac2668176a
|
Trying to clean up the loading window.
|
2011-06-03 23:54:45 +02:00 |
|
|
Henrik Andersson
|
32dc9164fe
|
Neater folder structure by remiving one folder level for the screenshots.
|
2011-06-03 22:51:08 +02:00 |
|
|
Henrik Andersson
|
07b4697112
|
Moving some folders around in the windows file system.
|
2011-06-03 22:31:18 +02:00 |
|
|
Henrik Andersson
|
7c7c42c4b6
|
Merge with default
|
2011-06-03 22:21:39 +02:00 |
|
|
Henrik Andersson
|
4bbeadd5f9
|
Merge with default
|
2011-06-02 20:43:15 +02:00 |
|
|
Henrik Andersson
|
8a16a6030d
|
Merge with default
|
2011-06-02 19:36:32 +02:00 |
|
|
Henrik Andersson
|
7b3561e43b
|
Merge with default
|
2011-06-02 18:36:17 +02:00 |
|
|
Henrik Andersson
|
04278c1f07
|
Merge with default
|
2011-06-01 20:51:21 +02:00 |
|
|
Henrik Andersson
|
148f557b6e
|
Merge with default
|
2011-06-01 14:59:09 +02:00 |
|
|
Henrik Andersson
|
f717de974e
|
Just tweaking some compiler switches.
|
2011-06-01 14:58:27 +02:00 |
|
|
Henrik Andersson
|
7ddd0e1fc2
|
Merge with default
|
2011-05-31 01:04:52 +02:00 |
|
|
Henrik Andersson
|
01368007aa
|
Merge with default
|
2011-05-30 11:27:34 +02:00 |
|
|
Henrik Andersson
|
ca71c99f63
|
Cleaning up some merge junk that I missed.
|
2011-05-30 11:25:09 +02:00 |
|
|
Henrik Andersson
|
79998641c3
|
Merge with default
|
2011-05-29 22:57:14 +02:00 |
|
|
Henrik Andersson
|
0235364283
|
Merge with default
|
2011-05-29 21:15:59 +02:00 |
|
|
Henrik Andersson
|
7379443cb3
|
The wheel merge result compiles! It also doesn't crash at runtime!
|
2011-05-29 20:40:28 +02:00 |
|
|
Henrik Andersson
|
9038ab8d65
|
Bail out from the loop if we run out of data.
|
2011-05-29 17:10:35 +02:00 |
|