minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Updated licenses of CiaranG's contributions to be in line with the new contribution policy and added a TODO note to server.cpp

This commit is contained in:
celeron55 2011-05-31 11:59:51 +03:00
parent 63ae3d7387
commit 7740425085
5 changed files with 49 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/guiPasswordChange.cpp
View File

@ -1,21 +1,19 @@
/* /*
Minetest-c55 Part of Minetest-c55
Copyright (C) 2010-11 celeron55, Perttu Ahola <celeron55@gmail.com> Copyright (C) 2011 celeron55, Perttu Ahola <celeron55@gmail.com>
Copyright (C) 2011 Ciaran Gultnieks <ciaran@ciarang.com> Copyright (C) 2011 Ciaran Gultnieks <ciaran@ciarang.com>
This program is free software; you can redistribute it and/or modify Permission to use, copy, modify, and distribute this software for any
it under the terms of the GNU General Public License as published by purpose with or without fee is hereby granted, provided that the above
the Free Software Foundation; either version 2 of the License, or copyright notice and this permission notice appear in all copies.
(at your option) any later version.
This program is distributed in the hope that it will be useful, THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
but WITHOUT ANY WARRANTY; without even the implied warranty of WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
GNU General Public License for more details. ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
You should have received a copy of the GNU General Public License along ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
with this program; if not, write to the Free Software Foundation, Inc., OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include "guiPasswordChange.h" #include "guiPasswordChange.h"

24
src/guiPasswordChange.h
View File

@ -1,21 +1,19 @@
/* /*
Minetest-c55 Part of Minetest-c55
Copyright (C) 2010-11 celeron55, Perttu Ahola <celeron55@gmail.com> Copyright (C) 2010-11 celeron55, Perttu Ahola <celeron55@gmail.com>
Copyright (C) 2011 Ciaran Gultnieks <ciaran@ciarang.com> Copyright (C) 2011 Ciaran Gultnieks <ciaran@ciarang.com>
This program is free software; you can redistribute it and/or modify Permission to use, copy, modify, and distribute this software for any
it under the terms of the GNU General Public License as published by purpose with or without fee is hereby granted, provided that the above
the Free Software Foundation; either version 2 of the License, or copyright notice and this permission notice appear in all copies.
(at your option) any later version.
This program is distributed in the hope that it will be useful, THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
but WITHOUT ANY WARRANTY; without even the implied warranty of WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
GNU General Public License for more details. ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
You should have received a copy of the GNU General Public License along ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
with this program; if not, write to the Free Software Foundation, Inc., OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef GUIPASSWORDCHANGE_HEADER #ifndef GUIPASSWORDCHANGE_HEADER

3
src/server.cpp
View File

@ -1192,7 +1192,7 @@ void Server::AsyncRunStep()
if(dtime < 0.001) if(dtime < 0.001)
return; return;
//dstream<<"Server steps "<<dtime<<std::endl; //dstream<<"Server steps "<<dtime<<std::endl;
//dstream<<"Server::AsyncRunStep(): dtime="<<dtime<<std::endl; //dstream<<"Server::AsyncRunStep(): dtime="<<dtime<<std::endl;
@ -1674,6 +1674,7 @@ void Server::AsyncRunStep()
/* /*
Step node metadata Step node metadata
TODO: Move to ServerEnvironment and utilize active block stuff
*/ */
{ {
//TimeTaker timer("Step node metadata"); //TimeTaker timer("Step node metadata");

27
src/servercommand.cpp
View File

@ -1,24 +1,21 @@
/* /*
Minetest-c55 Part of Minetest-c55
Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com> Copyright (C) 2010-11 celeron55, Perttu Ahola <celeron55@gmail.com>
Copyright (C) 2011 Ciaran Gultnieks <ciaran@ciarang.com> Copyright (C) 2011 Ciaran Gultnieks <ciaran@ciarang.com>
This program is free software; you can redistribute it and/or modify Permission to use, copy, modify, and distribute this software for any
it under the terms of the GNU General Public License as published by purpose with or without fee is hereby granted, provided that the above
the Free Software Foundation; either version 2 of the License, or copyright notice and this permission notice appear in all copies.
(at your option) any later version.
This program is distributed in the hope that it will be useful, THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
but WITHOUT ANY WARRANTY; without even the implied warranty of WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
GNU General Public License for more details. ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
You should have received a copy of the GNU General Public License along ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
with this program; if not, write to the Free Software Foundation, Inc., OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include "servercommand.h" #include "servercommand.h"
#include "utility.h" #include "utility.h"

26
src/servercommand.h
View File

@ -1,21 +1,19 @@
/* /*
Minetest-c55 Part of Minetest-c55
Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com> Copyright (C) 2010-11 celeron55, Perttu Ahola <celeron55@gmail.com>
Copyright (C) 2011 Ciaran Gultnieks <ciaran@ciarang.com> Copyright (C) 2011 Ciaran Gultnieks <ciaran@ciarang.com>
This program is free software; you can redistribute it and/or modify Permission to use, copy, modify, and distribute this software for any
it under the terms of the GNU General Public License as published by purpose with or without fee is hereby granted, provided that the above
the Free Software Foundation; either version 2 of the License, or copyright notice and this permission notice appear in all copies.
(at your option) any later version.
This program is distributed in the hope that it will be useful, THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
but WITHOUT ANY WARRANTY; without even the implied warranty of WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
GNU General Public License for more details. ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
You should have received a copy of the GNU General Public License along ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
with this program; if not, write to the Free Software Foundation, Inc., OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef SERVERCOMMAND_HEADER #ifndef SERVERCOMMAND_HEADER