Commit Graph
30118 Commits
Author SHA1 Message Date
Jason Felds f941519e87 [sm130futures] Move the crypto stuff over.
This right now isn't used by us, but just in case...
2011-05-04 23:42:14 -04:00
Jason Felds cf220cb921 [sm130futures] Minor Windows fix. 2011-05-04 23:40:30 -04:00
Jason Felds 48a558e357 [sm130futures] Forgot non windows exclusive code. 2011-05-04 23:28:48 -04:00
Jason Felds b89dcc548f [sm130futures] Good on Windows...and Mac too?
We'll see if I'm lucky here.
2011-05-04 23:22:51 -04:00
Jason Felds 94d6cd9eb3 [sm130futures] png and jpeg at once. 2011-05-04 23:16:39 -04:00
Jason Felds 336c7276da [sm130futures] mad at simple Xcode tricks. 2011-05-04 23:10:34 -04:00
Jason Felds 4dedf4f3d2 [sm130futures] Well, Windows was easy on mad. 2011-05-04 23:07:57 -04:00
Jason Felds 7d88d88aad [sm130futures] mad's turn. 2011-05-04 23:00:20 -04:00
Jason Felds 3c75dd3e82 [sm130futures] Incremental Link Files excluded. 2011-05-04 22:49:06 -04:00
Jason Felds a8848d18aa [sm130futures] Mac caught up with pcre. 2011-05-04 22:46:34 -04:00
Jason Felds c2cdf0c763 [sm130futures] Not as much to change with pcre. 2011-05-04 22:42:23 -04:00
Jason Felds 765b3a7975 [sm130futures] Moving pcre now. 2011-05-04 22:33:51 -04:00
Jason Felds 060547d0ac [sm130futures] json covered. 2011-05-04 22:30:04 -04:00
Jason Felds 5e872ece44 [sm130futures] Apply 4996 commit to all builds. 2011-05-04 22:18:18 -04:00
Jason Felds 7e39f24cc1 [sm130futures] Disable C4996 in the vcproj.
I think we can start removing the pragmas now.
2011-05-04 22:16:13 -04:00
Jason Felds d8f2e2ed20 [sm130futures] json good on Windows. 2011-05-04 22:11:55 -04:00
Jason Felds 83df0ad3d6 [sm130futures] jsoncpp -> extern
This won't build on Windows or Mac OS X yet.
2011-05-04 22:00:52 -04:00
Jason Felds b17536b649 [sm130futures] Windows builds fine w/Lua location.
Linux side needs to be updated...but still more to move.
2011-05-04 21:23:09 -04:00
Jason Felds 98896cc948 [sm130futures] Bring Helpers out of Rage.
...no, I don't know why they got in there.
2011-05-04 19:38:09 -04:00
Jason Felds 808f67e9f0 [sm130futures] Start moving externs to consistent location. 2011-05-04 17:56:36 -04:00
Jason Felds 4e8b475377 [sm130futures] Remove constructor hiding warning.
We had a struct called "Theme" that was throwing things off.
2011-05-04 17:24:03 -04:00
Jason Felds 1e6a4d4ef0 [sm130futures] Organize externs in the project file.
Due up: organize externs in the hard drive.
2011-05-04 17:19:06 -04:00
Jason Felds 9c1084b63e [default -> sm130futures] Bring in GLEW. 2011-05-04 17:08:57 -04:00
Jason Felds 1aef2c25d4 Manual attempts at updating old VS projects.
Again, I'll ask. Do we need to keep VS2003 support?
2011-05-04 17:05:32 -04:00
Jason Felds befef92624 Right, the recent GLEW fixes. Can't forget those. 2011-05-04 16:49:18 -04:00
Jason Felds 6ae77039c9 Consistent measure comments with internals.
For some time, we had the text file use // measure 1
when it was measure 0 internally.

As usual, revert if this is a bad idea. It's just bugging me.
2011-05-04 16:48:48 -04:00
AJ Kelly f9514958bf put wglew behind #if defined(WINDOWS) 2011-05-04 00:33:32 -05:00
AJ Kelly 2251baf10c simplify like fuc 2011-05-04 00:31:42 -05:00
AJ Kelly 0b32783697 this seems to fix the compile on Windows; not sure if it's the best way of doing it, though. 2011-05-04 00:26:12 -05:00
Jason Felds ca68672e01 FILE, not DIRECTORY! 2011-05-03 22:31:08 -04:00
Jason Felds fa536fd24b Looks like I missed a few environments. 2011-05-03 22:23:16 -04:00
Jason Felds e281fd7183 lua had " put it here to see. 2011-05-03 22:20:37 -04:00
Jason Felds 4e22702026 Try different variable name, only one <Filter>.
We'll get this figured out...
2011-05-03 22:09:15 -04:00
Jason Felds d19de4ed1e shakesoda's suggestions for more glew stuff.
Again, revert if a terrible idea.
2011-05-03 21:59:59 -04:00
Jason Felds 0d911c535b My attempt at fixing VS2008 compilation.
Revert this if it proves to be broken beyond repair.
2011-05-03 21:53:51 -04:00
Jason Felds 279194713d [sm130futures] Scale the LabelSegments. 2011-05-03 12:58:08 -04:00
Jason Felds 630168d64b [sm130futures] Allow editing more Song Info in menus.
In this case, Beat 0 Offset, Music Sample Start,
and Music Sample Length can be edited via Edit Song Info.
2011-05-03 09:18:31 -04:00
Jason Felds 04c151b436 [sm130futures] Need to get used to calling this sm5. 2011-05-03 09:11:51 -04:00
Jason Felds 39d5e8f676 [sm130futures] Typo fix; force version update. 2011-05-02 22:36:20 -04:00
Jason Felds 70e944a959 [sm130futures] Deal with blank lines on write.
Yes, it's another cache restarter.
2011-05-02 22:15:14 -04:00
Jason Felds deadd99699 [sm130futures] Restore label jumping. 2011-05-02 21:54:20 -04:00
Jason Felds 89dafe6fe1 [sm130futures] Ensure tabs lined up right.
Shouldn't we use spaces instead?
2011-05-02 21:20:32 -04:00
Jason Felds 7df88b21f1 ...maybe I should have never introduced .hgeol. 2011-05-02 21:17:08 -04:00
Jason Felds e2c8ab809b Umm...had another empty merge here. 2011-05-02 21:16:27 -04:00
Jason Felds 9bb7b633c9 [default -> sm130futures] Hello GLEW. 2011-05-02 21:12:11 -04:00
AJ Kelly fb1dbd4463 merge 2011-05-02 20:11:26 -05:00
AJ Kelly 34e3127a29 remove spaces from line begin 2011-05-02 20:11:09 -05:00
Jason Felds 530a681e48 Guess I'm the line ending guardian. 2011-05-02 21:07:31 -04:00
Colby Klein 39953f16b1 Require lower version of GLEW. I don't believe we use anything from newer than 2.1. 2011-05-02 17:47:23 -07:00
Colby Klein 8c22b4573e merge opengl -> default. this might break d3d (sorry if it does!) 2011-05-02 17:35:02 -07:00