diff options
author | Alexander Sulfrian <alexander@sulfrian.net> | 2015-05-20 23:31:33 +0200 |
---|---|---|
committer | Alexander Sulfrian <alexander@sulfrian.net> | 2015-05-20 23:31:33 +0200 |
commit | f509312bfe078d18b6f57af8011999231864d7fe (patch) | |
tree | a197c0da3ef01902c8c2bb6b40daedf113302a6c /src/object/object.h | |
parent | 5d15d37ef23a43ebe595674b7503112407356cb0 (diff) | |
parent | e2be034ec369dbe23b17281a21338282a0258ff2 (diff) | |
download | colobot-f509312bfe078d18b6f57af8011999231864d7fe.tar.gz colobot-f509312bfe078d18b6f57af8011999231864d7fe.tar.bz2 colobot-f509312bfe078d18b6f57af8011999231864d7fe.zip |
Merge commit 'colobot-gold-0.1.4-alpha' into debian
* commit 'colobot-gold-0.1.4-alpha': (159 commits)
Release alpha-0.1.4
Fixed console spam when music files are not installed
Updated data submodule
Fixed amount of fireball damage done to allies, close issue #356
Fixed icon on Windows; updated properties in .rc file
COLOBOT: Gold Edition -> Colobot: Gold Edition
Updated data submodule
#335, #348, #352
Updated INSTALL.md to reflect latest changes to music repository
Added oggenc to Travis config
Fallback to English files if translated ones are not available
Removed duplicate license header
Tools for measuring mission time without opening game window
Fixed m_exitAfterMission
Fixed #335 and #348
Added -headless
Changing resolution from commandline
-runscene for userlevels
Increased mission end accuracy
Added some debug stuff, possible fix for #348 and #335
...
Diffstat (limited to 'src/object/object.h')
-rw-r--r-- | src/object/object.h | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/src/object/object.h b/src/object/object.h index 0e469f2..9283c9b 100644 --- a/src/object/object.h +++ b/src/object/object.h @@ -1,18 +1,21 @@ -// * This file is part of the COLOBOT source code -// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch -// * -// * This program is free software: you can redistribute it and/or modify -// * it under the terms of the GNU General Public License as published by -// * the Free Software Foundation, either version 3 of the License, or -// * (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have received a copy of the GNU General Public License -// * along with this program. If not, see http://www.gnu.org/licenses/. +/* + * This file is part of the Colobot: Gold Edition source code + * Copyright (C) 2001-2014, Daniel Roux, EPSITEC SA & TerranovaTeam + * http://epsiteŃ.ch; http://colobot.info; http://github.com/colobot + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://gnu.org/licenses + */ /** * \file object/object.h |