Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: orxonox.OLD/orxonox/branches/levelloader/src/orxonox.conf @ 3646

Last change on this file since 3646 was 3605, checked in by bensch, 20 years ago

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 size: 157 bytes
RevLine 
[2170]1[Bindings]
2UP=up
3DOWN=down
4LEFT=left
5RIGHT=right
6SPACE=fire
[3605]7m=mode
[2170]8ESCAPE=quit
[2636]9p=pause
[2170]10q=quit
11BUTTON_LEFT=fire
12BUTTON_RIGHT=altfire
[2636]13x=up_world
14z=down_world
15
Note: See TracBrowser for help on using the repository browser.