update credits screen

add some contributors, put the newly formed artist workgroup into <Art and Content>
clean up credits screen dialogue code
stable-5.4
Tobias Zwick 2014-01-24 15:33:47 +07:00
parent 426e6c659a
commit d35bfdb7b6
4 changed files with 26 additions and 67 deletions

View File

@ -1,25 +1,30 @@
<Engine and Tools>
Armin Burgmeier (Clonk-Karl)
Günther Brammer (Günther)
Nicolas Hake (Isilkor)
Günther Brammer (Günther)
Sven Eberhardt (Sven2)
Nicolas Hake (Isilkor)
Martin Plicht (Mortimer)
Peter Wortmann (PeterW)
Julius Michaelis (Caesar)
<Scripting and Content>
Maikel de Vries (Maikel)
David Dormagen (Zapper)
Felix Wagner (Clonkonaut)
Bernhard Bonigl (Boni)
<Art and Content>
Charles Spurrill (Ringwaul)
Richard Gerum (Randrian)
Timo Stabbert (Mimmo)
Matthias Rottländer (Matthi)
Felix Riese (Fungiform)
Florian Graier (Nachtfalter)
<Scripting and Content>
Maikel de Vries (Maikel)
Bernhard Bonigl (Boni)
Felix Wagner (Clonkonaut)
David Dormagen (Zapper)
<Coordination, Administration>
<Coordination>
Tobias Zwick (Newton)
<Thanks to Contributors>
Benjamin Herr (Loriel), Matthias Rottländer (Matthi), Felix Riese (Fungiform), Manuel Riecke (MrBeast), Benedict Etzel (B_E), Carl-Philip Hänsch (Carli), Alexander Semeniuk (AlteredARMOR), Florian Graier (Nachtfalter), Daniel Theuke (ST-DDT), Asmageddon, Merten Ehmig (Pluto), Mark Haßelbusch (Marky), Luchs, Peewee, Lauri Niskanen (Ape), Dominik Bayerl (Kanibal), Faby, Checkmaty, Gurkenglas, Clonkine, mizipzor, mixi, Pyrit, grgecko, Koronis, RedWolf Design GmbH and all those who contributed to previous Clonk titles for the passion they put into the game and for agreeing to make Clonk open source.
<Special Thanks to Contributors>
Benjamin Herr (Loriel), Benedict Etzel (B_E), Oliver Schneider (ker), Philipp Kern (pkern), Carl-Philip Hänsch (Carli), Manuel Rieke (MrBeast), Alexander Semeniuk (AlteredARMOR), Merten Ehmig (Pluto) Daniel Theuke (ST-DDT), Asmageddon, Faby, Russel, Peewee, Tim Blume (End), Andriel, Gurkenglas, Pyrit, Luchs, grgecko, Dominik Bayerl (Kannibal), Lauri Niskanen (Ape), Clonkine, Checkmaty, Sven-Hendrik Haase, Johannes Nixdorf (mixi), Stan, Koronis, mizipzor, Mark Haßelbusch (Marky), Sebastian Rühl and TomyLobo.
Also, big thanks to RedWolf Design GmbH and all those who contributed to previous Clonk titles for the passion they put into the game and for agreeing to make Clonk open source.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 622 KiB

After

Width:  |  Height:  |  Size: 296 KiB

View File

