Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 086ef25
Author: Joaquin Gomez <joa97@hotmail.com.ar>
Date:   Mon Apr 18 15:12:21 2022 +0000

    :globe_with_meridians: Translated using Weblate (Spanish)

    Currently translated at 99.9% (1046 of 1047 strings)

    Translation: Rigs of Rods/Game
    Translate-URL: https://hosted.weblate.org/projects/rigs-of-rods/game/es/

commit 7d588ae
Author: JonnathanRiquelmo <jonnathan.riquelmo@gmail.com>
Date:   Fri Mar 18 03:03:43 2022 +0000

    :globe_with_meridians: Translated using Weblate (Portuguese)

    Currently translated at 92.6% (970 of 1047 strings)

    Translation: Rigs of Rods/Game
    Translate-URL: https://hosted.weblate.org/projects/rigs-of-rods/game/pt/

commit 76828b8
Author: Hosted Weblate <hosted@weblate.org>
Date:   Sun Mar 13 11:10:01 2022 +0100

    :globe_with_meridians: Update translation files

    Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

    Translation: Rigs of Rods/Game
    Translate-URL: https://hosted.weblate.org/projects/rigs-of-rods/game/

commit 35b631a
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Apr 11 16:19:59 2022 +0000

    Bump actions/upload-artifact from 2 to 3 (RigsOfRods#2896)

commit c980fcd
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Fri Apr 8 23:40:59 2022 +0200

    Doxygen: documented class raceBuilder

commit 709c888
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Fri Apr 8 23:23:28 2022 +0200

    Doxygen: script classes now show directly on module page.

commit 61087bb
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Fri Apr 8 23:22:16 2022 +0200

    Doxygen: fixed typo on main page

commit 5e1ff04
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Fri Apr 8 22:53:09 2022 +0200

    Doxygen: fixed wrong script class names.

    Also renamed file 'global_functions.h' to just 'globals.h' since it's mostly enums anyway.

commit cf91e91
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Fri Apr 8 14:13:27 2022 +0200

    :bug: Removed broken script class BeamFactoryClass

    it could be instantiated, but it would have no effect.

commit 75222d4
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Fri Apr 8 02:03:32 2022 +0200

    Doxygen: fixed a lot of warnings

    Redundant docs simply deleted.
    GUi_GameControls: deleted unused variable `m_text_all_active` - leftover from removed .map file combobox.

commit 84d33c0
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Thu Apr 7 20:36:09 2022 +0200

    Doxygen: fixed 'no matching item found' warnings.

commit b882612
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Thu Apr 7 19:20:15 2022 +0200

    :wastebasket: Del. unused `trimUTFString()`

commit e9648b5
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Thu Apr 7 15:15:36 2022 +0200

    Doxygen: Organized directory 'utils/', added module Input.

commit 580b6b5
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Thu Apr 7 14:25:14 2022 +0200

    Doxygen: added module Gfx/Particle, fixed warnings, added `override` keyword.

    There were many broken @copydoc/@Copyref directives - removed in favor of simple member group explaining where the API is from.

commit 0ad35b7
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Thu Apr 7 13:55:49 2022 +0200

    Doxygen: added module Camera

commit 93fbf0e
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Thu Apr 7 13:49:18 2022 +0200

    Doxygen: added missing @defgroup-s, improved formatting.

commit 5ab574c
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Thu Apr 7 13:21:13 2022 +0200

    Doxygen: added script APIref link to mainpage.

commit 5d8a643
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Sat Mar 12 19:34:15 2022 +0100

    :books: Doxygen: Added module 'network'.

commit 4bde1cb
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Sat Mar 12 19:11:41 2022 +0100

    :books: Doxygen: added module 'Scripting'.

commit cdfe0ae
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Sat Mar 12 18:16:47 2022 +0100

    :books: Doxygen: fixed most warnings.

commit 3ca07c4
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Sat Feb 26 23:23:39 2022 +0100

    :angel: Added doc for callbacks and races.

    The angelscript documentation is now divided into 3 pseudo-modules:

     	Game-to-script
     	^AngelScript^ Documents script functions (callbacks) invoked by the game.

     	Script-to-game
     	^AngelScript^ Documents game functions which scripts can invoke to control it.

     	Script-to-script
     	^AngelScript^ Documents built-in scripts.

commit 60892f4
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Sat Feb 26 17:27:40 2022 +0100

    :broom: Doxygen: Consolidated @defgroup commands to 'Modules.h'.

    Also fixed many 'missing title' warnings.
    Also fixed INPUT tag.

commit af842d6
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Thu Feb 24 01:16:54 2022 +0100

    :books: Doxygen: + modules Gfx, Hydrax, Flex

commit cc4d69f
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Thu Feb 24 00:51:08 2022 +0100

    :wastebasket: Rem. unused source files DecalManager.h/cpp

commit d8a3b5b
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Thu Feb 24 00:45:31 2022 +0100

    :books: Doxygen: added module Terrain

commit b59597c
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Thu Feb 24 00:35:46 2022 +0100

    :books: Doxygen: code overview is now on mainpage.

commit 87024e1
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Wed Feb 23 23:21:46 2022 +0100

    :books: Doxygen: added module Audio

commit b1a9e16
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Wed Feb 23 21:32:52 2022 +0100

    :books: Doxygen: +Gameplay {Land vehicles, Aerial, Marine, Character}

commit 6752a76
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Wed Feb 23 21:09:03 2022 +0100

    :bug: Fixed namespace leak in TurboProp.h

commit fd3b771
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Wed Feb 23 20:50:07 2022 +0100

    :books: Doxygen: added 'Physics' & 'Collisions' modules.

commit 904658b
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Wed Feb 23 20:42:04 2022 +0100

    :wastebasket: Rem. unused source files CollisionTools.h/cpp

commit 0da1c91
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Wed Feb 23 19:41:59 2022 +0100

    :books: Doxygen: added modules 'Game state' & 'Message queue'

commit 87587b0
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Wed Feb 23 18:12:37 2022 +0100

    :books: Doxygen: added 'Application' module.

commit 9447f5c
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Wed Feb 23 17:19:14 2022 +0100

    :wastebasket: Doxygen: removed stray OGRE module.

commit 79079af
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Wed Feb 23 17:00:51 2022 +0100

    :books: Doxygen: added Console & Console commands modules.

commit 6a46115
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Wed Feb 23 16:21:05 2022 +0100

    :angel: Merged angelscript doc into codebase Doxygen.

    Introduced faux namespace ScriptAPI and faux module 'Script-side API'

commit f15df88
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Tue Feb 22 14:39:48 2022 +0100

    :art: Doxygen: changed theme to blue, applied doxygen-awesome.css

commit 3651c9e
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Mon Feb 21 16:12:28 2022 +0100

    :wastebasket: Removed dead MyGUI helper sources.

commit f4abf80
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Mon Feb 21 16:05:07 2022 +0100

    :books: Doxygen: excluded DearIMGUI source files.

commit acc3dea
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Mon Feb 21 13:53:14 2022 +0100

    :wastebasket: Rem. dead source file FileSystemInfo.h

    Leftover from RigEditor era, circa 2014-15

commit 9079447
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Tue Jan 26 13:44:04 2021 +0100

    :books: Doxygen/overview: network, GUI, sim, gfx

commit d48554e
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Mon Jan 25 01:25:44 2021 +0100

    :books: Doxygen: cover also angelscript, audio and network

commit ebecec7
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Mon Jan 25 01:02:22 2021 +0100

    :books: Doxy overview: added console cmd, terrn, odef, tobj, script

commit d2069aa
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Sun Jan 24 20:51:33 2021 +0100

    :books: Doxygen overview: added modcache

commit 38949c2
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Sat Jan 23 22:55:34 2021 +0100

    :books: Doxygen overview: added audio, fs, message queue, cvars

commit 70b695e
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Sat Jan 23 18:53:27 2021 +0100

    :books: Doxygen: added codebase overview page

commit 185d106
Author: tritonas00 <tritonas00@gmail.com>
Date:   Sat Apr 9 00:44:05 2022 +0300

    mp selector: replaced refreshing message with spinner

commit b503880
Author: tritonas00 <tritonas00@gmail.com>
Date:   Sat Apr 9 00:09:52 2022 +0300

    replaced old spinner with repo panel one

commit 4a312d8
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Fri Apr 8 22:37:43 2022 +0200

    codechange: MP client list UI - added icon cache

commit 7c4176e
Author: tritonas00 <tritonas00@gmail.com>
Date:   Fri Apr 8 19:59:02 2022 +0300

    bonus: corrected extra semicolon typo

commit 1aff80a
Author: tritonas00 <tritonas00@gmail.com>
Date:   Thu Apr 7 00:55:33 2022 +0300

    added icon in network quality warning

commit e449239
Author: tritonas00 <tritonas00@gmail.com>
Date:   Fri Apr 8 19:23:59 2022 +0300

    Update BUILDING.md

commit 1488c57
Author: Edgar <Edgar@AnotherFoxGuy.com>
Date:   Thu Mar 31 13:53:46 2022 +0200

    :wrench: Made content folder building optional

commit 05ed057
Author: Edgar <Edgar@AnotherFoxGuy.com>
Date:   Sun Mar 27 11:06:00 2022 +0200

    :arrow_up: Updated angelscript to 2.35.1

commit 260ede7
Author: tritonas00 <tritonas00@gmail.com>
Date:   Thu Apr 7 17:03:45 2022 +0300

    use ois 1.4

commit a7477d4
Author: tritonas00 <tritonas00@gmail.com>
Date:   Thu Apr 7 15:52:55 2022 +0300

    Update BUILDING.md

commit 658c3e0
Author: tritonas00 <tritonas00@gmail.com>
Date:   Wed Apr 6 22:00:58 2022 +0300

    network quality fixes

commit eed02ff
Author: Edgar <Edgar@AnotherFoxGuy.com>
Date:   Sun Apr 3 10:47:17 2022 +0200

    :arrow_up: Update zlib to 1.2.12

commit 4bb7bae
Author: tritonas00 <tritonas00@gmail.com>
Date:   Sat Apr 2 00:00:15 2022 +0300

    fixed pssm glitches

commit fe6e9fe
Author: tritonas00 <tritonas00@gmail.com>
Date:   Mon Mar 28 12:53:17 2022 +0300

    fixed selector switching to All category when searching

commit 7a75f6a
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Wed Mar 30 23:08:38 2022 +0200

    Revert "fixed visual glitches with PSSM"

    This reverts commit 77caa97.

commit 3ff1934
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Wed Mar 30 23:04:21 2022 +0200

    Revert "set depth_bias only on character/vehicles"

    This reverts commit 973dccb.

commit 0b541ea
Author: Edgar <Edgar@AnotherFoxGuy.com>
Date:   Sat Mar 26 11:47:58 2022 +0100

    :bug: Fixed build without PCH

commit 5de39a6
Author: Edgar <Edgar@AnotherFoxGuy.com>
Date:   Tue Mar 22 16:44:50 2022 +0100

    :construction_worker: Remove DirectX SDK install step

commit 973dccb
Author: tritonas00 <tritonas00@gmail.com>
Date:   Mon Mar 21 19:22:47 2022 +0200

    set depth_bias only on character/vehicles

commit 625e582
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Mar 21 18:24:03 2022 +0000

    :arrow_up: Bump actions/cache from 2.1.7 to 3 (RigsOfRods#2878)

commit 1f5ac18
Author: Edgar <Edgar@AnotherFoxGuy.com>
Date:   Sun Mar 20 12:32:48 2022 +0100

    :bug: Fixed CMake option for specifying a custom version

commit 77caa97
Author: tritonas00 <tritonas00@gmail.com>
Date:   Sun Mar 20 00:23:58 2022 +0200

    fixed visual glitches with PSSM

commit f6b80c0
Author: tritonas00 <tritonas00@gmail.com>
Date:   Fri Mar 18 07:52:45 2022 +0200

    check if farther details level is greater than closer

commit 95a32fc
Author: Edgar <Edgar@AnotherFoxGuy.com>
Date:   Thu Mar 17 20:04:41 2022 +0100

    :construction_worker: Updated windows CI image to windows-2019

commit a4aed05
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Thu Mar 17 22:05:16 2022 +0100

    :wrench: Tolerate missing } in .skin file format, with warning.

commit 251c9ea
Author: Edgar <Edgar@AnotherFoxGuy.com>
Date:   Fri Mar 18 11:08:36 2022 +0100

    :arrow_up: Updated socketw to 3.11.0

commit b2fed2e
Author: Edgar <Edgar@AnotherFoxGuy.com>
Date:   Thu Feb 24 13:04:30 2022 +0100

    :arrow_up: Updated angelscript to 2.35.0

commit 9f9fd45
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Thu Mar 17 21:13:49 2022 +0100

    :bug: Modcache: fixed inconsistent resource group info after bundle reload.

    Fixes RigsOfRods#2864
    CacheEntries often share the same resoruce bundle (think multiple .truck or .skin files in one ZIP). In that case, their 'resource_group' member variable should always be in sync. This was done properly in UnLoadResource() but not in LoadResource().

commit 9f033f5
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Thu Mar 17 20:43:00 2022 +0100

    :bug: Modcache: fixed unloading resource bundles.

    Removed stray line accidentally duplicated from ReLoadResource() in 28f2cf0

commit 553faf9
Author: tritonas00 <tritonas00@gmail.com>
Date:   Wed Mar 16 17:34:44 2022 +0200

    don't crash on invalid icon name

commit 7707c80
Author: tritonas00 <tritonas00@gmail.com>
Date:   Sun Mar 6 18:52:27 2022 +0200

    fixed caelum sky rendered black on left mirror

commit 453449c
Author: Edgar <Edgar@AnotherFoxGuy.com>
Date:   Sun Mar 13 10:59:35 2022 +0100

    :globe_with_meridians: Updated RoR.pot

commit ec6b7d7
Author: tritonas00 <tritonas00@gmail.com>
Date:   Sun Mar 13 00:47:19 2022 +0200

    dropped miscalculated download speed+remaining time

commit f4c676d
Author: tritonas00 <tritonas00@gmail.com>
Date:   Sat Mar 12 07:12:44 2022 +0200

    updated api url

commit a92ba66
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Fri Mar 11 21:12:55 2022 +0100

    Repo UI: Do not leak CURL on exception.

commit 888147a
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Fri Mar 11 21:09:10 2022 +0100

    Repo UI: Improved item visibility in 'compact' view.

commit b3831d3
Author: tritonas00 <tritonas00@gmail.com>
Date:   Fri Nov 19 19:48:06 2021 +0200

    added repository selector panel

commit 0357b92
Author: tritonas00 <tritonas00@gmail.com>
Date:   Fri Mar 11 08:45:15 2022 +0200

    fixed crash when deleting actor while holding backspace

commit 331a668
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Mar 7 16:58:50 2022 +0000

    :arrow_up: Bump actions/checkout from 2.4.0 to 3 (RigsOfRods#2863)

commit abc8ab7
Author: tritonas00 <tritonas00@gmail.com>
Date:   Tue Feb 22 04:57:53 2022 +0200

    hide mouse when loading terrain

commit dc7ac1a
Author: tritonas00 <tritonas00@gmail.com>
Date:   Mon Feb 28 23:28:48 2022 +0200

    added uid in player list

commit ad9fb06
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Mon Feb 21 04:56:49 2022 +0100

    :bug: Fixed DearIMGUI NewFrame()/EndFrame() mismatch.

commit 918bdf8
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Wed Dec 15 23:48:14 2021 +0100

    Revert "Fixed DearIMGUI debug assert - missing EndFrame()"

    This reverts commit 627d85b.

commit f26e5a7
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Wed Feb 16 22:27:53 2022 +0100

    :bug: Also unload default terrain script when used.

commit 1db14cd
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Wed Feb 16 22:05:14 2022 +0100

    :broom: ScriptEngine: removed unused return value, for clarity.

commit 2f61799
Author: Petr Ohlidal <petr@ohlidal.cz>
Date:   Wed Feb 16 22:03:24 2022 +0100

    :broom: Collisions: removed unused return value, for clarity.

commit d760a76
Author: 404 <212174808@qq.com>
Date:   Sat Feb 19 14:27:06 2022 +0000

    :globe_with_meridians: Translated using Weblate (Chinese (Simplified))

    Currently translated at 100.0% (970 of 970 strings)

    Translation: Rigs of Rods/Game
    Translate-URL: https://hosted.weblate.org/projects/rigs-of-rods/game/zh_Hans/

commit 9e71219
Author: Maxime Leroy <lisacintosh@gmail.com>
Date:   Tue Feb 1 21:39:46 2022 +0000

    :globe_with_meridians: Translated using Weblate (French)

    Currently translated at 95.8% (930 of 970 strings)

    Translation: Rigs of Rods/Game
    Translate-URL: https://hosted.weblate.org/projects/rigs-of-rods/game/fr/

commit 3b4abda
Author: tritonas00 <tritonas00@gmail.com>
Date:   Sat Feb 12 18:46:14 2022 +0200

    bigger shortcut buttons

commit 53e6884
Author: tritonas00 <tritonas00@gmail.com>
Date:   Sat Feb 12 16:26:27 2022 +0200

    fixed invalid icon

commit 12ca23d
Author: Edgar <Edgar@AnotherFoxGuy.com>
Date:   Tue Feb 1 15:05:40 2022 +0100

    :globe_with_meridians: Translated using Weblate  (French)

commit 60fb93c
Author: Weblate (bot) <hosted@weblate.org>
Date:   Tue Feb 1 14:54:59 2022 +0100

    Translations update from Hosted Weblate (RigsOfRods#2845)

    Co-authored-by: Maxime Leroy <lisacintosh@gmail.com>
    Co-authored-by: MeblIkea <salulespotos@gmail.com>
    Co-authored-by: Xploder98 <xploder9825@yandex.com>
  • Loading branch information
@Zentro
Zentro committed Apr 22, 2022
1 parent 98f7b71 commit 503e0c4
Show file tree
Hide file tree
Showing 261 changed files with 35,226 additions and 12,003 deletions.
37 changes: 19 additions & 18 deletions .github/workflows/build-game.yml
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
---
name: Build game

on: [ push, pull_request ]
on: [push, pull_request]

jobs:
build-gcc:
name: Linux build on Ubuntu
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2.4.0
- uses: actions/checkout@v3
with:
submodules: true

- name: Cache conan
uses: actions/cache@v2.1.7
uses: actions/cache@v3
with:
key: conan-${{ hashFiles('cmake/DependenciesConfig.cmake') }}
path: ~/.conan/
Expand Down Expand Up @@ -41,7 +41,7 @@ jobs:
shell: bash

- name: Configure
run: cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=redist .
run: cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=redist -DCREATE_CONTENT_FOLDER=ON .
shell: bash

- name: Build
Expand All @@ -62,7 +62,7 @@ jobs:
shell: bash

- name: Upload redist folder
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: ror-linux
path: redist
Expand All @@ -73,38 +73,39 @@ jobs:

build-msvc:
name: Windows build
runs-on: windows-2016
runs-on: windows-2019
env:
DXSDK_DIR: C:\apps\Microsoft DirectX SDK\
BUILD_TOOLS_PATH: C:\apps\build-tools\
steps:
- run: echo $env:BUILD_TOOLS_PATH | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append

- uses: actions/checkout@v2.4.0
- uses: actions/checkout@v3
with:
submodules: true

- name: Install Microsoft DirectX SDK and Build tools
- name: Install Build tools
shell: cmake -P {0}
run: |
file(MAKE_DIRECTORY $ENV{DXSDK_DIR})
file(DOWNLOAD http://prdownloads.sourceforge.net/rigs-of-rods/DirectX-SDK.zip "$ENV{TMP}/DirectX.zip" SHOW_PROGRESS)
execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf "$ENV{TMP}/DirectX.zip" WORKING_DIRECTORY "$ENV{DXSDK_DIR}")
file(MAKE_DIRECTORY $ENV{BUILD_TOOLS_PATH})
file(DOWNLOAD http://prdownloads.sourceforge.net/rigs-of-rods/build-tools.zip "$ENV{TMP}/build-tools.zip" SHOW_PROGRESS)
file(DOWNLOAD https://cdn.anotherfoxguy.com/build-tools.zip "$ENV{TMP}/build-tools.zip" SHOW_PROGRESS)
execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf "$ENV{TMP}/build-tools.zip" WORKING_DIRECTORY "$ENV{BUILD_TOOLS_PATH}")
- name: Cache conan packages
uses: actions/cache@v2.1.7
- name: Cache conan packages Part 1
uses: actions/cache@v3
with:
key: conan-${{ hashFiles('cmake/DependenciesConfig.cmake') }}
key: conan-user-${{ hashFiles('cmake/DependenciesConfig.cmake') }}
path: ~/.conan
- name: Cache conan packages Part 2
uses: actions/cache@v3
with:
key: conan-root-${{ hashFiles('cmake/DependenciesConfig.cmake') }}
path: C:/.conan/

- name: Enable Developer Command Prompt
uses: ilammy/msvc-dev-cmd@v1.10.0

- name: Configure
run: cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=redist .
run: cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=redist -DCREATE_CONTENT_FOLDER=ON .
shell: cmd

- name: Build
Expand All @@ -121,7 +122,7 @@ jobs:
shell: cmd

- name: Upload redist folder
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: ror-win
path: redist
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux-native.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
mesa-common-dev libgl1-mesa-dev libglu1-mesa-dev libfreetype6-dev nvidia-cg-dev \
libssl-dev libopenal-dev libois-dev libcurl4-openssl-dev rapidjson-dev gettext libfmt-dev
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Build OGRE
run: |
Expand Down
8 changes: 4 additions & 4 deletions BUILDING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ Please refer to https://github.com/RigsOfRods/rigs-of-rods/wiki

* OGRE: 1.11.6.1
* OpenAL: >= 1.18
* OIS: >= 1.4
* OIS: 1.4
* MyGUI: 3.4.0
* fmt: >= 6
* RapidJSON: >= 1.1

### Optional dependencies

* SocketW: >= 3.10
* AngelScript: 2.32.0
* AngelScript: 2.35.1
* CURL: >= 7.6
* Caelum: 0.6.4
* Caelum: 0.6.3
* PagedGeometry: 1.2.1
* discord_rpc: 3.4.0
* OpenSSL: >= 1.1.1
Expand Down Expand Up @@ -87,4 +87,4 @@ This is used to set the path to the folder built by https://github.com/RigsOfRod
| `ROR_USE_FMT` | `SYSTEM`, `CONAN` |
| `ROR_USE_DISCORD_RPC` | `SYSTEM`, `CONAN`, `OFF` |
| `ROR_USE_RAPIDJSON` | `SYSTEM`, `CONAN` |
| `ROR_USE_OPENSSL` | `SYSTEM`, `CONAN`, `OFF` |
| `ROR_USE_OPENSSL` | `SYSTEM`, `CONAN`, `OFF` |
9 changes: 9 additions & 0 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ project(${PROJECT_NAME_UNDERSCORE})
option(BUILD_DEV_VERSION "Disable this for official releases" ON)
option(BUILD_DOC_DOXYGEN "Build documentation from sources with Doxygen" OFF)
option(USE_PHC "Use a Precompiled header for speeding up the build" ON)
option(CREATE_CONTENT_FOLDER "Create the base content folder" ON)
set(ROR_DEPENDENCY_DIR "${CMAKE_SOURCE_DIR}/dependencies" CACHE PATH "Path to the dependencies")

# Test if conan is installed
Expand All @@ -43,6 +44,14 @@ SET(LIBRARY_OUTPUT_PATH ${RUNTIME_OUTPUT_DIRECTORY})

set(CMAKE_DEBUG_POSTFIX _d)

if (NOT USE_PHC)
find_program(SCCACHE_PROGRAM sccache)
if (SCCACHE_PROGRAM)
set(CMAKE_CXX_COMPILER_LAUNCHER "${SCCACHE_PROGRAM}")
message("Using ${SCCACHE_PROGRAM} for speeding up build")
endif ()
endif ()

# hide some settings
mark_as_advanced(
CMAKE_DEBUG_POSTFIX
Expand Down
14 changes: 11 additions & 3 deletions cmake/DependenciesConfig.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ add_external_lib(

add_external_lib(
OIS
ois/1.5.1@anotherfoxguy/stable
ois/1.4@rigsofrods/custom
REQUIRED
PKG_CONFIG "ois >= 1.4"
FIND_PACKAGE
Expand All @@ -39,14 +39,14 @@ add_external_lib(
)
add_external_lib(
SocketW
socketw/3.10.27@anotherfoxguy/stable
socketw/3.11.0@anotherfoxguy/stable
PKG_CONFIG "socketw >= 3.10"
FIND_PACKAGE
)

add_external_lib(
AngelScript
angelscript/2.32.0@anotherfoxguy/stable
angelscript/2.35.1
# PKG_CONFIG "angelscript = 2.32.0"
FIND_PACKAGE
)
Expand Down Expand Up @@ -106,3 +106,11 @@ add_external_lib(
FIND_PACKAGE
INTERFACE_NAME OpenSSL::SSL
)

# Update zlib to 1.2.12 due to https://github.com/advisories/GHSA-jc36-42cf-vqwj
add_external_lib(
zlib
zlib/1.2.12
PKG_CONFIG "zlib >= 1.2.12"
FIND_PACKAGE
)
15 changes: 11 additions & 4 deletions cmake/GenerateVersionInfo.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,24 @@
# This implementation was inspired by
# https://github.com/minetest/minetest/blob/master/cmake/Modules/GenerateVersion.cmake

macro(version_str_to_ints version year month suffix)
string(REGEX REPLACE "([0-9]+).[0-9]+[^\n\r]+" "\\1" ${year} ${version})
string(REGEX REPLACE "[0-9]+.([0-9]+)[^\n\r]+" "\\1" ${month} ${version})
string(REGEX REPLACE "[0-9]+.[0-9]+([^\n\r]+)" "\\1" ${suffix} ${version})
endmacro(version_str_to_ints)

string(TIMESTAMP VERSION_YEAR "%Y" UTC)
string(TIMESTAMP VERSION_MONTH "%m" UTC)
string(TIMESTAMP BUILD_DATE "%Y-%m-%d" UTC) # more correct would be "%b %d %Y" but this is only supported from cmake >= 3.7
# Default variables
string(TIMESTAMP BUILD_DATE "%Y-%m-%d" UTC)
string(TIMESTAMP BUILD_TIME "%H:%M" UTC)

# Define a suffix to append to the version string in case of a development build (as opposed to
# an official release). This suffix contains additional information gathered from the git VCS.
if (BUILD_CUSTOM_VERSION)
set(VERSION_SUFFIX "-${CUSTOM_VERSION}")
version_str_to_ints(${CUSTOM_VERSION} VERSION_YEAR VERSION_MONTH VERSION_SUFFIX)
elseif (BUILD_DEV_VERSION)
string(TIMESTAMP VERSION_YEAR "%Y" UTC)
string(TIMESTAMP VERSION_MONTH "%m" UTC)

# Check if we are inside an actual git repository
if (GIT_EXECUTABLE)
execute_process(
Expand Down
39 changes: 39 additions & 0 deletions doc/angelscript/Game2Script/script_callbacks.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@

namespace Game2Script {

/** \addtogroup ScriptSideAPIs
* @{
*/

/** \addtogroup Game2Script
* @{
*/

/** Required; Script setup function - invoked once when script is loaded.
* If not present, the game will report error and abandon the script.
*/
void main();

/** Optional; Script update function - invoked once every rendered frame.
* @param dt Elapsed time (delta time) in seconds.
*/
void frameStep(float dt);

/** Optional; Invoked if a registered event is triggered, see Script2Game::game::registerForEvent.
* @param event Event code.
* @param param Event-specific parameter, see docs for the event codes.
*/
void eventCallback(Script2Game::scriptEvents event, int param);

/** Optional; Invoked when a vehicle touches an eventbox which has no custom handler function.
* @param trigger_type Unused, always 0.
* @param inst Unique ID of the terrain object instance which created the eventbox.
* @param box Name of the eventbox as defined by the terrain object's ODEF file.
* @param nodeid Number of the node which triggered the event, or -1 if not known.
*/
void defaultEventCallback(int trigger_type, string inst, string box, int nodeid);

/** @}*/ //addtogroup Game2Script
/** @}*/ //addtogroup ScriptSideAPIs

} // namespace Game2Script
20 changes: 20 additions & 0 deletions doc/angelscript/BeamClass.h → doc/angelscript/Script2Game/BeamClass.h
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@

namespace Script2Game {

/** \addtogroup ScriptSideAPIs
* @{
*/

/** \addtogroup Script2Game
* @{
*/

/**
* @brief Binding of RoR::Actor; a softbody-physics gameplay object, can be anything from soda can to space shuttle.
*/
class BeamClass
{
public:
Expand Down Expand Up @@ -179,3 +193,9 @@ class BeamClass
*/
Ogre::Vector3 getNodePosition(int nodeNumber);
}

/// @} //addtogroup Script2Game
/// @} //addtogroup ScriptSideAPIs

} //namespace Script2Game

19 changes: 17 additions & 2 deletions doc/angelscript/CVarClass.h → doc/angelscript/Script2Game/CVarClass.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@

namespace Script2Game {

/** \addtogroup ScriptSideAPIs
* @{
*/

/** \addtogroup Script2Game
* @{
*/

/**
* @brief Types and special attributes of cvars.
* @note Default cvar type is string - To create a string cvar, enter '0' as flags.
Expand All @@ -13,7 +23,7 @@ enum CVarFlags
};

/**
* @brief A console variable, usually defined in RoR.cfg but also created by users or scripts.
* @brief Binding of RoR::CVar; A console variable, usually defined in RoR.cfg but also created by users or scripts.
*/
class CVarClass
{
Expand All @@ -30,5 +40,10 @@ class CVarClass

bool getBool() const { return (bool)m_value_num; }

std::string const& getName() const { return m_name; }
std::string const& getName() const { return m_name; }
};

/// @} //addtogroup Script2Game
/// @} //addtogroup ScriptSideAPIs

} //namespace Script2Game
16 changes: 15 additions & 1 deletion doc/angelscript/ConsoleClass.h → doc/angelscript/Script2Game/ConsoleClass.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@

namespace Script2Game {

/** \addtogroup ScriptSideAPIs
* @{
*/

/** \addtogroup Script2Game
* @{
*/

/**
* @brief A class that gives you access to console variables (cvars), usually defined in RoR.cfg file.
* @brief Binding of RoR::Console; provides console variables (cvars), usually defined in RoR.cfg file.
* @note This object is created automatically as global variable `console`.
*/
class ConsoleClass
Expand Down Expand Up @@ -33,3 +42,8 @@ class ConsoleClass
*/
CVar* cVarGet(std::string const& input_name, int flags);
};

/// @} //addtogroup Script2Game
/// @} //addtogroup ScriptSideAPIs

} //namespace Script2Game
Loading

0 comments on commit 503e0c4

Please # to comment.