edu <eduardo@pepe.es>
2011-07-19 18:11:38 +0200
core/cedui/cedbase.cpp
core/cedui/cedbase.h
core/cedui/cedbases.cpp
core/cedui/cedbases.h
core/cedui/cedfloat.cpp
core/cedui/cskin.cpp
core/cedui/edwinedit.cpp
core/cedui/glwdg.cpp
core/cedui/glwdg.h
core/exe/cwindow.cpp
core/exe/eddbs.cpp
core/exe/edfolder.cpp
core/exe/edicon.cpp
core/exe/edipfmode.cpp
core/exe/edlistclass.cpp
core/exe/edpipe.cpp
core/exe/edproduction.cpp
core/exe/edskin.cpp
core/exe/edtree.cpp
core/glui/SConscript
core/glui/gluiArrowButton.cpp
core/glui/gluiBitmap.cpp
core/glui/gluiBitmap.h
core/glui/gluiButton.cpp
core/glui/gluiCanvas.cpp
core/glui/gluiCommon.h
core/glui/gluiControl.cpp
core/glui/gluiControl.h
core/glui/gluiFile.cpp
core/glui/gluiLabel.cpp
core/glui/gluiLabel.h
core/glui/gluiLib.cpp
core/glui/gluiLib.h
core/glui/gluiListEditor.cpp
core/glui/gluiOption.cpp
core/glui/gluiPanel.cpp
core/glui/gluiPanel.h
core/glui/gluiPopup.cpp
core/glui/gluiSplitContainer.cpp
core/glui/gluiSplitContainer.h
core/glui/gluiTab.cpp
core/glui/gluiTab.h
core/glui/gluiText.cpp
core/glui/gluiTimer.cpp
core/glui/gluiToggle.cpp
core/glui/gluiWindow.cpp
core/glui/gluiWindow.h
core/inter/cbelltree.cpp
core/inter/cbelltree.h
core/inter/clistbell.cpp
core/inter/clistbell.h
core/ipf/cipfmode.cpp
core/ipf/cpipe.cpp
core/ipf/cpipe.h
core/ipf/ctext.cpp
core/ipf/ctext.h
core/m3/m3PipeWindow.cpp
core/m3/m3util.cpp
core/mat/libmat.cpp
core/mat/libmat.h
core/wdg/caction.cpp
core/wdg/ceditor.cpp
core/wdg/cedtree.cpp
core/wdg/cedtree.h
core/wdg/cfolder.cpp
core/wdg/cicon.cpp
core/wdg/cicon.h
core/wdg/edeffects.cpp
core/wdg/edeffects.h
core/wdg/wdgMainLoop.cpp
core/win/Timer.cpp
core/win/Timer.h
core/win/awWindow.cpp
core/win/awWindow.h
core/win/hWindow.cpp
core/win/hWindow.h
core/win/iWindow.h
core/win/iWindowEvents.h
core/glui/cscissor.cpp
core/glui/cscissor.h
merge que no acabo de entender
2babe5c449c6274f052a8bda9637c247ea210e23
c5574f08e629ed4e45c4fefaec694ebf987ef95d
edu <eduardo@pepe.es>
2011-07-20 12:46:10 +0200
core/exe/edtext.cpp
core/ipf/ctext.cpp
core/ipf/ctext.h
Cambio para poder tocar todos los campos de un estilo
aacc9c425a07e36b2a5af51740c3cbb20a510b21
0000000000000000000000000000000000000000
boro <boro@pepe.es>
2011-07-20 13:18:54 +0200
core/cedui/cedstring.cpp
core/cedui/cedstring.h
core/glui/gluiText.cpp
core/glui/gluiText.h
Eventos para edu, a falta de que me vaya bien para completarlo
aacc9c425a07e36b2a5af51740c3cbb20a510b21
0000000000000000000000000000000000000000
boro <boro@pepe.es>
2011-07-20 13:33:34 +0200
core/exe/edtext.cpp
core/ipf/ctext.cpp
core/ipf/ctext.h
Merge con los cambios de edu
b4bf1fdf865ad6568326bfe9f92a0280a86a4e37
a80ba6ea0d148915d141f7fa7c22ec1db6cf14e3
moi <moises@pepe.es>
2011-07-20 13:57:53 +0200
core/exe/edtext.cpp
core/ipf/ctext.cpp
core/ipf/ctext.h
core/m3s/m3sStrap.cpp
core/m3s/m3sStrap.h
Añadidos labels informativos en los straps de texto
3db52c5d5c4ad97d7fed5d902413377a8bee064e
0000000000000000000000000000000000000000
boro <boro@pepe.es>
2011-07-20 18:58:50 +0200
core/glui/gluiText.cpp
core/glui/gluiText.h
Completado el envio de eventos de insercion y borrado de texto en gluiText
9a682d71bad81925f1211cefe1d3fa1f253938bd
0000000000000000000000000000000000000000
boro <boro@pepe.es>
2011-07-20 19:34:05 +0200
core/glui/gluiText.cpp
core/glui/gluiText.h
Aun mas completo el envio de eventos en gluiText
0d0d0a2e9392dd79475b5c71dd04663b97652ba8
0000000000000000000000000000000000000000
boro <boro@pepe.es>
2011-07-20 19:56:40 +0200
core/win/awWindow.cpp
Arreglado que el cursor desaparezca, no tiene porque desaparecer
5e591bb2fa04096c1664d90988ab2cf61b3788a7
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-18 20:54:10 +0200
core/exe/edicon.cpp
core/glui/gluiTab.cpp
core/glui/gluiTab.h
core/wdg/cicon.cpp
core/wdg/cicon.h
ajustes margins tabs
88dca485c87be744c2aa3d6580d31728d5a35d90
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-18 21:01:29 +0200
core/glui/gluiTab.cpp
tab close
65360e05e3b656bb3099b5fad22f52818efc2140
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-19 10:29:56 +0200
core/exe/edtree.cpp
core/glui/gluiFile.cpp
core/wdg/cedtree.cpp
core/wdg/cedtree.h
EDTREE_FIT_MODE
f88c9ef5029fdfd649c384ad249cece48950df47
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-19 20:30:55 +0200
core/cedui/cedfloat.cpp
core/cedui/cedfloati.cpp
core/wdg/ceditor.cpp
core/wdg/cedtree.cpp
core/wdg/cedtree.h
fit labels arreglado
reorder cedtree effectsSets
193dc83756881d5b06875f3334e403bda8865fae
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-20 19:01:28 +0200
core/inter/cslist.cpp
bug getTextRepresentation de cstructList
5c57591d50a8a768feb241380b0ee62ed1db023c
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-20 19:04:19 +0200
core/cedui/cedbase.cpp
core/cedui/cedfloati.cpp
core/glui/gluiControl.cpp
core/wdg/ceditor.cpp
core/wdg/cedtree.cpp
effects con cedfloatis con componentes desmanejadas salgan tb en el effect
a81473fbddcd37147c50ed28404a5f5946b9d5c1
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-20 19:33:17 +0200
core/exe/edtree.cpp
core/wdg/cedtree.cpp
core/wdg/cedtree.h
Soporte para slider range en edtree para effects
b64384407301f035d37111aedf16762caa2128c1
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-20 20:26:53 +0200
core/exe/edobj.cpp
core/ipf/cobj.cpp
core/ipf/cobj.h
obj setBBox editores
382e17d0774aac5934558d55028cc46711fb84ed
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-20 20:32:21 +0200
core/cedui/cedstring.cpp
core/cedui/cedstring.h
core/exe/edtext.cpp
core/glui/gluiControl.cpp
core/glui/gluiControl.h
core/glui/gluiText.cpp
core/glui/gluiText.h
core/glui/gluiWindow.cpp
core/glui/gluiWindow.h
core/ipf/ctext.cpp
core/ipf/ctext.h
core/win/awWindow.cpp
merge
2124d796c52d926aee508290af1801e8e51b1916
d99a3dc4b41db143da18993064e0a74e2fd5349b
rafa <rodi@pepe.es>
2011-07-20 11:39:45 +0200
core/ipf/cfont.cpp
core/ipf/cfont.h
core/ipf/cshader.h
core/m3f/m3fTexfont.cpp
core/m3t/m3tParamsShapeFilter.cpp
core/m3t/m3tParamsShapeFilter.h
core/m3u/m3uOstreamMng.cpp
core/m3u/m3uOstreamMng.h
-conectando cfont con shader de tipo font.
-codigo de fuentes texturadas antiguo y nuevo bifurcado.
4f7166de891563a53be06a5b805dd4699583528c
0000000000000000000000000000000000000000
rafa <rodi@pepe.es>
2011-07-21 08:22:00 +0200
core/exe/edfont.cpp
core/exe/edtext.cpp
core/glutil/glimg.cpp
core/glutil/glimg.h
core/ipf/cfont.cpp
core/ipf/cfont.h
core/ipf/ctext.cpp
core/ipf/ctext.h
core/m3f/m3fTexfont.cpp
core/m3f/m3fTexfont.h
core/m3s/m3sStrap.cpp
core/m3s/m3sStrap.h
core/m3t/m3tParamsShapeFilter.cpp
core/m3t/m3tParamsShapeFilter.h
-integrando cfonts y shader.
640beea4eaa56e7617ac3c663c223f76c694a0d5
3db52c5d5c4ad97d7fed5d902413377a8bee064e
rafa <rodi@pepe.es>
2011-07-21 08:22:45 +0200
core/exe/edtext.cpp
core/ipf/ctext.cpp
core/ipf/ctext.h
core/m3s/m3sStrap.cpp
core/m3s/m3sStrap.h
merge
c794d313bfca3c943f80527294bb8cff6b3162ec
8757bfb1cd98ba0de76fea23508a5b906e5056bd
moi <moises@pepe.es>
2011-07-21 09:14:22 +0200
core/cedui/cedbase.cpp
core/cedui/cedbase.h
core/cedui/cedbases.cpp
core/cedui/cedbases.h
core/cedui/cedfloat.cpp
core/cedui/cedfloati.cpp
core/cedui/cedstring.cpp
core/cedui/cedstring.h
core/cedui/cskin.cpp
core/cedui/edwinedit.cpp
core/cedui/glwdg.cpp
core/cedui/glwdg.h
core/exe/cwindow.cpp
core/exe/eddbs.cpp
core/exe/edfolder.cpp
core/exe/edicon.cpp
core/exe/edipfmode.cpp
core/exe/edlistclass.cpp
core/exe/edobj.cpp
core/exe/edpipe.cpp
core/exe/edproduction.cpp
core/exe/edskin.cpp
core/exe/edtext.cpp
core/exe/edtree.cpp
core/glui/SConscript
core/glui/gluiArrowButton.cpp
core/glui/gluiBitmap.cpp
core/glui/gluiBitmap.h
core/glui/gluiButton.cpp
core/glui/gluiCanvas.cpp
core/glui/gluiCommon.h
core/glui/gluiControl.cpp
core/glui/gluiControl.h
core/glui/gluiFile.cpp
core/glui/gluiLabel.cpp
core/glui/gluiLabel.h
core/glui/gluiLib.cpp
core/glui/gluiLib.h
core/glui/gluiListEditor.cpp
core/glui/gluiListTwin.cpp
core/glui/gluiOption.cpp
core/glui/gluiPanel.cpp
core/glui/gluiPanel.h
core/glui/gluiPopup.cpp
core/glui/gluiScrollListUpdowns.cpp
core/glui/gluiSplitContainer.cpp
core/glui/gluiSplitContainer.h
core/glui/gluiSubWinText.cpp
core/glui/gluiSubWinText.h
core/glui/gluiTab.cpp
core/glui/gluiTab.h
core/glui/gluiText.cpp
core/glui/gluiText.h
core/glui/gluiTimer.cpp
core/glui/gluiToggle.cpp
core/glui/gluiWindow.cpp
core/glui/gluiWindow.h
core/inter/cbelltree.cpp
core/inter/cbelltree.h
core/inter/clistbell.cpp
core/inter/clistbell.h
core/inter/cslist.cpp
core/ipf/cbyframe.cpp
core/ipf/cipfmode.cpp
core/ipf/cobj.cpp
core/ipf/cobj.h
core/ipf/cpipe.cpp
core/ipf/cpipe.h
core/ipf/ctext.cpp
core/ipf/ctext.h
core/m3/m3PipeWindow.cpp
core/m3/m3util.cpp
core/mat/libmat.cpp
core/mat/libmat.h
core/var/cripf.cpp
core/wdg/caction.cpp
core/wdg/ceditor.cpp
core/wdg/cedtree.cpp
core/wdg/cedtree.h
core/wdg/cfolder.cpp
core/wdg/cicon.cpp
core/wdg/cicon.h
core/wdg/clistclass.cpp
core/wdg/edeffects.cpp
core/wdg/edeffects.h
core/wdg/wdgCList.cpp
core/wdg/wdgList.cpp
core/wdg/wdgListOverlay.cpp
core/wdg/wdgMainLoop.cpp
core/win/Timer.cpp
core/win/Timer.h
core/win/awWindow.cpp
core/win/awWindow.h
core/win/hWindow.cpp
core/win/hWindow.h
core/win/iWindow.h
core/win/iWindowEvents.h
core/glui/cscissor.cpp
core/glui/cscissor.h
core/glui/gluiSubWindowManager.cpp
core/glui/gluiSubWindowManager.h
merge default
f773cdb8fb4046eb1f1d8b44963dfae15e019ffb
15596064f035340dcee6e67173327f9f782fdfe1
edu <eduardo@pepe.es>
2011-07-21 09:20:31 +0200
core/exe/edtext.cpp
Las llamadas a updateM3Text desde X provocaban muchos asserts.
a80ba6ea0d148915d141f7fa7c22ec1db6cf14e3
0000000000000000000000000000000000000000
edu <eduardo@pepe.es>
2011-07-21 09:21:26 +0200
core/cedui/cedbase.cpp
core/cedui/cedfloat.cpp
core/cedui/cedfloati.cpp
core/cedui/cedstring.cpp
core/cedui/cedstring.h
core/exe/edicon.cpp
core/exe/edobj.cpp
core/exe/edtree.cpp
core/glui/gluiControl.cpp
core/glui/gluiFile.cpp
core/glui/gluiTab.cpp
core/glui/gluiTab.h
core/glui/gluiText.cpp
core/glui/gluiText.h
core/inter/cslist.cpp
core/ipf/cobj.cpp
core/ipf/cobj.h
core/wdg/ceditor.cpp
core/wdg/cedtree.cpp
core/wdg/cedtree.h
core/wdg/cicon.cpp
core/wdg/cicon.h
core/win/awWindow.cpp
merge
3655515b9fb0ca10bec060235251e5cb082f9a67
15596064f035340dcee6e67173327f9f782fdfe1
moi <moises@pepe.es>
2011-07-21 11:17:19 +0200
core/exe/edshader.cpp
core/exe/edtext.cpp
core/ipf/cfonteffect.cpp
core/ipf/cshader.cpp
core/ipf/cshader.h
Eliminado assert en cshader. Añadida función de reset en cshader para borrar pasadas y recursos
0095aaaeb578354dee16e1570bc89e19249f0748
fd3c8bc044a2aa8c68d75216f8a71438310e0789
boro <boro@pepe.es>
2011-07-21 12:34:33 +0200
core/cedui/cedbase.cpp
Cambiado el metodo setWidgetParent en cedbase para arreglar un bug. Por favor, que alguien lo revise
d99a3dc4b41db143da18993064e0a74e2fd5349b
0000000000000000000000000000000000000000
boro <boro@pepe.es>
2011-07-21 12:35:03 +0200
core/cedui/cedbase.cpp
core/cedui/cedfloat.cpp
core/cedui/cedfloati.cpp
core/exe/edicon.cpp
core/exe/edobj.cpp
core/exe/edtext.cpp
core/exe/edtree.cpp
core/glui/gluiControl.cpp
core/glui/gluiFile.cpp
core/glui/gluiTab.cpp
core/glui/gluiTab.h
core/inter/cslist.cpp
core/ipf/cobj.cpp
core/ipf/cobj.h
core/wdg/ceditor.cpp
core/wdg/cedtree.cpp
core/wdg/cedtree.h
core/wdg/cicon.cpp
core/wdg/cicon.h
Merge
34bfaf3a6136a2c13b150fd005f1bad5da4bb69e
fd3c8bc044a2aa8c68d75216f8a71438310e0789
boro <boro@pepe.es>
2011-07-21 12:38:16 +0200
core/win/awWindow.cpp
Rectificado parche para el raton, aun no esta claro
88a3c3ce8bf89eddb423cef8c21053871feed271
0000000000000000000000000000000000000000
rafa <rodi@pepe.es>
2011-07-21 13:14:13 +0200
core/exe/edfont.cpp
core/exe/edshader.cpp
core/ipf/cfont.cpp
core/ipf/cshader.cpp
core/ipf/cshader.h
core/m3/m3Pass.cpp
core/m3/m3State.cpp
core/m3t/m3tFboTechApplier.cpp
-auxFbo desactivado al salir de technique.
-notificaciones entre cshader y cfont.
f773cdb8fb4046eb1f1d8b44963dfae15e019ffb
0000000000000000000000000000000000000000
rafa <rodi@pepe.es>
2011-07-21 14:04:57 +0200
core/m3/m3Pass.cpp
core/m3/m3State.cpp
core/m3/m3State.h
core/m3/m3Technique.cpp
core/m3t/m3tFboTechApplier.cpp
core/m3t/m3tTechApplier.cpp
-filtros de pipe funcionando de nuevo. tb los shaders de font.
77191aa225ad4b41230e7b569b103453850995fb
0000000000000000000000000000000000000000
rafa <rodi@pepe.es>
2011-07-21 14:30:12 +0200
core/m3/m3State.cpp
-quitadas trazas.
1f9e32d5fe4bc49cdae3bdd456511a759a36e78d
0000000000000000000000000000000000000000
boro <boro@pepe.es>
2011-07-22 10:39:47 +0200
core/wdg/ceditor.cpp
core/win/awWindow.cpp
Cambiado el tema de eventos en el pegado de texto en un ceditor. Revisar tambien
83bf2613289e0be71bfe8d8c60c1c432dc76b874
0000000000000000000000000000000000000000
boro <boro@pepe.es>
2011-07-22 11:02:39 +0200
core/cedui/cedstring.cpp
core/cedui/cedstring.h
Añadido el data para los eventos del insercion/borrado de texto en el cedstring
57cdd30e4d9069a4236089a3a3bf6758aefa9a1d
0000000000000000000000000000000000000000
boro <boro@pepe.es>
2011-07-22 13:01:37 +0200
core/cedui/cedstring.cpp
core/cedui/cedstring.h
Añadiendo nombre de variables a los metodos
22767e1516269b596c9e5b9f74997599c18d3efe
0000000000000000000000000000000000000000
boro <boro@pepe.es>
2011-07-22 13:02:02 +0200
core/glui/gluiWindow.cpp
Arreglando bug cuando se seleccionaba otra ventana al editar un texto
923ad815b954eb2ff4489920535cae0666f272b6
0000000000000000000000000000000000000000
boro <boro@pepe.es>
2011-07-22 13:29:03 +0200
core/glui/gluiControl.cpp
core/glui/gluiLib.h
core/glui/gluiWindow.cpp
core/win/glutMigration.h
Quitando variables GLUT_UP y GLUT_DOWN del codigo
7c98d04cafc9432738793881b1502670ce661d26
0000000000000000000000000000000000000000
moi <moises@pepe.es>
2011-07-25 08:15:58 +0200
core/cedui/cedbase.cpp
core/exe/edshader.cpp
core/ipf/cshader.cpp
core/ipf/cshader.h
core/m3t/m3tParamsShapeFilter.cpp
Eliminados asserts
1dcacb4cd394a5d69bd72470850637e9c4043cf9
0000000000000000000000000000000000000000
rafa <rodi@pepe.es>
2011-07-25 08:16:51 +0200
core/ipf/cfont.cpp
-fonts y shaders.
1dcacb4cd394a5d69bd72470850637e9c4043cf9
0000000000000000000000000000000000000000
rafa <rodi@pepe.es>
2011-07-25 08:27:11 +0200
core/cedui/cedbase.cpp
core/exe/edshader.cpp
core/ipf/cshader.cpp
core/ipf/cshader.h
core/m3t/m3tParamsShapeFilter.cpp
merge
1aea81a7121237708e59442b62149a03b5a364e0
bb7756215848645ca361b8e054e7514424b37946
moi <moises@pepe.es>
2011-07-25 10:56:59 +0200
core/exe/edshader.cpp
core/ipf/cpipe.cpp
core/ipf/cpipe.h
Movido código de generación de m3Technique de los filtros de pipe de X a APP
ff4e9b0626e964cd70b3ee9bcee0d00cd1846034
0000000000000000000000000000000000000000
boro <boro@pepe.es>
2011-07-25 11:53:49 +0200
core/cedui/cedstring.cpp
core/cedui/cedstring.h
Quitado el campo data para los eventos Add/Delete de cedstring
7748e81f0b02bd194a1d4b71effb5c0b9949eea3
0000000000000000000000000000000000000000
rafa <rodi@pepe.es>
2011-07-25 11:00:11 +0200
core/m3t/m3tParamsShapeFilter.cpp
margenes fonts texturados
ff4e9b0626e964cd70b3ee9bcee0d00cd1846034
0000000000000000000000000000000000000000
rafa <rodi@pepe.es>
2011-07-25 11:03:43 +0200
core/exe/edshader.cpp
core/ipf/cpipe.cpp
core/ipf/cpipe.h
merge
757e15bc6c26b50d0b1e25ae59ef6030748596e7
2547715d45a2905bce77e592f3f521cd664cc9c4
rafa <rodi@pepe.es>
2011-07-25 12:33:48 +0200
core/ipf/cfonteffect.cpp
core/m3/m3Pass.cpp
core/m3f/m3fTexfont.cpp
core/m3t/m3tParamsShapeFilter.cpp
-dimensiones de los geosets de m3Font funcionando bien con shader.
5d1a2bdb1b7a153fd3b55434aeb0adfe84654126
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-22 21:37:22 +0200
core/cedui/cedfloat.cpp
core/glui/gluiText.cpp
core/glui/gluiText.h
core/glui/gluiWindow.cpp
- Autoincremento de editores float al mover el cursor fuera de la caja.
- Seleccion de text solo se muestre si el control es el activo
- Tab de controls daba asserts
7748e81f0b02bd194a1d4b71effb5c0b9949eea3
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-23 11:38:43 +0200
core/glui/gluiControl.cpp
core/glui/gluiList.cpp
core/glui/gluiList.h
core/glui/gluiListGraphIcons.cpp
core/glui/gluiWindow.cpp
gluiList Drag coja start coords drag en la linea que toca.
gluiListGraphIcons dibuje area de thumbbox tambien
click up borre dragArrow
944ada89f0c4b8aaad8e04368a43a41b19b2ae6c
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-23 21:14:20 +0200
core/cedui/cedoption.cpp
core/cedui/cedsel.cpp
core/cedui/cupdowns.cpp
core/exe/edfolder.cpp
core/glui/gluiControl.cpp
core/glui/gluiControl.h
core/glui/gluiList.cpp
core/glui/gluiSplitContainer.cpp
core/glui/gluiTab.cpp
core/glui/gluiText.cpp
core/glui/gluiText.h
core/glui/gluiWindow.cpp
core/glui/gluiWindow.h
core/wdg/ceditor.cpp
core/wdg/cedlist.cpp
core/wdg/cedtree.cpp
core/wdg/cfolder.cpp
core/wdg/cfolder.h
core/wdg/cicon.cpp
core/wdg/edsets.cpp
cicon::getIconStartDrag en vez de getIconOver
gluiText autoincfloat undo
gluiWindow getOverWindowOverControl
ec019e1d0b31edff655483e9a2b50e65f3891ecd
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-23 21:25:10 +0200
core/glui/gluiSplitContainer.cpp
lineas bordes en draw splitcontainer
f1a509dc35615ecfebe9bf67f34adad827fe7f99
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-24 10:43:50 +0200
core/wdg/cedlist.cpp
Llame mat cedlist::doDespliegaEditing al cargar sets en heorot
8da740fa7d51729029fdf07e3106b0d79b36c55b
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-24 12:00:15 +0200
core/exe/edicon.cpp
core/exe/edlistclass.cpp
core/exe/edtree.cpp
core/wdg/cedtree.cpp
core/wdg/clistclass.cpp
core/wdg/clistclass.h
Modo global de edtree fit effects LIST_FIT_EFFECTS y comentado que se muestre EDTREE_FIT_MODE
Evitado scrollbars en heorot por SPLIT_THICKNESS
26b8cac1330bab4e75b8b796e5ad8a829a3f351d
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-24 13:12:41 +0200
core/glui/SConscript
core/glui/gluiControl.cpp
core/glui/gluiControl.h
core/glui/gluiRollout.cpp
core/ipf/cobj.cpp
core/wdg/cedtree.cpp
core/glui/gluiSeparator.cpp
core/glui/gluiSeparator.h
Enable/Disable Global Effects cascaba
gluiRollout tiene ahora un Separator
7e1cd44e2756358eda9ea4f982135cb6cd5fec44
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-24 16:14:05 +0200
core/glui/gluiRollout.h
gluiRollout.h
dc168b40777bfb57418caf40cba88781d206e4fd
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-24 19:39:11 +0200
core/glui/gluiControl.cpp
core/glui/gluiScrollPanelDock.cpp
core/glui/gluiScrollPanelDock.h
core/wdg/clistclass.cpp
Apanyo en gluiControl::attachChildrenToParent para que el gluiScrollPanelDock
attachee en el 1er update
8bdbc86ab0dcfd6be52f0572208993dee5497d3e
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-24 19:52:29 +0200
core/exe/edobj.cpp
OBJ_ALPHA_MODE y OBJ_BILLBOARD llamen a EdUpdateList o no se actualizaba bien en el Effect
0900ef93dbe857b8dbc53225622b2a8bfa2c6b4a
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-24 23:22:13 +0200
core/cedui/cedfloati.cpp
core/exe/ededitor.cpp
core/exe/floatpopup.cpp
core/glui/gluiControl.cpp
core/glui/gluiText.cpp
core/glui/gluiTextTable.cpp
core/glui/gluiTextTable.h
core/wdg/ceditor.cpp
core/wdg/ceditor.h
core/wdg/cedtree.cpp
core/wdg/edref.cpp
ceditor::updateOptionListsPresets() llamado con force desde donde debe
246c2f2b0f3cd8a3097e2820e192ecb645913217
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-24 23:23:22 +0200
core/exe/floatpopup.cpp
floatpopup no acepte !bellModified otra vez
46675b352b560a57cd6202410c13d176ba184e5d
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-25 12:59:21 +0200
core/inter/cstring.cpp
cambios en getNumLinesNL
2ed600e6fa141f98696c14d0f2925e1102520392
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-25 13:04:09 +0200
core/cedui/cedsel.cpp
core/cedui/cupdowns.cpp
core/cedui/cupdowns.h
core/inter/cstring.h
fit de cedsel.
cstring getNumLineNL
05caf6d093fc9657cdeba55f55ff2f7d2ffbee17
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-25 13:04:34 +0200
core/cedui/cedstring.cpp
core/cedui/cedstring.h
merge
9e8ab04e897bc854fba6862d00c0bfbf849e7351
0793a857149810d3de7ab7234961073114fe8827
moi <moises@pepe.es>
2011-07-25 12:56:43 +0200
core/m3t/m3tParamsShapeFilter.cpp
Aplicado Unpremultiply al shader de Decorations. Arreglada rutina de computeMargins para cálculo de fonts por GPU
2547715d45a2905bce77e592f3f521cd664cc9c4
0000000000000000000000000000000000000000
moi <moises@pepe.es>
2011-07-25 13:07:22 +0200
core/ipf/cfonteffect.cpp
core/m3/m3Pass.cpp
core/m3f/m3fTexfont.cpp
core/m3t/m3tParamsShapeFilter.cpp
merge
fdabcaa75eec2cae0aba3d2a4326cc1cc83cd7b7
ebf0da4104e7b9bd7b1901a4b19f0897f7d31a10
ric <ric@pepe.es>
2011-07-25 13:10:01 +0200
core/inter/cstring.h
cstring.h error
8fa4e1f28527d8ef47da06467bd18fad327b2307
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-25 13:15:40 +0200
core/inter/cstring.cpp
cstring.c error
2a2ad65e331ed9e079606913642e3f2709259a88
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-25 13:18:51 +0200
core/inter/cstring.cpp
.
e21af05f3f6dd0bb2035478bee70ca0ab0d088a1
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-25 14:03:46 +0200
core/ipf/geoextruded.cpp
cambiando OBJ_BBOX_SET_MIN y MAX en geoextruded cambiaba la posicion a cada iteracion
bd443d558601c8850d7dc6076c7fe4d22bb772a0
0000000000000000000000000000000000000000
rafa <rodi@pepe.es>
2011-07-25 14:16:46 +0200
core/ipf/cfont.cpp
-cshader notificando a cfont.
ebf0da4104e7b9bd7b1901a4b19f0897f7d31a10
0000000000000000000000000000000000000000
rafa <rodi@pepe.es>
2011-07-25 14:17:41 +0200
core/m3t/m3tParamsShapeFilter.cpp
merge
52e30c458cdcc09a427912520196d68d71ef3735
e8258d3768cbcdd9c61c0e58fc50e706021fcd44
boro <boro@pepe.es>
2011-07-25 18:02:37 +0200
core/glui/gluiText.cpp
Ahora se puede tabular codigo en editores de texto
0793a857149810d3de7ab7234961073114fe8827
0000000000000000000000000000000000000000
boro <boro@pepe.es>
2011-07-25 18:03:08 +0200
core/cedui/cedfloat.cpp
core/cedui/cedfloati.cpp
core/cedui/cedoption.cpp
core/cedui/cedsel.cpp
core/cedui/cupdowns.cpp
core/cedui/cupdowns.h
core/exe/ededitor.cpp
core/exe/edfolder.cpp
core/exe/edicon.cpp
core/exe/edlistclass.cpp
core/exe/edobj.cpp
core/exe/edtree.cpp
core/exe/floatpopup.cpp
core/glui/SConscript
core/glui/gluiControl.cpp
core/glui/gluiControl.h
core/glui/gluiList.cpp
core/glui/gluiList.h
core/glui/gluiListGraphIcons.cpp
core/glui/gluiRollout.cpp
core/glui/gluiRollout.h
core/glui/gluiScrollPanelDock.cpp
core/glui/gluiScrollPanelDock.h
core/glui/gluiSplitContainer.cpp
core/glui/gluiTab.cpp
core/glui/gluiText.cpp
core/glui/gluiText.h
core/glui/gluiTextTable.cpp
core/glui/gluiTextTable.h
core/glui/gluiWindow.cpp
core/glui/gluiWindow.h
core/inter/cstring.cpp
core/inter/cstring.h
core/ipf/cobj.cpp
core/ipf/geoextruded.cpp
core/wdg/ceditor.cpp
core/wdg/ceditor.h
core/wdg/cedlist.cpp
core/wdg/cedtree.cpp
core/wdg/cfolder.cpp
core/wdg/cfolder.h
core/wdg/cicon.cpp
core/wdg/clistclass.cpp
core/wdg/clistclass.h
core/wdg/edref.cpp
core/wdg/edsets.cpp
core/glui/gluiSeparator.cpp
core/glui/gluiSeparator.h
Merge
d7d2c3af5a12f6f46ad3e80cafbf7bbbb30e2bc9
3bcd9a749baf7d14dbfb45b483283c04e2885cb2
ric <ric@pepe.es>
2011-07-25 18:16:04 +0200
core/exe/edobj.cpp
core/glui/gluiRollout.cpp
core/glui/gluiRollout.h
core/glui/gluiTearPanel.cpp
core/glui/gluiTearPanel.h
core/wdg/edsets.cpp
adding tearoff a gluiRollouts
3bcd9a749baf7d14dbfb45b483283c04e2885cb2
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-25 18:16:44 +0200
core/glui/gluiText.cpp
merge
dd68a922b62d35a8ea7b5f47b3bd9eaf94abf93b
70264ada95f5c61dba756867ad0577b8a530bd7e
ric <ric@pepe.es>
2011-07-25 18:26:32 +0200
core/cedui/cedfloati.cpp
fit mode labels en cedfloati de una sola componente desparecian tambien
25d11ef1eb6d0b1a9ebce39546f672b3882099d5
0000000000000000000000000000000000000000
boro <boro@pepe.es>
2011-07-25 19:35:47 +0200
core/cedui/cedllstring.cpp
core/glui/SConscript
core/glui/gluiList.cpp
core/glui/gluiTextTable.cpp
core/glui/gluiTextTable.h
core/glui/gluiSubWinText.cpp
core/glui/gluiSubWinText.h
Quitado gluiSubWinText y reemplazado por gluiText en gluiTextTable
70264ada95f5c61dba756867ad0577b8a530bd7e
0000000000000000000000000000000000000000
boro <boro@pepe.es>
2011-07-25 19:36:12 +0200
core/cedui/cedfloati.cpp
core/exe/edobj.cpp
core/glui/gluiRollout.cpp
core/glui/gluiRollout.h
core/glui/gluiTearPanel.cpp
core/glui/gluiTearPanel.h
core/wdg/edsets.cpp
Merge
9ebbdb651a34d5355fb58cf14c1a57943ca64855
eff8a614ead910a1668a52a0b9dd78ec7e097df4
rafa <rodi@pepe.es>
2011-07-26 08:35:38 +0200
core/m3t/m3tParamsShapeFilter.cpp
-
95305bb083a8cce39078cb4c485a47dff87667b6
0000000000000000000000000000000000000000
moi <moises@pepe.es>
2011-07-26 10:02:05 +0200
core/exe/edshader.cpp
core/ipf/cfonteffect.cpp
core/ipf/cshader.cpp
Pequeños cambios en editores de cshader
95305bb083a8cce39078cb4c485a47dff87667b6
0000000000000000000000000000000000000000
moi <moises@pepe.es>
2011-07-26 10:03:50 +0200
core/m3t/m3tParamsShapeFilter.cpp
merge
5be64a9ddd67f1df6079955681ee63425e4df902
10bf2339cdbc217cfd9316a972a8758156bc36bc
jor <jor@pepe.es>
2011-07-26 10:49:31 +0200
core/cedui/cedcanvas.cpp
core/cedui/cedcanvas.h
core/exe/configM3.cpp
core/exe/edmediain.cpp
core/exe/ipfrun.cpp
core/ipf/cmediain.cpp
core/m3/m3Pipe.cpp
core/m3/m3Pipe.h
Arreglo algunos asserts
0be65397ca7870d8d33fa7f17c4e0ca386b47a47
0000000000000000000000000000000000000000
edu <eduardo@pepe.es>
2011-07-26 11:24:51 +0200
core/exe/edtext.cpp
core/inter/cstring.cpp
core/ipf/ctext.cpp
core/ipf/ctext.h
core/m3/m3StrLines.cpp
textStyle ahora soporta cambios de texto y retornos de carro.
1b8f483bafbba1b7c4944d7ccf00ffe5884616e1
0000000000000000000000000000000000000000
jor <jor@pepe.es>
2011-07-26 12:22:42 +0200
core/ipf/ctext.h
No compila
1b8f483bafbba1b7c4944d7ccf00ffe5884616e1
0000000000000000000000000000000000000000
jor <jor@pepe.es>
2011-07-26 12:22:57 +0200
core/glui/gluiWindow.cpp
Arreglo creacion thread de ventana
9e5c16840ed4b394b10a1ba71080cfb6fa245a50
0000000000000000000000000000000000000000
jor <jor@pepe.es>
2011-07-26 12:23:44 +0200
core/exe/edtext.cpp
core/inter/cstring.cpp
core/ipf/ctext.cpp
core/ipf/ctext.h
core/m3/m3StrLines.cpp
Merge
96e1deb0bd3b056073bb9ebefec0100891efd554
4feaa1ed7f17de5742a56949a5d06c241fd3d6e6
ric <ric@pepe.es>
2011-07-25 19:46:48 +0200
core/cedui/cskin.cpp
core/cedui/cskin.h
core/exe/edskin.cpp
core/glui/gluiControl.cpp
core/glui/gluiControl.h
core/glui/gluiLabel.cpp
core/glui/gluiLabel.h
core/glui/gluiSkin.h
core/glui/gluiTearPanel.cpp
SkinForegroundNonClickableColor para labels non clickables
eff8a614ead910a1668a52a0b9dd78ec7e097df4
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-25 20:06:00 +0200
core/cedui/cedllstring.cpp
core/glui/SConscript
core/glui/gluiList.cpp
core/glui/gluiTextTable.cpp
core/glui/gluiTextTable.h
core/glui/gluiSubWinText.cpp
core/glui/gluiSubWinText.h
merge
e7b8c92621d6001f412b2f317849d3718cef9040
1b8f483bafbba1b7c4944d7ccf00ffe5884616e1
ric <ric@pepe.es>
2011-07-26 12:27:21 +0200
core/exe/cwindow.cpp
core/exe/edlistclass.cpp
core/exe/edobj.cpp
core/ipf/cthread.cpp
cwindowCanvas bellModified
edobj updateItemnew box_connected
LIST_CREATE haga initItems
c690f231ab384b93060bf52e3899fa1fe22d39c5
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-26 12:37:13 +0200
core/exe/edtext.cpp
core/glui/gluiWindow.cpp
core/inter/cstring.cpp
core/ipf/ctext.cpp
core/ipf/ctext.h
core/m3/m3StrLines.cpp
merge
847c72860e0a238b3797a254ce8e29d741a553dd
cae76bbf52c130ac5164da7120434135b209c7da
jor <jor@pepe.es>
2011-07-26 13:23:02 +0200
core/wdg/clistclass.cpp
cherrypick v12 13d47b519dbf
5f3eba9997ed32f0a9ce189137ea909017dbe38a
0000000000000000000000000000000000000000
boro <boro@pepe.es>
2011-07-26 11:35:32 +0200
core/cedui/cedcanvas.cpp
core/glui/gluiCanvas.cpp
Cambios para que se vea bien el pipe incrustado
29113bbc319c45d524357bc76f9bce8b97f0dd7a
0000000000000000000000000000000000000000
boro <boro@pepe.es>
2011-07-26 13:40:08 +0200
core/cedui/cedbase.cpp
core/cedui/cedfloat.cpp
core/cedui/cedfloati.cpp
core/cedui/cedllstring.cpp
core/cedui/cedoption.cpp
core/cedui/cedsel.cpp
core/cedui/cedstring.cpp
core/cedui/cedstring.h
core/cedui/cupdowns.cpp
core/cedui/cupdowns.h
core/exe/ededitor.cpp
core/exe/edfolder.cpp
core/exe/edicon.cpp
core/exe/edlistclass.cpp
core/exe/edobj.cpp
core/exe/edtext.cpp
core/exe/edtree.cpp
core/exe/floatpopup.cpp
core/glui/SConscript
core/glui/gluiControl.cpp
core/glui/gluiControl.h
core/glui/gluiFile.cpp
core/glui/gluiLib.h
core/glui/gluiList.cpp
core/glui/gluiList.h
core/glui/gluiListGraphIcons.cpp
core/glui/gluiRollout.cpp
core/glui/gluiRollout.h
core/glui/gluiScrollPanelDock.cpp
core/glui/gluiScrollPanelDock.h
core/glui/gluiSplitContainer.cpp
core/glui/gluiTab.cpp
core/glui/gluiTab.h
core/glui/gluiTearPanel.cpp
core/glui/gluiTearPanel.h
core/glui/gluiText.cpp
core/glui/gluiText.h
core/glui/gluiTextTable.cpp
core/glui/gluiTextTable.h
core/glui/gluiWindow.cpp
core/glui/gluiWindow.h
core/inter/cslist.cpp
core/inter/cstring.cpp
core/inter/cstring.h
core/ipf/cobj.cpp
core/ipf/cobj.h
core/ipf/ctext.cpp
core/ipf/ctext.h
core/ipf/geoextruded.cpp
core/m3/m3StrLines.cpp
core/wdg/ceditor.cpp
core/wdg/ceditor.h
core/wdg/cedlist.cpp
core/wdg/cedtree.cpp
core/wdg/cedtree.h
core/wdg/cfolder.cpp
core/wdg/cfolder.h
core/wdg/cicon.cpp
core/wdg/cicon.h
core/wdg/clistclass.cpp
core/wdg/clistclass.h
core/wdg/edref.cpp
core/wdg/edsets.cpp
core/win/awWindow.cpp
core/win/glutMigration.h
core/glui/gluiSeparator.cpp
core/glui/gluiSeparator.h
core/glui/gluiSubWinText.cpp
core/glui/gluiSubWinText.h
Merge con default
ac2400c959c507aa3ed1a32f90875489c4fdba8f
4feaa1ed7f17de5742a56949a5d06c241fd3d6e6
ric <ric@pepe.es>
2011-07-26 13:37:43 +0200
core/glui/gluiCascade.cpp
core/glui/gluiWindow.cpp
gluiCascades popup con getName
45b62e5a2c91224621baa156699d04df9c59bda8
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-26 14:42:07 +0200
core/exe/edobj.cpp
quitado el objconnected del updateitemnew
dba7c198ec88d2c618ddf57b27c1abf9acae633b
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-26 14:42:35 +0200
core/exe/cwindow.cpp
.
afeb490a47c3e7a043f85890f15574866623994d
0000000000000000000000000000000000000000
moi <moises@pepe.es>
2011-07-26 15:06:02 +0200
core/m3/m3Pass.cpp
Corregido error por el que se habian fastidiado impostores y filtros de postproceso
0029098cf9174bb64b2cf57657ef956e50669929
0000000000000000000000000000000000000000
moi <moises@pepe.es>
2011-07-27 09:40:31 +0200
core/exe/edtext.cpp
core/ipf/ctext.cpp
core/ipf/ctext.h
core/m3s/m3sStrap.cpp
Straps se gestiona correctamente en el ItemNew
45afaaf4f03bdf42af05f406e7f95ba1a3c88438
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-27 09:28:09 +0200
core/exe/edicon.cpp
core/glui/gluiControl.cpp
core/glui/gluiSplitContainer.cpp
core/glui/gluiSplitContainer.h
core/wdg/cfolder.cpp
core/wdg/cicon.cpp
core/wdg/cicon.h
core/wdg/clistclass.cpp
gluisplitcontainers fixed distance
3ba515a08aef60a85f70b5675c8fc25ca812874c
0000000000000000000000000000000000000000
boro <boro@pepe.es>
2011-07-27 10:05:11 +0200
core/cedui/cedcanvas.cpp
core/cedui/cedcanvas.h
core/exe/cwindow.cpp
core/exe/cwindow.h
core/exe/edpipe.cpp
core/glui/gluiCanvas.cpp
core/glui/gluiCanvas.h
core/glui/gluiControl.cpp
core/glui/gluiControl.h
core/glui/gluiWindow.cpp
core/ipf/cpipe.cpp
core/wdg/ceditor.cpp
Cambios con ric
ed28c13a01d2bd4bf2fb000e1007b56e27209488
0000000000000000000000000000000000000000
boro <boro@pepe.es>
2011-07-27 10:07:55 +0200
core/cedui/cskin.cpp
core/cedui/cskin.h
core/exe/cwindow.cpp
core/exe/edicon.cpp
core/exe/edlistclass.cpp
core/exe/edobj.cpp
core/exe/edskin.cpp
core/glui/gluiCascade.cpp
core/glui/gluiControl.cpp
core/glui/gluiControl.h
core/glui/gluiLabel.cpp
core/glui/gluiLabel.h
core/glui/gluiSkin.h
core/glui/gluiSplitContainer.cpp
core/glui/gluiSplitContainer.h
core/glui/gluiTearPanel.cpp
core/glui/gluiWindow.cpp
core/ipf/ctext.h
core/ipf/cthread.cpp
core/wdg/cfolder.cpp
core/wdg/cicon.cpp
core/wdg/cicon.h
core/wdg/clistclass.cpp
Merge con default
00124e2d17f8b46383097f00d61de5f2b130ed5d
851309057a073a36dc3c2c78409a8a1b82fe377b
boro <boro@pepe.es>
2011-07-27 13:53:05 +0200
core/cedui/cedcanvas.cpp
core/glui/gluiCanvas.cpp
core/glui/gluiWindow.cpp
Cambio en las posiciones del raton, para que sean relativas al canvas
4b046253f272ed9c50fb1f0e0a4c25ab978c99aa
0000000000000000000000000000000000000000
boro <boro@pepe.es>
2011-07-28 17:31:59 +0200
core/cedui/cedcanvas.cpp
core/cedui/cedcanvas.h
core/cedui/cedstring.cpp
core/cedui/cedstring.h
core/exe/cwindow.cpp
core/exe/cwindow.h
core/exe/edipfmode.cpp
core/exe/edipfmode.h
core/glui/gluiCanvas.cpp
core/glui/gluiCanvas.h
Cambios en el teclado para recibir unicodes en el pipe
b6c2e2b95459c36872ce6f17ef20fdf2fb12bb21
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-27 17:39:38 +0200
core/cedui/glwdg.cpp
core/glui/gluiControl.cpp
core/wdg/cicon.cpp
sensitive effects se queda puesto debido a gluiControl::setSensitive sin Children
auto insertar new splitters en icons lo hace ahora con DockFIll
851309057a073a36dc3c2c78409a8a1b82fe377b
0000000000000000000000000000000000000000
ric <ric@pepe.es>
2011-07-27 22:40:53 +0200
core/cedui/cedoption.h
core/exe/edfolder.cpp
core/glui/gluiControl.cpp
core/ipf/cbind.cpp
core/wdg/ceditor.cpp
core/wdg/cedlist.cpp
core/wdg/cedtree.cpp
core/wdg/clistclass.cpp
core/wdg/edref.cpp
core/wdg/edsets.cpp
core/wdg/edsets.h
Sets->Create cascaba
bitmap editors en effects
Show effects haga update options
06f2494e3f6089ba013f751bc6d6817f14cfa065
0000000000000000000000000000000000000000