|
|
f7fee506c9
|
various touch ups, minor bug fix.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@291 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-08-05 05:04:35 +00:00 |
|
|
|
e961872101
|
carms updates
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@290 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-08-03 23:27:17 +00:00 |
|
|
|
0b757f5885
|
merge of work/home changes
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@289 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-08-02 02:56:18 +00:00 |
|
|
|
da16f06cbc
|
stomped in changes done on nancy's dime
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@288 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-08-02 02:25:45 +00:00 |
|
|
|
b3b88bb194
|
- CEP: copy of engine so we can merge together some external changes.
- resolved project file conflict. using sperl's kdevelop config files.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@287 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-08-02 02:21:37 +00:00 |
|
|
|
467bcc8433
|
merge of changes from sperl machine. don't remember what I did (carm)
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@286 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-08-02 02:16:06 +00:00 |
|
|
|
40ab7afaa3
|
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@285 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-31 05:26:35 +00:00 |
|
|
|
7f85a477ce
|
cleanup and review of per pixel eqn matrix initialization
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@284 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-28 22:09:43 +00:00 |
|
|
|
3ee0923b3f
|
removed accidental printf
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@283 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-28 15:28:51 +00:00 |
|
|
|
34a81c8cab
|
PJS: carms stuff
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@282 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-28 05:02:37 +00:00 |
|
|
|
f095234a72
|
PJS: oops gy not gx
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@281 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-28 01:23:29 +00:00 |
|
|
|
feb019ae0e
|
PJS: oops gy not gx
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@280 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-28 01:22:13 +00:00 |
|
|
|
c9021aa11e
|
PJS: oops gy not gx
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@279 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-28 01:21:28 +00:00 |
|
|
|
8c38491e39
|
PJS: rendertarget updates
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@278 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-28 01:14:58 +00:00 |
|
|
|
a2251c9b37
|
PJS: initializing texsize at wrong time in rendertarget constructor
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@277 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-28 01:11:39 +00:00 |
|
|
|
47e6686ac6
|
added Algorithms.hpp to project. woops.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@276 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-28 00:39:33 +00:00 |
|
|
|
b2c1ee7838
|
added code to open a dwrite dump file in xmms layer
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@275 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-27 20:34:09 +00:00 |
|
|
|
1516f575c2
|
billions of fixes. no. gazillions.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@274 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-27 19:24:29 +00:00 |
|
|
|
11076ac56b
|
it runs and crashes somewhere interesting (PresetFrameIO?) with debug symbols working
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@273 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-27 05:34:41 +00:00 |
|
|
|
48027ffcb8
|
forgot.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@272 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-26 01:45:37 +00:00 |
|
|
|
86001df5ee
|
- SplayTree is gone! excellent.
- some issues with load_custom_wave/shape_init_conds. will resolve soon
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@271 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-21 02:41:35 +00:00 |
|
|
|
4730ed89c8
|
massive gutting and refactoring. sperl is lazy carnivore.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@270 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-18 02:21:03 +00:00 |
|
|
|
7066917125
|
splaytree gutting
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@269 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-16 04:39:22 +00:00 |
|
|
|
7cad288715
|
commit so sperl can play without. guacamole s
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@268 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-11 02:54:53 +00:00 |
|
|
|
3c36353375
|
fixed CustomShape::findParam reference error
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@267 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-10 04:54:16 +00:00 |
|
|
|
2dd1a190cf
|
Renderer bug fixes/reverts.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@266 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-10 04:14:06 +00:00 |
|
|
|
0995313599
|
undoing carms zealous overwriting
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@265 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-10 03:18:16 +00:00 |
|
|
|
16bc17f235
|
progress with prest inputs / outputs - per_pixe_ops[] or whatever is deprecated
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@264 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-10 00:01:49 +00:00 |
|
|
|
75a8102700
|
PJS: now compiling presetframeio.cpp and refactored construction of PresetFrameIO.cpp
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@263 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-09 04:13:49 +00:00 |
|
|
|
4c0c9988ca
|
added sperl's new cmakelist file and some weird kdevelop file
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@262 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-09 03:45:20 +00:00 |
|
|
|
5b719cf5da
|
fixed yet another reference error. next is in renderer again
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@261 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-09 03:35:18 +00:00 |
|
|
|
071afb4493
|
builds again with preset::find reference fixed hopefully
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@260 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-09 03:22:54 +00:00 |
|
|
|
ca067b8e0c
|
renamed PerFrameEqn.h -> hpp
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@259 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-09 00:11:36 +00:00 |
|
|
|
0736b1dd43
|
changed CValue.h->hpp
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@258 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-09 00:08:51 +00:00 |
|
|
|
44f6f136a6
|
changed FBO to USE_FBO
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@257 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-08 23:03:10 +00:00 |
|
|
|
b88d33d290
|
h -> hpp, project file update
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@256 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-08 23:02:20 +00:00 |
|
|
|
268133cbee
|
more h -> hpp conversions.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@255 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-08 23:01:32 +00:00 |
|
|
|
a25d09fa68
|
lots of h -> hpp conversion
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@254 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-08 22:49:02 +00:00 |
|
|
|
99455a65b6
|
changed Param.h and Parser.h -> hppS
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@253 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-08 22:36:40 +00:00 |
|
|
|
95aec70d01
|
changed Custom[Wave | Shape].h -> hpp
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@252 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-08 22:31:46 +00:00 |
|
|
|
2332cebbc9
|
changed IntCond.h -> hpp
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@251 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-08 22:28:11 +00:00 |
|
|
|
6574074a79
|
hacked glConsole to avoid font library problem. now renderer has similar issue. linking problem with ftgl?
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@250 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-08 22:21:19 +00:00 |
|
|
|
f42b4f63b4
|
- adding missing preset loader destructor
- next bug: _ZN6FTFont7AdvanceEPKc
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@249 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-08 22:08:34 +00:00 |
|
|
|
53b5ba8afe
|
- fixed CustomWave reference bugs
- fixed some other reference bugs (Renderer)
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@248 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-08 22:02:12 +00:00 |
|
|
|
a342563837
|
Carm, I told you how to fix this, you dumbass.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@247 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-08 21:45:27 +00:00 |
|
|
|
938f7c465d
|
got rid of PROJECTM_FILE_EXTENSION reference error
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@246 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-08 18:03:56 +00:00 |
|
|
|
888d566cd8
|
disabled menu system, removed activePreset - use m_activePreset
- glConsole is also probably busted
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@245 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-08 17:59:52 +00:00 |
|
|
|
5b5b07a07b
|
- added static definitions of renderer vars in projectM.cpp
- "other_font" is next unresolved symbol
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@244 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-08 17:23:12 +00:00 |
|
|
|
3da33617c0
|
eliminated two runtime link errors. projectMRenderTarget is next
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@243 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-07 01:56:12 +00:00 |
|
|
|
1218d620c1
|
minimized # of includes required by projectM, but added annoying heap allocation of preset iterator to do so.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@242 6778bc44-b910-0410-a7a0-be141de4315d
|
2007-07-07 01:43:39 +00:00 |
|