Speach bubbles now work. Going to create an experimental branch.
This commit is contained in:
parent
17b03fdb16
commit
639b59da7e
@ -1,157 +1,230 @@
|
|||||||
<!DOCTYPE QtCreatorProject>
|
<!DOCTYPE QtCreatorProject>
|
||||||
<qtcreator>
|
<qtcreator>
|
||||||
<data>
|
<data>
|
||||||
<variable>ProjectExplorer.Project.ActiveTarget</variable>
|
<variable>RunConfiguration0-BaseEnvironmentBase</variable>
|
||||||
|
<value type="int">2</value>
|
||||||
|
</data>
|
||||||
|
<data>
|
||||||
|
<variable>RunConfiguration0-CommandLineArguments</variable>
|
||||||
|
<valuelist type="QVariantList"/>
|
||||||
|
</data>
|
||||||
|
<data>
|
||||||
|
<variable>RunConfiguration0-ProFile</variable>
|
||||||
|
<value type="QString">Unuk-QT.pro</value>
|
||||||
|
</data>
|
||||||
|
<data>
|
||||||
|
<variable>RunConfiguration0-RunConfiguration.name</variable>
|
||||||
|
<value type="QString">Unuk-QT</value>
|
||||||
|
</data>
|
||||||
|
<data>
|
||||||
|
<variable>RunConfiguration0-UseDyldImageSuffix</variable>
|
||||||
|
<value type="bool">false</value>
|
||||||
|
</data>
|
||||||
|
<data>
|
||||||
|
<variable>RunConfiguration0-UseTerminal</variable>
|
||||||
|
<value type="bool">false</value>
|
||||||
|
</data>
|
||||||
|
<data>
|
||||||
|
<variable>RunConfiguration0-UserEnvironmentChanges</variable>
|
||||||
|
<valuelist type="QVariantList"/>
|
||||||
|
</data>
|
||||||
|
<data>
|
||||||
|
<variable>RunConfiguration0-UserSetName</variable>
|
||||||
|
<value type="bool">false</value>
|
||||||
|
</data>
|
||||||
|
<data>
|
||||||
|
<variable>RunConfiguration0-UserSetWorkingDirectory</variable>
|
||||||
|
<value type="bool">false</value>
|
||||||
|
</data>
|
||||||
|
<data>
|
||||||
|
<variable>RunConfiguration0-UserWorkingDirectory</variable>
|
||||||
|
<value type="QString"></value>
|
||||||
|
</data>
|
||||||
|
<data>
|
||||||
|
<variable>RunConfiguration0-type</variable>
|
||||||
|
<value type="QString">Qt4ProjectManager.Qt4RunConfiguration</value>
|
||||||
|
</data>
|
||||||
|
<data>
|
||||||
|
<variable>activeRunConfiguration</variable>
|
||||||
<value type="int">0</value>
|
<value type="int">0</value>
|
||||||
</data>
|
</data>
|
||||||
<data>
|
<data>
|
||||||
<variable>ProjectExplorer.Project.EditorSettings</variable>
|
<variable>activebuildconfiguration</variable>
|
||||||
|
<value type="QString">Debug</value>
|
||||||
|
</data>
|
||||||
|
<data>
|
||||||
|
<variable>buildConfiguration-Debug</variable>
|
||||||
<valuemap type="QVariantMap">
|
<valuemap type="QVariantMap">
|
||||||
<value key="EditorConfiguration.AutoIndent" type="bool">true</value>
|
<value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value>
|
||||||
<value key="EditorConfiguration.AutoSpacesForTabs" type="bool">false</value>
|
<value key="QtVersionId" type="int">2</value>
|
||||||
<value key="EditorConfiguration.Codec" type="QByteArray">System</value>
|
<value key="ToolChain" type="int">0</value>
|
||||||
<value key="EditorConfiguration.DoubleIndentBlocks" type="bool">false</value>
|
<value key="buildConfiguration" type="int">2</value>
|
||||||
<value key="EditorConfiguration.IndentBraces" type="bool">false</value>
|
|
||||||
<value key="EditorConfiguration.IndentSize" type="int">2</value>
|
|
||||||
<value key="EditorConfiguration.MouseNavigation" type="bool">true</value>
|
|
||||||
<value key="EditorConfiguration.PaddingMode" type="int">1</value>
|
|
||||||
<value key="EditorConfiguration.ScrollWheelZooming" type="bool">true</value>
|
|
||||||
<value key="EditorConfiguration.SmartBackspace" type="bool">false</value>
|
|
||||||
<value key="EditorConfiguration.SpacesForTabs" type="bool">true</value>
|
|
||||||
<value key="EditorConfiguration.TabKeyBehavior" type="int">0</value>
|
|
||||||
<value key="EditorConfiguration.TabSize" type="int">2</value>
|
|
||||||
<value key="EditorConfiguration.UseGlobal" type="bool">true</value>
|
|
||||||
<value key="EditorConfiguration.Utf8BomBehavior" type="int">1</value>
|
|
||||||
<value key="EditorConfiguration.addFinalNewLine" type="bool">true</value>
|
|
||||||
<value key="EditorConfiguration.cleanIndentation" type="bool">true</value>
|
|
||||||
<value key="EditorConfiguration.cleanWhitespace" type="bool">true</value>
|
|
||||||
<value key="EditorConfiguration.inEntireDocument" type="bool">false</value>
|
|
||||||
</valuemap>
|
</valuemap>
|
||||||
</data>
|
</data>
|
||||||
<data>
|
<data>
|
||||||
<variable>ProjectExplorer.Project.Target.0</variable>
|
<variable>buildconfiguration-Debug-buildstep0</variable>
|
||||||
<valuemap type="QVariantMap">
|
<valuemap type="QVariantMap">
|
||||||
<value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString"></value>
|
<value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value>
|
||||||
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
|
<valuelist key="abstractProcess.Environment" type="QVariantList">
|
||||||
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Target.DesktopTarget</value>
|
<value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-ICZ0NvJNRS,guid=3b12f0647bd9cd4da4459e180000003d</value>
|
||||||
<value key="ProjectExplorer.Target.ActiveBuildConfiguration" type="int">0</value>
|
<value type="QString">DISPLAY=:0</value>
|
||||||
<value key="ProjectExplorer.Target.ActiveDeployConfiguration" type="int">0</value>
|
<value type="QString">HOME=/home/allanis</value>
|
||||||
<value key="ProjectExplorer.Target.ActiveRunConfiguration" type="int">0</value>
|
<value type="QString">HUSHLOGIN=FALSE</value>
|
||||||
<valuemap key="ProjectExplorer.Target.BuildConfiguration.0" type="QVariantMap">
|
<value type="QString">LANGUAGE=</value>
|
||||||
<value key="ProjectExplorer.BuildCOnfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit.</value>
|
<value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value>
|
||||||
<valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.0" type="QVariantMap">
|
<value type="QString">LOGNAME=allanis</value>
|
||||||
<valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
|
<value type="QString">LS_COLORS=rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lz=01;31:*.xz=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.axv=01;35:*.anx=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.axa=00;36:*.oga=00;36:*.spx=00;36:*.xspf=00;36:</value>
|
||||||
<value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">qmake</value>
|
<value type="QString">MAIL=/var/mail/allanis</value>
|
||||||
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
|
<value type="QString">PATH=/usr/bin:/home/allanis/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games:/usr/sbin:/sbin</value>
|
||||||
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
|
<value type="QString">PWD=/home/allanis</value>
|
||||||
<value key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary" type="bool">false</value>
|
<value type="QString">QTDIR=/usr/share/qt4</value>
|
||||||
<value key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QString"></value>
|
<value type="QString">SHELL=/bin/bash</value>
|
||||||
<value key="QtProjectManager.QMakeBuildStep.QMakeForced" type="bool">false</value>
|
<value type="QString">SHLVL=1</value>
|
||||||
</valuemap>
|
<value type="QString">SSH_AGENT_PID=3260</value>
|
||||||
<valuemap key="ProjectExplorer.BuildStepList.Step.1" type="QVariantMap">
|
<value type="QString">SSH_AUTH_SOCK=/tmp/ssh-lozFEJmg3235/agent.3235</value>
|
||||||
<value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
|
<value type="QString">TERM=linux</value>
|
||||||
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
|
<value type="QString">USER=allanis</value>
|
||||||
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
|
<value type="QString">WINDOWPATH=7</value>
|
||||||
<value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
|
<value type="QString">XAUTHORITY=/home/allanis/.Xauthority</value>
|
||||||
<value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString"></value>
|
<value type="QString">XDG_SESSION_COOKIE=6de6dd7b78e791242262c6460000012e-1323089410.422893-1130065724</value>
|
||||||
<value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
|
<value type="QString">_=/usr/bin/startx</value>
|
||||||
</valuemap>
|
</valuelist>
|
||||||
<value key="ProjectExplorer.BuildStepList.StepsCount" type="int">2</value>
|
<valuelist key="abstractProcess.arguments" type="QVariantList">
|
||||||
<value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Build</value>
|
<value type="QString">/home/allanis/Unuk/Unuk-QT/Unuk-QT.pro</value>
|
||||||
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Build</value>
|
<value type="QString">-spec</value>
|
||||||
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Build</value>
|
<value type="QString">linux-g++</value>
|
||||||
</valuemap>
|
<value type="QString">-r</value>
|
||||||
<valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.1" type="QVariantMap">
|
<value type="QString">CONFIG+=debug</value>
|
||||||
<valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
|
</valuelist>
|
||||||
<value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
|
<value key="abstractProcess.command" type="QString">/usr/bin/qmake-qt4</value>
|
||||||
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
|
<value key="abstractProcess.enabled" type="bool">false</value>
|
||||||
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
|
<value key="abstractProcess.workingDirectory" type="QString">/home/allanis/Unuk/Unuk-QT</value>
|
||||||
<value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
|
|
||||||
<value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString">clean</value>
|
|
||||||
<value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
|
|
||||||
</valuemap>
|
|
||||||
<value key="ProjectExplorer.BuildStepList.StepsCount" type="int">1</value>
|
|
||||||
<value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Clean</value>
|
|
||||||
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Clean</value>
|
|
||||||
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Clean</value>
|
|
||||||
</valuemap>
|
|
||||||
<value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">2</value>
|
|
||||||
<value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
|
|
||||||
<valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
|
|
||||||
<value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Debug</value>
|
|
||||||
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Debug</value>
|
|
||||||
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
|
|
||||||
<value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value>
|
|
||||||
<value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/allanis/Unuk/Unuk-QT-build-desktop</value>
|
|
||||||
<value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">2</value>
|
|
||||||
<value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="QString">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit.</value>
|
|
||||||
<value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">false</value>
|
|
||||||
</valuemap>
|
|
||||||
<value key="ProjectExplorer.Target.BuildConfigurationCount" type="int">1</value>
|
|
||||||
<valuemap key="ProjectExplorer.Target.DeployConfiguration.0" type="QVariantMap">
|
|
||||||
<valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.0" type="QVariantMap">
|
|
||||||
<value key="ProjectExplorer.BuildStepList.StepsCount" type="int">0</value>
|
|
||||||
<value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Deploy</value>
|
|
||||||
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Deploy</value>
|
|
||||||
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Deploy</value>
|
|
||||||
</valuemap>
|
|
||||||
<value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">1</value>
|
|
||||||
<value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">No deployment</value>
|
|
||||||
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">No deployment</value>
|
|
||||||
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.DefaultDeployConfiguration</value>
|
|
||||||
</valuemap>
|
|
||||||
<value key="ProjectExplorer.Target.DeployConfigurationCount" type="int">1</value>
|
|
||||||
<valuemap key="ProjectExplorer.Target.RunConfiguration.0" type="QVariantMap">
|
|
||||||
<valuelist key="Analyzer.Valgrind.AddedSupressionFiles" type="QVariantList"/>
|
|
||||||
<value key="Analyzer.Valgrind.FilterExternalIssues" type="bool">true</value>
|
|
||||||
<value key="Analyzer.Valgrind.NumCallers" type="int">25</value>
|
|
||||||
<valuelist key="Analyzer.Valgrind.RemovedSupressionFiles" type="QVariantList"/>
|
|
||||||
<value key="Analyzer.Valgrind.TrackOrigins" type="bool">true</value>
|
|
||||||
<value key="Analyzer.Valgrind.ValgrindExecutable" type="QString">valgrind</value>
|
|
||||||
<valuelist key="Analyzer.Valgrind.VisibleErrorKinds" type="QVariantList">
|
|
||||||
<value type="int">0</value>
|
|
||||||
<value type="int">1</value>
|
|
||||||
<value type="int">2</value>
|
|
||||||
<value type="int">3</value>
|
|
||||||
<value type="int">4</value>
|
|
||||||
<value type="int">5</value>
|
|
||||||
<value type="int">6</value>
|
|
||||||
<value type="int">7</value>
|
|
||||||
<value type="int">8</value>
|
|
||||||
<value type="int">9</value>
|
|
||||||
<value type="int">10</value>
|
|
||||||
<value type="int">11</value>
|
|
||||||
<value type="int">12</value>
|
|
||||||
<value type="int">13</value>
|
|
||||||
<value type="int">14</value>
|
|
||||||
</valuelist>
|
|
||||||
<value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Qt4 RunConfiguration</value>
|
|
||||||
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Unuk-QT</value>
|
|
||||||
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4RunConfiguration</value>
|
|
||||||
<value key="Qt4ProjectManager.Qt4RunConfiguration.BaseEnvironmentBase" type="int">2</value>
|
|
||||||
<value key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments" type="QString"></value>
|
|
||||||
<value key="Qt4ProjectManager.Qt4RunConfiguration.ProFile" type="QString">Unuk-QT.pro</value>
|
|
||||||
<value key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix" type="bool">false</value>
|
|
||||||
<value key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal" type="bool">false</value>
|
|
||||||
<valuelist key="Qt4ProjectManager.Qt4RunConfiguration.UserEnvironmentChanges" type="QVariantList"/>
|
|
||||||
<value key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory" type="QString"></value>
|
|
||||||
<value key="RunConfiguration.QmlDebugServerPort" type="uint">3768</value>
|
|
||||||
<value key="RunConfiguration.UseCppDebugger" type="bool">true</value>
|
|
||||||
<value key="RunConfiguration.UseQmlDebugger" type="bool">false</value>
|
|
||||||
</valuemap>
|
|
||||||
<value key="ProjectExplorer.Target.RunConfigurationCount" type="int">1</value>
|
|
||||||
</valuemap>
|
</valuemap>
|
||||||
</data>
|
</data>
|
||||||
<data>
|
<data>
|
||||||
<variable>ProjectExplorer.Project.TargetCount</variable>
|
<variable>buildconfiguration-Debug-buildstep1</variable>
|
||||||
<value type="int">1</value>
|
<valuemap type="QVariantMap">
|
||||||
|
<value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value>
|
||||||
|
<valuelist key="abstractProcess.Environment" type="QVariantList">
|
||||||
|
<value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-ICZ0NvJNRS,guid=3b12f0647bd9cd4da4459e180000003d</value>
|
||||||
|
<value type="QString">DISPLAY=:0</value>
|
||||||
|
<value type="QString">HOME=/home/allanis</value>
|
||||||
|
<value type="QString">HUSHLOGIN=FALSE</value>
|
||||||
|
<value type="QString">LANGUAGE=</value>
|
||||||
|
<value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value>
|
||||||
|
<value type="QString">LOGNAME=allanis</value>
|
||||||
|
<value type="QString">LS_COLORS=rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lz=01;31:*.xz=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.axv=01;35:*.anx=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.axa=00;36:*.oga=00;36:*.spx=00;36:*.xspf=00;36:</value>
|
||||||
|
<value type="QString">MAIL=/var/mail/allanis</value>
|
||||||
|
<value type="QString">PATH=/usr/bin:/home/allanis/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games:/usr/sbin:/sbin</value>
|
||||||
|
<value type="QString">PWD=/home/allanis</value>
|
||||||
|
<value type="QString">QTDIR=/usr/share/qt4</value>
|
||||||
|
<value type="QString">SHELL=/bin/bash</value>
|
||||||
|
<value type="QString">SHLVL=1</value>
|
||||||
|
<value type="QString">SSH_AGENT_PID=3260</value>
|
||||||
|
<value type="QString">SSH_AUTH_SOCK=/tmp/ssh-lozFEJmg3235/agent.3235</value>
|
||||||
|
<value type="QString">TERM=linux</value>
|
||||||
|
<value type="QString">USER=allanis</value>
|
||||||
|
<value type="QString">WINDOWPATH=7</value>
|
||||||
|
<value type="QString">XAUTHORITY=/home/allanis/.Xauthority</value>
|
||||||
|
<value type="QString">XDG_SESSION_COOKIE=6de6dd7b78e791242262c6460000012e-1323089410.422893-1130065724</value>
|
||||||
|
<value type="QString">_=/usr/bin/startx</value>
|
||||||
|
</valuelist>
|
||||||
|
<value key="abstractProcess.IgnoreReturnValue" type="bool">false</value>
|
||||||
|
<valuelist key="abstractProcess.arguments" type="QVariantList">
|
||||||
|
<value type="QString">-w</value>
|
||||||
|
</valuelist>
|
||||||
|
<value key="abstractProcess.command" type="QString">/usr/bin/make</value>
|
||||||
|
<value key="abstractProcess.enabled" type="bool">true</value>
|
||||||
|
<value key="abstractProcess.workingDirectory" type="QString">/home/allanis/Unuk/Unuk-QT</value>
|
||||||
|
</valuemap>
|
||||||
</data>
|
</data>
|
||||||
<data>
|
<data>
|
||||||
<variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
|
<variable>buildconfiguration-Debug-cleanstep0</variable>
|
||||||
<value type="QString">{359fc55d-3b68-417e-92d9-996c90e029a7}</value>
|
<valuemap type="QVariantMap">
|
||||||
|
<value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value>
|
||||||
|
<valuelist key="abstractProcess.Environment" type="QVariantList">
|
||||||
|
<value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-ICZ0NvJNRS,guid=3b12f0647bd9cd4da4459e180000003d</value>
|
||||||
|
<value type="QString">DISPLAY=:0</value>
|
||||||
|
<value type="QString">HOME=/home/allanis</value>
|
||||||
|
<value type="QString">HUSHLOGIN=FALSE</value>
|
||||||
|
<value type="QString">LANGUAGE=</value>
|
||||||
|
<value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value>
|
||||||
|
<value type="QString">LOGNAME=allanis</value>
|
||||||
|
<value type="QString">LS_COLORS=rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lz=01;31:*.xz=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.axv=01;35:*.anx=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.axa=00;36:*.oga=00;36:*.spx=00;36:*.xspf=00;36:</value>
|
||||||
|
<value type="QString">MAIL=/var/mail/allanis</value>
|
||||||
|
<value type="QString">PATH=/usr/bin:/home/allanis/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games:/usr/sbin:/sbin</value>
|
||||||
|
<value type="QString">PWD=/home/allanis</value>
|
||||||
|
<value type="QString">QTDIR=/usr/share/qt4</value>
|
||||||
|
<value type="QString">SHELL=/bin/bash</value>
|
||||||
|
<value type="QString">SHLVL=1</value>
|
||||||
|
<value type="QString">SSH_AGENT_PID=3260</value>
|
||||||
|
<value type="QString">SSH_AUTH_SOCK=/tmp/ssh-lozFEJmg3235/agent.3235</value>
|
||||||
|
<value type="QString">TERM=linux</value>
|
||||||
|
<value type="QString">USER=allanis</value>
|
||||||
|
<value type="QString">WINDOWPATH=7</value>
|
||||||
|
<value type="QString">XAUTHORITY=/home/allanis/.Xauthority</value>
|
||||||
|
<value type="QString">XDG_SESSION_COOKIE=6de6dd7b78e791242262c6460000012e-1323089410.422893-1130065724</value>
|
||||||
|
<value type="QString">_=/usr/bin/startx</value>
|
||||||
|
</valuelist>
|
||||||
|
<value key="abstractProcess.IgnoreReturnValue" type="bool">true</value>
|
||||||
|
<valuelist key="abstractProcess.arguments" type="QVariantList">
|
||||||
|
<value type="QString">clean</value>
|
||||||
|
<value type="QString">-w</value>
|
||||||
|
</valuelist>
|
||||||
|
<value key="abstractProcess.command" type="QString">/usr/bin/make</value>
|
||||||
|
<value key="abstractProcess.enabled" type="bool">true</value>
|
||||||
|
<value key="abstractProcess.workingDirectory" type="QString">/home/allanis/Unuk/Unuk-QT</value>
|
||||||
|
<value key="cleanConfig" type="bool">true</value>
|
||||||
|
<valuelist key="makeargs" type="QVariantList">
|
||||||
|
<value type="QString">clean</value>
|
||||||
|
</valuelist>
|
||||||
|
</valuemap>
|
||||||
</data>
|
</data>
|
||||||
<data>
|
<data>
|
||||||
<variable>ProjectExplorer.Project.Updater.FileVersion</variable>
|
<variable>buildconfigurations</variable>
|
||||||
<value type="int">9</value>
|
<valuelist type="QVariantList">
|
||||||
|
<value type="QString">Debug</value>
|
||||||
|
</valuelist>
|
||||||
|
</data>
|
||||||
|
<data>
|
||||||
|
<variable>buildstep0</variable>
|
||||||
|
<valuemap type="QVariantMap">
|
||||||
|
<value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString"></value>
|
||||||
|
<value key="mkspec" type="QString"></value>
|
||||||
|
</valuemap>
|
||||||
|
</data>
|
||||||
|
<data>
|
||||||
|
<variable>buildstep1</variable>
|
||||||
|
<valuemap type="QVariantMap">
|
||||||
|
<value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString"></value>
|
||||||
|
</valuemap>
|
||||||
|
</data>
|
||||||
|
<data>
|
||||||
|
<variable>buildsteps</variable>
|
||||||
|
<valuelist type="QVariantList">
|
||||||
|
<value type="QString">trolltech.qt4projectmanager.qmake</value>
|
||||||
|
<value type="QString">trolltech.qt4projectmanager.make</value>
|
||||||
|
</valuelist>
|
||||||
|
</data>
|
||||||
|
<data>
|
||||||
|
<variable>cleanstep0</variable>
|
||||||
|
<valuemap type="QVariantMap">
|
||||||
|
<value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString"></value>
|
||||||
|
<value key="clean" type="bool">true</value>
|
||||||
|
</valuemap>
|
||||||
|
</data>
|
||||||
|
<data>
|
||||||
|
<variable>cleansteps</variable>
|
||||||
|
<valuelist type="QVariantList">
|
||||||
|
<value type="QString">trolltech.qt4projectmanager.make</value>
|
||||||
|
</valuelist>
|
||||||
|
</data>
|
||||||
|
<data>
|
||||||
|
<variable>defaultFileEncoding</variable>
|
||||||
|
<value type="QByteArray">System</value>
|
||||||
|
</data>
|
||||||
|
<data>
|
||||||
|
<variable>project</variable>
|
||||||
|
<valuemap type="QVariantMap"/>
|
||||||
</data>
|
</data>
|
||||||
</qtcreator>
|
</qtcreator>
|
||||||
|
@ -57,7 +57,7 @@ void Player::HandleInput(void) {
|
|||||||
|
|
||||||
void Player::Update(void) {
|
void Player::Update(void) {
|
||||||
Move();
|
Move();
|
||||||
|
AddSpeachBubble("Woot, My name is Allanis, welcome to my home");
|
||||||
// For now The camera will be static.
|
// For now The camera will be static.
|
||||||
//SetCamera();
|
//SetCamera();
|
||||||
}
|
}
|
||||||
|
@ -54,7 +54,7 @@ void Character::LoadSprites(string filename, int wArg, int hArg) {
|
|||||||
void Character::AddSpeachBubble(string text) {
|
void Character::AddSpeachBubble(string text) {
|
||||||
_speachBubble.push_back(text);
|
_speachBubble.push_back(text);
|
||||||
|
|
||||||
//m_speachBubbleText.SetTextBlended(text, "small", 0, 0, 0);
|
_speachBubbleText.SetTextBlended(text, small, 0, 0, 0);
|
||||||
|
|
||||||
if(_speachBubbleTimer.IsStarted() == false)
|
if(_speachBubbleTimer.IsStarted() == false)
|
||||||
_speachBubbleTimer.Start();
|
_speachBubbleTimer.Start();
|
||||||
@ -125,7 +125,7 @@ void Character::Update(void) {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if(_speachBubble.front() != _speachBubbleText.GetText()) {
|
if(_speachBubble.front() != _speachBubbleText.GetText()) {
|
||||||
//m_speachBubbleText.SetTextBlended(m_speachBubble.front(), "small", 0, 0, 0);
|
_speachBubbleText.SetTextBlended(_speachBubble.front(), small, 0, 0, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
#ifndef _RECT_H_
|
#ifndef _RECT_H_
|
||||||
#define _RECT_H_
|
#define _RECT_H_
|
||||||
#include <SDL/SDL.h>
|
#include <SDL/SDL.h>
|
||||||
#include <iostream> // May not need this.
|
|
||||||
#include "../Unuk/Globals.h"
|
#include "../Unuk/Globals.h"
|
||||||
#include "ApplySurface.h"
|
#include "ApplySurface.h"
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
Loading…
Reference in New Issue
Block a user