Skip to content

Commit

Permalink
Merge pull request #379 from skybon/docs-link
Browse files Browse the repository at this point in the history
[Update] Change links to the new docs
  • Loading branch information
vorot93 committed Aug 11, 2015
2 parents 741bf9b + 32b06f7 commit bca3b16
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 42 deletions.
2 changes: 1 addition & 1 deletion BUILDING.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Building instructions
Please refer to http://www.rigsofrods.com/wiki/pages/Compiling_Sources
Please refer to https://rigsofrods.github.io/en/docs/index.html

## CMake options
##### Rigs of Rods core:
Expand Down
9 changes: 5 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ e.g. screenshot of graphical glitch

### Setup
* Fork, then clone the repository
* Set up your development environment, help may be found [here][compile]
* Set up your development environment, help may be found [here][docindex]
* Make sure Rigs of Rods runs properly before doing any changes

### Applying changes
Expand All @@ -60,11 +60,12 @@ e.g. screenshot of graphical glitch
* At this point you're waiting on us. We may suggest changes, improvements or alternatives

#### Additional links:
* [Documentation index][docindex]
* [Developer Wiki Portal][devwiki]
* [Doxygen documentation][doxy]

[compile]: http://www.rigsofrods.com/wiki/pages/Compiling_Sources
[style]: http://www.rigsofrods.com/wiki/pages/Coding_style
[commit]: http://www.rigsofrods.com/wiki/pages/Commit_style
[docindex]: https://rigsofrods.github.io/en/docs
[style]: https://rigsofrods.github.io/en/docs/coding-style
[commit]: https://rigsofrods.github.io/en/docs/commit-style
[devwiki]: http://www.rigsofrods.com/wiki/pages/Developer_Wiki_Portal
[doxy]: http://ror.ezzg.be/docs/
62 changes: 29 additions & 33 deletions bin/resources/scripts/races.as
Original file line number Diff line number Diff line change
@@ -1,36 +1,32 @@
/*
Hi,
You've found your way to the race system of Rigs of Rods.
If you are looking for more information on how to use this
class or what arguments should be given to certain functions,
please visit http://docs.rigsofrods.com/
If you are looking for examples on how to use this class,
please look at the scripting files of other terrains or
search the forum.
If you have questions that cannot be answerred using the
methods mentioned above, then please ask your question in
the scripting section of the Rigs of Rods forum:
http://www.rigsofrods.com/forums/167-Scripting
This class was designed to be as simple as possible for
normal users, while being as flexible as possible for
advanced users.
If you're here because this class doesn't provide the
functionality that you need for your terrain, then try
to improve the class and submit your additions using
the issue tracker of Rigs of Rods.
http://redmine.rigsofrods.com
Don't forget to increase the version numbers after every
edit! (racesManager::raceManagerVersion and
raceBuilder::raceBuilderVersion)
-- neorej16
*/
// Hi,
//
// You've found your way to the race system of Rigs of Rods.
//
// If you are looking for more information on how to use this
// class or what arguments should be given to certain functions,
// please visit https://rigsofrods.github.io/en/docs/
//
// If you are looking for examples on how to use this class,
// please look at the scripting files of other terrains or
// search the forum.
//
// If you have questions that cannot be answerred using the
// methods mentioned above, then please ask your question in
// the scripting section of the Rigs of Rods forum:
// http://www.rigsofrods.com/forums/167-Scripting
//
// This class was designed to be as simple as possible for
// normal users, while being as flexible as possible for
// advanced users.
// If you're here because this class doesn't provide the
// functionality that you need for your terrain, then try
// to improve the class and submit your additions using
// the issue tracker of Rigs of Rods.
// http://github.com/RigsOfRods/rigs-of-rods/issues
//
// Don't forget to increase the version numbers after every
// edit! (racesManager::raceManagerVersion and
// raceBuilder::raceBuilderVersion)

// Define a function signature for the callback pointers
funcdef void RACE_EVENT_CALLBACK(dictionary@);
Expand Down
2 changes: 1 addition & 1 deletion source/main/gfx/OgreSubsystem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ bool OgreSubsystem::StartOgre(Ogre::String const & name, Ogre::String const & hw
}
catch(Ogre::Exception& e)
{
Ogre::String url = "http://wiki.rigsofrods.com/index.php?title=Error_" + TOSTRING(e.getNumber())+"#"+e.getSource();
Ogre::String url = "https://rigsofrods.github.io/en/docs/errors/index.html#" + TOSTRING(e.getNumber());
ErrorUtils::ShowOgreWebError(_L("A fatal exception has occured!"), ANSI_TO_UTF(e.getFullDescription()), ANSI_TO_UTF(url));
ErrorUtils::ShowStoredOgreWebErrors();
exit(1);
Expand Down
2 changes: 1 addition & 1 deletion source/main/gui/OverlayWrapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ int OverlayWrapper::init()
directionArrowText = (TextAreaOverlayElement*)loadOverlayElement("tracks/DirectionArrow/Text");
} catch(...)
{
String url = "http://wiki.rigsofrods.com/index.php?title=Error_Resources_Not_Found";
String url = "https://rigsofrods.github.io/en/docs/errors/index.html#Error_Resources_Not_Found";
ErrorUtils::ShowOgreWebError("Resources not found!", "please ensure that your installation is complete and the resources are installed properly. If this error persists please re-install RoR.", url);
}
directionArrowDistance = (TextAreaOverlayElement*)loadOverlayElement("tracks/DirectionArrow/Distance");
Expand Down
2 changes: 1 addition & 1 deletion source/main/main_sim/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ int main(int argc, char *argv[])
}
catch (Ogre::Exception& e)
{
String url = "http://wiki.rigsofrods.com/index.php?title=Error_" + TOSTRING(e.getNumber())+"#"+e.getSource();
String url = "https://rigsofrods.github.io/en/docs/errors/index.html#" + TOSTRING(e.getNumber());
ErrorUtils::ShowOgreWebError(_L("An exception has occured!"), e.getFullDescription(), url);
}
catch (std::runtime_error& e)
Expand Down
2 changes: 1 addition & 1 deletion source/main/physics/collision/Collisions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ int Collisions::loadGroundModelsConfigFile(Ogre::String filename)
if (this->collision_version != LATEST_GROUND_MODEL_VERSION)
{
// message box
String url = "http://wiki.rigsofrods.com/index.php?title=Error_Old_ground_model#"+TOSTRING(this->collision_version)+"to"+TOSTRING(LATEST_GROUND_MODEL_VERSION);
String url = "https://rigsofrods.github.io/en/docs/errors/index.html#Error_Old_ground_model";
ErrorUtils::ShowOgreWebError(_L("Configuration error"), _L("Your ground configuration is too old, please copy skeleton/config/ground_models.cfg to My Documents/Rigs of Rods/config"), url);
ErrorUtils::ShowStoredOgreWebErrors();
exit(124);
Expand Down

0 comments on commit bca3b16

Please # to comment.