Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3605 in orxonox.OLD for orxonox/branches/levelloader/ChangeLog


Ignore:
Timestamp:
Mar 18, 2005, 11:52:15 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: merged trunk back to levelloader
merged with command:
svn merge -r 3499:HEAD trunk branches/levelloader

Conflicts in
C track_manager.h
C world_entities/player.cc
C world_entities/player.h
C world_entities/environment.h
C lib/coord/p_node.cc
C defs/debug.h
C track_manager.cc
C story_entities/campaign.h

solved in merge-favouring. It was quite easy because Chris only worked on the headers, and he didi it quite clean. Thats the spirit :)

Conflits in world.cc are a MESS: fix it

File:
1 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/levelloader/ChangeLog

    r1956 r3605  
     12005-03-16      orxonox
     2        Finished work on version 0.2.1-pre-alpha released 0.2.2-pre-alpha
     3
     42005-03-15      Patrick Boenzli <patrick@orxonox.ethz.ch>
     5        parenting finished
     6
     72005-03-09      Patrick Boenzli <patrick@orxonox.ethz.ch>
     8        Big Cleanup again
     9       
     102005-03-01      Benjamin Grauer <bensch@orxonox.ethz.ch>
     11        Added Light Class
     12       
     132005-02-27      Benjamin Grauer <bensch@orxonox.ethz.ch>
     14        Big Configure.ac-cleanup
     15
     162005-02-22      David Gruetter <davgr@gmx.ch>
     17        Added Skysphere
     18       
     192005-01-07      Patrick Boenzli <patrick@orxonox.ethz.ch>
     20        LoadScreen implemented
     21       
     222004-12-20      Patrick Boenzli <patrick@orxonox.ethz.ch>
     23        New Version out 0.2.1-pre-alpha
     24       
     252004-12-20      Patrick Boenzli <patrick@orxonox.ethz.ch>
     26        HEAVY cleanup of the framework
     27
     282004-12-18      Patrick Boenzli <patrick@orxonox.ethz.ch>
     29        enhanced the Command Node
     30
     312004-12-15      Nico Benold <bernoldn@ee.ethz.ch>
     32        OS X support
     33       
     342004-12-15      Benjamin Grauer <bensch@orxonox.ethz.ch>
     35        Defined standard coding rules
     36
     372004-12-15      Benjamin Grauer <bensch@orxonox.ethz.ch>
     38        Added Importer for showing 3D Object.
     39
     402004-11-07      David Gruetter <davgr@gmx.ch>
     41        Shaded Terrain
     42       
     432004-10-23      Adrian Buerli <buerlia@ee.ethz.ch>
     44        Dynamic Mountains, dynamic movement.
     45       
     462004-10-18      Patrick Boenzli <patrick@orxonox.ethz.ch>
     47        Release 0.1-pre-alpha
     48
     492004-07-17      Christian Meyer <cmeyer@ee.ethz.ch>
     50        SDL-Framework
     51       
     522004-06-09      Tom of ethz
     53        Added endless Mountains
     54
     552004-06-02      Benjamin Grauer <bensch@orxonox.ethz.ch>
     56        Added Console
     57       
     582004-05-20      Patrick Boenzli <patrick@orxonox.ethz.ch>
     59        Added the ability to shoot
     60
     612004-05-05      Benjamin Grauer <bensch@orxonox.ethz.ch>
     62        Added the GUI.
     63
     642004-04-21      Patrik Boenzli <patrick@orxonox.ethz.ch>
     65        Added Makefile to orxonox
     66
     672004-04-25      Amir Guindehi <amir@guindehi.ch>
     68        Created Project Orxonox
     69       
     70
     71       
Note: See TracChangeset for help on using the changeset viewer.