mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-01-17 14:28:30 +01:00
Code Issues Projects Releases Wiki Activity

Version 92.0

Browse Source 
also update README, and make ctrl+a moderator only shortcut
This commit is contained in:
jacob1 2017-07-23 10:58:52 -04:00
parent ddce20da5b
commit aad8eba5df
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -1,4 +1,4 @@
The Powder Toy - July 2016 The Powder Toy - July 2017
========================== ==========================
Get the latest version here: http://powdertoy.co.uk/Download.html Get the latest version here: http://powdertoy.co.uk/Download.html
@ -85,6 +85,7 @@ Controls
| Alt + ] | Increase brush size by 1 | | Alt + ] | Increase brush size by 1 |
| Ctrl + C/V/X | Copy/Paste/Cut | | Ctrl + C/V/X | Copy/Paste/Cut |
| Ctrl + Z | Undo | | Ctrl + Z | Undo |
| Ctrl + Y | Redo |
| Ctrl + Cursor drag | Rectangle | | Ctrl + Cursor drag | Rectangle |
| Shift + Cursor drag | Line | | Shift + Cursor drag | Line |
| Middle click | Sample element | | Middle click | Sample element |

6
src/Config.h
View File

@ -12,15 +12,15 @@
//VersionInfoStart //VersionInfoStart
#ifndef SAVE_VERSION #ifndef SAVE_VERSION
#define SAVE_VERSION 91 #define SAVE_VERSION 92
#endif #endif
#ifndef MINOR_VERSION #ifndef MINOR_VERSION
#define MINOR_VERSION 5 #define MINOR_VERSION 0
#endif #endif
#ifndef BUILD_NUM #ifndef BUILD_NUM
#define BUILD_NUM 330 #define BUILD_NUM 331
#endif #endif
#ifndef SNAPSHOT_ID #ifndef SNAPSHOT_ID

2
src/client/GameSave.cpp
View File

@ -2138,7 +2138,6 @@ char * GameSave::serialiseOPS(unsigned int & dataLength)
{ {
RESTRICTVERSION(91, 5); RESTRICTVERSION(91, 5);
} }
#ifdef SNAPSHOT
if (particles[i].type == PT_HEAC || particles[i].type == PT_SAWD || particles[i].type == PT_POLO if (particles[i].type == PT_HEAC || particles[i].type == PT_SAWD || particles[i].type == PT_POLO
|| particles[i].type == PT_RFRG || particles[i].type == PT_RFGL || particles[i].type == PT_LSNS) || particles[i].type == PT_RFRG || particles[i].type == PT_RFGL || particles[i].type == PT_LSNS)
{ {
@ -2150,7 +2149,6 @@ char * GameSave::serialiseOPS(unsigned int & dataLength)
RESTRICTVERSION(92, 0); RESTRICTVERSION(92, 0);
fromNewerVersion = true; fromNewerVersion = true;
} }
#endif
//Get the pmap entry for the next particle in the same position //Get the pmap entry for the next particle in the same position
i = partsPosLink[i]; i = partsPosLink[i];

6
src/gui/game/GameView.cpp
View File

@ -1488,15 +1488,15 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
case SDLK_F5: case SDLK_F5:
c->ReloadSim(); c->ReloadSim();
break; break;
#if defined(DEBUG) || defined(SNAPSHOT)
case 'a': case 'a':
if (ctrl) if ((Client::Ref().GetAuthUser().UserElevation == User::ElevationModerator
|| Client::Ref().GetAuthUser().UserElevation == User::ElevationAdmin
|| Client::Ref().GetAuthUser().Username == "Mrprocom") && ctrl)
{ {
std::string authorString = Client::Ref().GetAuthorInfo().toStyledString(); std::string authorString = Client::Ref().GetAuthorInfo().toStyledString();
new InformationMessage("Save authorship info", authorString, true); new InformationMessage("Save authorship info", authorString, true);
} }
break; break;
#endif
case 'r': case 'r':
if (ctrl) if (ctrl)
c->ReloadSim(); c->ReloadSim();