Last change
on this file since 3614 was
2911,
checked in by landauf, 16 years ago
|
Merged r1-2096 of questsystem5 back to trunk
I hope there weren't more "hidden merge changes" in r2909 than the one in OverlayGroup (removeElement) (and related to this the adjustments in NotificationQueue).
The corresponding media commit seems not yet to be done, but it doesn't break the build.
|
-
Property svn:eol-style set to
native
-
Property svn:mergeinfo set to
(toggle deleted branches)
/code/branches/buildsystem2/src/orxonox/objects/quest/Rewardable.cc | 2506-2658 | /code/branches/buildsystem3/src/orxonox/objects/quest/Rewardable.cc | 2662-2708 | /code/branches/gui/src/orxonox/objects/quest/Rewardable.cc | 2795-2894 | /code/branches/lodfinal/src/orxonox/objects/quest/Rewardable.cc | 2372-2411 | /code/branches/miniprojects/src/orxonox/objects/quest/Rewardable.cc | 2754-2824 | /code/branches/network/src/orxonox/objects/quest/Rewardable.cc | 2356 | /code/branches/network64/src/orxonox/objects/quest/Rewardable.cc | 2210-2355 | /code/branches/objecthierarchy2/src/orxonox/objects/quest/Rewardable.cc | 2171-2479 | /code/branches/overlay/src/orxonox/objects/quest/Rewardable.cc | 2117-2385 | /code/branches/physics/src/orxonox/objects/quest/Rewardable.cc | 2107-2439 | /code/branches/physics_merge/src/orxonox/objects/quest/Rewardable.cc | 2436-2457 | /code/branches/pickups2/src/orxonox/objects/quest/Rewardable.cc | 2107-2497 | /code/branches/presentation/src/orxonox/objects/quest/Rewardable.cc | 2369-2652,2654-2660 | /code/branches/questsystem2/src/orxonox/objects/quest/Rewardable.cc | 2107-2259 | /code/branches/questsystem5/src/orxonox/objects/quest/Rewardable.cc | 2776-2905 | /code/branches/weapon2/src/orxonox/objects/quest/Rewardable.cc | 2107-2488 | /code/branches/weaponsystem/src/orxonox/objects/quest/Rewardable.cc | 2742-2890 | /code/trunk/src/orxonox/objects/quest/Rewardable.cc | 2-2089 |
|
File size:
1.4 KB
|
Line | |
---|
1 | /* |
---|
2 | * ORXONOX - the hottest 3D action shooter ever to exist |
---|
3 | * > www.orxonox.net < |
---|
4 | * |
---|
5 | * |
---|
6 | * License notice: |
---|
7 | * |
---|
8 | * This program is free software; you can redistribute it and/or |
---|
9 | * modify it under the terms of the GNU General Public License |
---|
10 | * as published by the Free Software Foundation; either version 2 |
---|
11 | * of the License, or (at your option) any later version. |
---|
12 | * |
---|
13 | * This program is distributed in the hope that it will be useful, |
---|
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
---|
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
---|
16 | * GNU General Public License for more details. |
---|
17 | * |
---|
18 | * You should have received a copy of the GNU General Public License |
---|
19 | * along with this program; if not, write to the Free Software |
---|
20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
---|
21 | * |
---|
22 | * Author: |
---|
23 | * Damian 'Mozork' Frick |
---|
24 | * Co-authors: |
---|
25 | * ... |
---|
26 | * |
---|
27 | */ |
---|
28 | |
---|
29 | /** |
---|
30 | @file Rewardable.cc |
---|
31 | @brief Implementation of the Rewardable class. |
---|
32 | */ |
---|
33 | |
---|
34 | #include "OrxonoxStableHeaders.h" |
---|
35 | #include "Rewardable.h" |
---|
36 | |
---|
37 | #include "core/CoreIncludes.h" |
---|
38 | |
---|
39 | namespace orxonox |
---|
40 | { |
---|
41 | /** |
---|
42 | @brief |
---|
43 | Constructor. Registers the object. |
---|
44 | */ |
---|
45 | Rewardable::Rewardable(BaseObject* creator) : BaseObject(creator) |
---|
46 | { |
---|
47 | RegisterObject(Rewardable); |
---|
48 | } |
---|
49 | |
---|
50 | /** |
---|
51 | @brief |
---|
52 | Destructor, |
---|
53 | */ |
---|
54 | Rewardable::~Rewardable() |
---|
55 | { |
---|
56 | } |
---|
57 | |
---|
58 | |
---|
59 | } |
---|
Note: See
TracBrowser
for help on using the repository browser.