Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge

Browse source
This commit is contained in:
kaetemi 2014-09-06 00:37:29 +02:00
commit 5ea28a09ae
7 changed files with 52 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.hgignore
View file

@ -251,3 +251,9 @@ code/nel/tools/build_gamedata/processes/zone/debug_zone_dependencies.cfg
code/web/public_php/config.php code/web/public_php/config.php
code/web/public_php/is_installed code/web/public_php/is_installed
code/web/public_php/ams/files code/web/public_php/ams/files
code/web/public_php/db_version_lib
code/web/public_php/db_version_shard
code/web/public_php/db_version_tool
code/web/public_php/db_version_web
code/web/public_php/role_service
code/web/public_php/role_support

2
code/nel/include/nel/misc/app_context.h
View file

@ -147,7 +147,6 @@ namespace NLMISC
bool DebugNeedAssert; bool DebugNeedAssert;
bool NoAssert; bool NoAssert;
bool AlreadyCreateSharedAmongThreads; bool AlreadyCreateSharedAmongThreads;
}; };
/** This class implements the context interface for the a library module. /** This class implements the context interface for the a library module.
@ -184,6 +183,7 @@ namespace NLMISC
virtual void setNoAssert(bool noAssert); virtual void setNoAssert(bool noAssert);
virtual bool getAlreadyCreateSharedAmongThreads(); virtual bool getAlreadyCreateSharedAmongThreads();
virtual void setAlreadyCreateSharedAmongThreads(bool b); virtual void setAlreadyCreateSharedAmongThreads(bool b);
private: private:
/// Pointer to the application context. /// Pointer to the application context.
INelContext *_ApplicationContext; INelContext *_ApplicationContext;

67
code/nel/samples/3d/nel_qt/qtcolorpicker_cpp.h
View file

@ -543,14 +543,17 @@ ColorPickerPopup::ColorPickerPopup(int width, bool withColorDialog,
setMouseTracking(true); setMouseTracking(true);
cols = width; cols = width;
if (withColorDialog) { if (withColorDialog)
moreButton = new ColorPickerButton(this); {
moreButton->setFixedWidth(24); moreButton = new ColorPickerButton(this);
moreButton->setFixedHeight(21); moreButton->setFixedWidth(24);
moreButton->setFrameRect(QRect(2, 2, 20, 17)); moreButton->setFixedHeight(21);
connect(moreButton, SIGNAL(clicked()), SLOT(getColorFromDialog())); moreButton->setFrameRect(QRect(2, 2, 20, 17));
} else { connect(moreButton, SIGNAL(clicked()), SLOT(getColorFromDialog()));
moreButton = 0; }
else
{
moreButton = 0;
} }
eventLoop = 0; eventLoop = 0;
@ -1059,15 +1062,20 @@ void ColorPickerButton::mouseReleaseEvent(QMouseEvent *)
void ColorPickerButton::keyPressEvent(QKeyEvent *e) void ColorPickerButton::keyPressEvent(QKeyEvent *e)
{ {
if (e->key() == Qt::Key_Up if (e->key() == Qt::Key_Up
|| e->key() == Qt::Key_Down || e->key() == Qt::Key_Down
|| e->key() == Qt::Key_Left || e->key() == Qt::Key_Left
|| e->key() == Qt::Key_Right) { || e->key() == Qt::Key_Right)
qApp->sendEvent(parent(), e); {
} else if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Space || e->key() == Qt::Key_Return) { qApp->sendEvent(parent(), e);
setFrameShadow(Sunken); }
update(); else if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Space || e->key() == Qt::Key_Return)
} else { {
QFrame::keyPressEvent(e); setFrameShadow(Sunken);
update();
}
else
{
QFrame::keyPressEvent(e);
} }
} }
@ -1077,16 +1085,21 @@ void ColorPickerButton::keyPressEvent(QKeyEvent *e)
void ColorPickerButton::keyReleaseEvent(QKeyEvent *e) void ColorPickerButton::keyReleaseEvent(QKeyEvent *e)
{ {
if (e->key() == Qt::Key_Up if (e->key() == Qt::Key_Up
|| e->key() == Qt::Key_Down || e->key() == Qt::Key_Down
|| e->key() == Qt::Key_Left || e->key() == Qt::Key_Left
|| e->key() == Qt::Key_Right) { || e->key() == Qt::Key_Right)
qApp->sendEvent(parent(), e); {
} else if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Space || e->key() == Qt::Key_Return) { qApp->sendEvent(parent(), e);
setFrameShadow(Raised); }
repaint(); else if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Space || e->key() == Qt::Key_Return)
emit clicked(); {
} else { setFrameShadow(Raised);
QFrame::keyReleaseEvent(e); repaint();
emit clicked();
}
else
{
QFrame::keyReleaseEvent(e);
} }
} }

5
code/nel/src/3d/driver/direct3d/driver_direct3d.cpp
View file

@ -1511,8 +1511,6 @@ bool CDriverD3D::setDisplay(nlWindow wnd, const GfxMode& mode, bool show, bool r
} }
} }
// _D3D->CreateDevice (adapter, _Rasterizer, _HWnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &parameters, &_DeviceInterface); // _D3D->CreateDevice (adapter, _Rasterizer, _HWnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &parameters, &_DeviceInterface);
// Check some caps // Check some caps
@ -2661,7 +2659,8 @@ bool CDriverD3D::reset (const GfxMode& mode)
#ifndef NL_NO_ASM #ifndef NL_NO_ASM
CFpuRestorer fpuRestorer; // fpu control word is changed by "Reset" CFpuRestorer fpuRestorer; // fpu control word is changed by "Reset"
#endif #endif
if (_Rasterizer!=D3DDEVTYPE_REF) { if (_Rasterizer!=D3DDEVTYPE_REF)
{
HRESULT hr = _DeviceInterface->Reset (&parameters); HRESULT hr = _DeviceInterface->Reset (&parameters);
if (hr != D3D_OK) if (hr != D3D_OK)
{ {

2
code/nel/src/misc/app_context.cpp
View file

@ -75,7 +75,7 @@ INelContext::~INelContext()
void INelContext::contextReady() void INelContext::contextReady()
{ {
// Register the NeL Context // Register the NeL Context
// This assert doesn't work for Linux due to ELF symbol relocation // This assert doesn't work for Linux due to ELF symbol relocation

2
code/web/public_php/ams/templates/layout.tpl
View file

@ -158,7 +158,7 @@
</div> </div>
<footer> <footer>
<p class="pull-right">Powered by: <a href="http://usman.it/free-responsive-admin-template">Charisma</a></p> {if $permission > 1}<p class="pull-right">AMS 0.9.0 Powered by: <a href="http://usman.it/free-responsive-admin-template">Charisma</a></p>{/if}
</footer> </footer>
{/if} {/if}
</div><!--/.fluid-container--> </div><!--/.fluid-container-->