@ -2,7 +2,7 @@
* OpenClonk, http://www.openclonk.org
*
* Copyright (c) 2001-2009, RedWolf Design GmbH, http://www.clonk.de/
* Copyright (c) 2010-2013, The OpenClonk Team and contributors
* Copyright (c) 2010-2014, The OpenClonk Team and contributors
*
* Distributed under the terms of the ISC license; see accompanying file
* "COPYING" for details.
@ -26,28 +26,13 @@
// ------------------------------------------------
// --- C4StartupAboutDlg
C4StartupAboutDlg::C4StartupAboutDlg() : C4StartupDlg("")
C4StartupAboutDlg::C4StartupAboutDlg() : C4StartupDlg(LoadResStr("IDS_DLG_ABOUT"))
{
// ctor
UpdateSize();
// key bindings: No longer back on any key
pKeyBack = NULL;
//C4CustomKey::CodeList keys;
//keys.push_back(C4KeyCodeEx(KEY_Any)); keys.push_back(C4KeyCodeEx(KEY_JOY_AnyButton));
//pKeyBack = new C4KeyBinding(keys, "StartupAboutBack", KEYSCOPE_Gui,
// new C4GUI::DlgKeyCB<C4StartupAboutDlg>(*this, &C4StartupAboutDlg::KeyBack), C4CustomKey::PRIO_Dlg);
// version and registration info in topright corner
C4Rect rcClient = GetContainedClientRect();
StdStrBuf sVersion; sVersion.Format(LoadResStr("IDS_DLG_VERSION"), C4VERSION);
CStdFont &rUseFont = ::GraphicsResource.TextFont;
int32_t iInfoWdt = Min<int32_t>(rcClient.Wdt/2, rUseFont.GetTextWidth("General info text width")*2);
C4GUI::ComponentAligner caInfo(C4Rect(rcClient.x + rcClient.Wdt - iInfoWdt, rcClient.y, iInfoWdt, rcClient.Hgt/8), 0,0, false);
AddElement(new C4GUI::Label(sVersion.getData(), caInfo.GetGridCell(0,1,0,4), ARight));
StdStrBuf sRegStr, sKeyFile;
Application.Add(this);
OnSec1Timer();
C4Rect rcClient = GetContainedClientRect();
// bottom line buttons and copyright messages
C4GUI::ComponentAligner caMain(rcClient, 0,0, true);
@ -68,8 +53,6 @@ C4StartupAboutDlg::C4StartupAboutDlg() : C4StartupDlg("")
C4StartupAboutDlg::~C4StartupAboutDlg()
{
Application.Remove(this);
delete pKeyBack;
}
void C4StartupAboutDlg::DoBack()
@ -77,26 +60,9 @@ void C4StartupAboutDlg::DoBack()
C4Startup::Get()->SwitchDialog(C4Startup::SDID_Main);
}
void C4StartupAboutDlg::OnSec1Timer()
{
}
void C4StartupAboutDlg::DrawElement(C4TargetFacet &cgo)
{
// draw background - do not use bg drawing proc, because it stretches
// pre-clear background instead to prevent blinking borders
if (!IsFading()) pDraw->FillBG();
C4Startup::Get()->Graphics.fctAboutBG.Draw(cgo, false);
}
void C4StartupAboutDlg::MouseInput(C4GUI::CMouse &rMouse, int32_t iButton, int32_t iX, int32_t iY, DWORD dwKeyParam)
{
// back on any mouse button? Better not, because mouse input is required
/*if (iButton == C4MC_Button_LeftDown || iButton == C4MC_Button_RightDown || iButton == C4MC_Button_MiddleDown)
DoBack();
else*/
// otherwise, inherited for tooltips
C4StartupDlg::MouseInput(rMouse, iButton, iX, iY, dwKeyParam);
C4Startup::Get()->Graphics.fctAboutBG.Draw(cgo, false, 0, 0, true);
}
#ifdef WITH_AUTOMATIC_UPDATE

View File

@ -2,7 +2,7 @@
* OpenClonk, http://www.openclonk.org
*
* Copyright (c) 2001-2009, RedWolf Design GmbH, http://www.clonk.de/
* Copyright (c) 2013, The OpenClonk Team and contributors
* Copyright (c) 2013-2014, The OpenClonk Team and contributors
*
* Distributed under the terms of the ISC license; see accompanying file
* "COPYING" for details.
@ -13,32 +13,21 @@
* To redistribute this file separately, substitute the full license texts
* for the above references.
*/
// About/credits screen
// Credits screen
#ifndef INC_C4StartupAboutDlg
#define INC_C4StartupAboutDlg
#include "C4Startup.h"
// webcode show time
const int32_t C4AboutWebCodeShowTime = 25; // seconds
// startup dialog: About
class C4StartupAboutDlg : public C4StartupDlg, private C4ApplicationSec1Timer
// startup dialog: credits
class C4StartupAboutDlg : public C4StartupDlg
{
public:
C4StartupAboutDlg(); // ctor
~C4StartupAboutDlg(); // dtor
private:
class C4KeyBinding *pKeyBack;
C4GUI::Label *pWebCodeLbl;
int32_t iWebCodeTimer;
C4StartupAboutDlg();
~C4StartupAboutDlg();
protected:
virtual int32_t GetMarginTop() { return iDlgMarginY + C4GUI_FullscreenDlg_TitleHeight/2; } // less top margin
virtual void MouseInput(C4GUI::CMouse &rMouse, int32_t iButton, int32_t iX, int32_t iY, DWORD dwKeyParam); // input: back on any button
virtual bool OnEnter() { DoBack(); return true; }
virtual bool OnEscape() { DoBack(); return true; }
virtual void DrawElement(C4TargetFacet &cgo);
@ -49,7 +38,6 @@ protected:
#endif
public:
void OnSec1Timer();
void DoBack(); // back to main menu