|
|
|
@11356
|
8 years |
patricwi |
merged space race with trunk
|
|
|
|
@11353
|
8 years |
patricwi |
merged HUD branch to trunk
|
|
|
|
@11080
|
9 years |
landauf |
merged shaders back to trunk (pps project from HS 2012)
|
|
|
|
@10624
|
9 years |
landauf |
merged branch core7 back to trunk
|
|
|
|
@10216
|
10 years |
landauf |
merged branch presentationFS14 back to trunk
|
|
|
|
@9348
|
12 years |
landauf |
merged branch presentation2012merge back to trunk
|
|
|
|
@8858
|
13 years |
landauf |
merged output branch back to trunk.
Changes:
- you have to include …
|
|
|
|
@8729
|
13 years |
rgrieder |
Merged unity_build branch back to trunk.
Features:
- Implemented …
|
|
|
|
@8351
|
14 years |
rgrieder |
Merged kicklib2 branch back to trunk (includes former branches …
|
|
|
|
@7648
|
14 years |
dafrick |
Merged releasetodo, containing a new way to describe and tag levels, …
|
|
|
|
@7504
|
14 years |
dafrick |
Pickups module is now (from what I can tell after some basic testing) …
|
|
|
|
@7401
|
14 years |
landauf |
merged doc branch back to trunk
|
|
|
|
@7163
|
14 years |
dafrick |
Merged presentation3 branch into trunk.
|
|
|
|
@6711
|
15 years |
dafrick |
Merged pickup4 branch back to trunk.
|
|
|
|
@6524
|
15 years |
dafrick |
Merged pickup branch into trunk. Yay. Persisting bugs will be fixed, …
|
|
|
|
@6417
|
15 years |
rgrieder |
Merged presentation2 branch back to trunk.
Major new features:
- …
|
|
|
|
@5929
|
15 years |
rgrieder |
Merged core5 branch back to the trunk.
Key features include clean …
|
|
|
|
@5781
|
15 years |
rgrieder |
Reverted trunk again. We might want to find a way to delete these …
|
|
|
|
@5774
|
15 years |
rgrieder |
Removed almost everything. Should be working already, but not yet …
|
|
|
|
@5752
|
15 years |
rgrieder |
Small changes for the include directories:
- Our own directories get …
|
|
|
|
@5744
|
15 years |
rgrieder |
Visual studio debugger working again (had to move the project modifier …
|
|
|
|
@5738
|
15 years |
landauf |
merged libraries2 back to trunk
|
|
|
|
@5693
|
15 years |
landauf |
merged libraries branch back to trunk
|
|
|
|
@3370
|
15 years |
rgrieder |
Merged resource branch back to the trunk. Changes:
- Automated …
|
|
|
|
@3280
|
15 years |
rgrieder |
Merged most of the core4 revisions back to the trunk except for:
- …
|
|
|
|
@3204
|
15 years |
rgrieder |
PCH should be enabled by default for the orxonox target.
|
|
|
|
@3196
|
15 years |
rgrieder |
Merged pch branch back to trunk.
|
|
|
|
@3110
|
15 years |
rgrieder |
Removed old msvc specific support for precompiled header files.
|
|
|
|
@3073
|
16 years |
landauf |
merged pickups2 branch back to trunk. not yet tested.
|
|
|
|
@3060
|
16 years |
scheusso |
merged sound2 back to trunk
|
|
|
|
@2963
|
16 years |
dafrick |
Some Quest stuff, and the rest for the GUIOverlay I failed to commit …
|
|
|
|
@2896
|
16 years |
landauf |
Merged gui branch back to trunk.
I did 2 small changes in …
|
|
|
|
@2748
|
16 years |
rgrieder |
- Removed very old testing file
- Removed old testing CMake code. Also …
|
|
|
|
@2710
|
16 years |
rgrieder |
Merged buildsystem3 containing buildsystem2 containing Adi's …
|
|
|
|
@2662
|
16 years |
rgrieder |
Merged presentation branch back to trunk.
|
|
|
|
@2171
|
16 years |
landauf |
merged revisions 2111-2170 from objecthierarchy branch back to trunk.
|
|
|
|
@2130
|
16 years |
rgrieder |
Trunk should be functional again with these changes
|
|
|
|
@2129
|
16 years |
rgrieder |
Applied changes from HEAD again. I have found a way to solve the problem..
|
|
|
|
@2127
|
16 years |
rgrieder |
Reverted last two revisions: I just don't have the time to finish it …
|
|
|
|
@2126
|
16 years |
rgrieder |
Trying to extend ADD_SOURCE_FILES recursively.
|
|
|
|
@2125
|
16 years |
rgrieder |
Added CMake macro to more easily incude subfolders
|
|
|
|
@2106
|
16 years |
landauf |
moved WeaponSystem.h and .cc into the objects/weaponSystem directory
|
|
|
|
@2097
|
16 years |
landauf |
adopted weapon classes to the new hierarchy (with a creator pointer)
|
|
|
|
@2092
|
16 years |
landauf |
- adopted quest classes to the new hierarchy (with a creator pointer)
…
|
|
|
|
@2087
|
16 years |
landauf |
merged objecthierarchy branch back to trunk
|
|
|
|
@1844
|
16 years |
rgrieder |
Removed ois dependency from orxonox and removed lua dependency from util
|
|
|
|
@1843
|
16 years |
rgrieder |
Added tolua_bind.h for core and orxonox to the output list —> make …
|
|
|
|
@1817
|
16 years |
rgrieder |
fixed CMLs…
|
|
|
|
@1815
|
16 years |
rgrieder |
added more tolua dependencies (our own header files)
fixed msvc files
|
|
|
|
@1813
|
16 years |
rgrieder |
Added all necessary dependencies so that the tolua bind files are …
|
|
|
|
@1810
|
16 years |
rgrieder |
merged ceguilua branch back to trunk
|
|
|
|
@1755
|
16 years |
rgrieder |
merged gui back to trunk.
update the media repository!
|
|
|
|
@1747
|
16 years |
landauf |
merged core3 back to trunk
|
|
|
|
@1625
|
16 years |
rgrieder |
merged hud branch back to trunk
|
|
|
|
@1612
|
16 years |
rgrieder |
tardis boxes were updated to cmake 2.6 which revealed a bug. [fixed]
|
|
|
|
@1608
|
16 years |
landauf |
- added a backlight to all SpaceShips, leaving a trail behind …
|
|
|
|
@1555
|
16 years |
landauf |
- ParticleInterface uses Orxonox::getTimeFactor to make particle …
|
|
|
|
@1553
|
16 years |
landauf |
moved ParticleInterface to tools, deleted particle
by the way, the …
|
|
|
|
@1552
|
16 years |
landauf |
several improvements:
- AI works properly now - add enemies with …
|
|
|
|
@1535
|
16 years |
rgrieder |
merged input branch back to trunk
|
|
|
|
@1505
|
16 years |
rgrieder |
f* svn: It doesn't even inform you if you attempt to set a non …
|
|
|
|
@1504
|
16 years |
rgrieder |
Once again, set all the svn:eol-style property to native. I really …
|
|
|
|
@1502
|
16 years |
rgrieder |
- @everyone: Do not create a branch until I've added the svn:eol-style …
|
|
|
|
@1407
|
17 years |
rgrieder |
- reverted the HUD changes to ease up back merge from network branch …
|
|
|
|
@1393
|
17 years |
FelixSchulthess |
moved navigation marker to new class: Navigation
|
|
|
|
@1362
|
17 years |
scheusso |
merged hud3 branch into trunk and changed camera orientation
|
|
|
|
@1293
|
17 years |
scheusso |
merged changes from input & camera & network branch into trunk
|
|
|
|
@1224
|
17 years |
rgrieder |
- little clean up in CMLs
|
|
|
|
@1219
|
17 years |
rgrieder |
merged input branch back to trunk. Not yet tested on tardis
|
|
|
|
@1214
|
17 years |
landauf |
merged console-branch back to trunk.
IMPORTANT: update your media …
|
|
|
|
@1209
|
17 years |
rgrieder |
- moved tinyxml and tolua folders
|
|
|
|
@1153
|
17 years |
rgrieder |
- merged cmake branch back to trunk (the last one, hopefully  )
- …
|
|
|
|
@1070
|
17 years |
rgrieder |
- moved "—no-undefined" linker flag to root CMLs
- removed library …
|
|
|
|
@1059
|
17 years |
rgrieder |
- updated VC++ files
- 3 tiny bugfixes
|
|
|
|
@1052
|
17 years |
landauf |
merged core2 back to trunk
there might be some errors, wasn't able to …
|
|
|
|
@1038
|
17 years |
landauf |
compiles on tardis
|
|
|
|
@1037
|
17 years |
landauf |
moved tolua from util to core because of circular dependencies …
|
|
|
|
@1032
|
17 years |
rgrieder |
- singletonized GraphicsEngine
—> Orxonox.h has to included only …
|
|
|
|
@1024
|
17 years |
rgrieder |
merged input back into trunk
note: I have created an asylum with …
|
|
|
|
@1021
|
17 years |
bknecht |
merged back that script-branch
|
|
|
|
@871
|
17 years |
landauf |
merged core branch to trunk
|
|
|
|
@790
|
17 years |
nicolasc |
merged FICN back into trunk
awaiting release.
|
|
copied from code/branches/FICN/src/orxonox/CMakeLists.txt:
|
|
|
|
@774
|
17 years |
rgrieder |
- changed executable from main to orxonox
- added src/orxonox to the …
|
