|
Last change
on this file since 7142 was
6746,
checked in by rgrieder, 15 years ago
|
|
Merged gamestates2 branch back to trunk.
This brings in some heavy changes in the GUI framework.
It should also fix problems with triggered asserts in the InputManager.
Note: PickupInventory does not seem to work —> Segfault when showing because before, the owner in GUIOverlay::setGUIName is already NULL.
I haven't tested it before, so I can't tell whether it's my changes.
|
-
Property svn:eol-style set to
native
|
|
File size:
420 bytes
|
| Rev | Line | |
|---|
| [5427] | 1 | <?xml version="1.0" ?> |
|---|
| [5438] | 2 | <GUIScheme Name="OrxonoxGUI"> |
|---|
| [5951] | 3 | <Imageset Name="MainMenuBackground" Filename="MainMenuBackground.imageset"/> |
|---|
| [6711] | 4 | <Imageset Name="PickupInventory" Filename="PickupInventory.imageset"/> |
|---|
| [6746] | 5 | <Font Name="BlueHighway-12" Filename="bluehighway-12.font" /> |
|---|
| 6 | <Font Name="BlueHighway-10" Filename="bluehighway-10.font" /> |
|---|
| 7 | <Font Name="BlueHighway-8" Filename="bluehighway-8.font" /> |
|---|
| [5438] | 8 | </GUIScheme> |
|---|
Note: See
TracBrowser
for help on using the repository browser.
