mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
13,510 Commits 7 Branches 39 Tags 351 MiB
Commit Graph

13510 Commits

Author SHA1 Message Date
Michael Steenbeek f1b42fa9dd Update changelog [ci skip] 2018-01-02 13:33:33 +01:00
Tobias Kohlbau 9da4305a9c Fix #5224: Close multiplayer window when server closes 
Signed-off-by: Tobias Kohlbau <tobias@kohlbau.de>
 2018-01-02 13:04:53 +01:00
Tobias Kohlbau a726f6decd Multiplayer: save manually added servers 
Adding a server via "Add Server" should handle them
as favorites as otherwise the list is not saved locally and
each server is lost after game restart.

Signed-off-by: Tobias Kohlbau <tobias@kohlbau.de>
 2018-01-02 13:04:08 +01:00
OpenRCT2 git bot 6336e8c719 Merge Localisation/master into OpenRCT2/develop. 2018-01-02 04:00:31 +00:00
Michał Janiszewski b1a78c8f24
Fix a compilation issue with older compilers 2018-01-01 22:55:00 +01:00
Michał Janiszewski 1cd7f99d2d
Fix Ride.cpp compilation issues 2018-01-01 22:16:16 +01:00
OpenRCT2 git bot 60a91910d8 Merge Localisation/master into OpenRCT2/develop. 2018-01-01 04:00:30 +00:00
Gymnasiast 1626f86acc Compile park.c as C++ 2018-01-01 01:18:12 +01:00
Gymnasiast 6f7dfb00aa Fix duplicated line 2018-01-01 01:01:12 +01:00
Gymnasiast dc68946649 Remove unneeded C transfer functions from RideGroupManager 2017-12-31 21:15:34 +01:00
Gymnasiast 2a6f2c1763 Fix #6114: Crash when using a non-LL CSG1.DAT 
The game will now check for the number of entries in CSG1.DAT. If it's too few, it will now no longer try using its sprites, but print out a warning instead.
 2017-12-31 21:03:40 +01:00
Michael Steenbeek 341e3a5d9d Fix Xcode project 2017-12-31 20:43:17 +01:00
Gymnasiast 6e281e2061 Move music tune id list out of Ride.cpp for now 2017-12-31 20:43:17 +01:00
Gymnasiast 23d70a4ac9 Compile ride.c as C++ 2017-12-31 20:43:17 +01:00
Aaron van Geffen e405867dae Add tooltip to explain why sprite selection is disabled. 2017-12-31 20:03:09 +01:00
Robert Jordan 907f18fd69 Fix: Following canceling 
Stop previewing sequence now unfollows the current sprite.
Using the arrow keys in-game cancels following.
Resizing the window no longer cancels following.
 2017-12-31 20:03:09 +01:00
Robert Jordan 298420fd1e Finalize follow sprite command 
Added new smart follow variable to window to more intuitively follow
sprites that may not be directly followable at all times.
Follow sprite is now canceled when dragging the screen but not
scrolling. This is only relevant when testing title sequences in game.
Select sprite button is now disabled in the title menu.
Sprites are now identified based on their name. Excess identification
information is not given as it'd clutter up the screen and is not
necissary with the viewbox in the command editor.
 2017-12-31 20:03:09 +01:00
Hielke Morsink 1443216ba0 Replace number with small viewport 2017-12-31 20:03:09 +01:00
Hielke Morsink 943747056e Add window settings and save support for follow sprite command 2017-12-31 20:03:09 +01:00
Hielke Morsink 500b0d09aa Add follow sprite command to title sequence 2017-12-31 20:03:09 +01:00
Gymnasiast 559a5c662a Fix import of RCT1 mazes 2017-12-31 19:54:50 +01:00
Gymnasiast deb95825e5 Add some missing entries to changelog 2017-12-31 19:10:16 +01:00
Gymnasiast a435fd7434 Fix #6833: shops and maze in corrupted file not imported correctly 2017-12-31 18:56:17 +01:00
Hielke Morsink db7efda880 Fix #6845: Logo artifacts when changing scale. 
This correctly invalidates the areas with logo and version text.
 2017-12-31 13:14:03 +01:00
Tobias Kohlbau 7a8c5c2842 multiplayer: Adds option to pause server 
OpenRCT2 does not provide a simple function to pause a server
while no client is connected. This patch adds a so called
"pause_server_if_no_clients" flag within network section of
config.ini. By default this flag is set to false to be backward
compatible with running servers. After setting this flag to
true the game is paused on launch and gets unpaused on first
connection.

Signed-off-by: Tobias Kohlbau <tobias@kohlbau.de>
 2017-12-31 12:55:07 +01:00
Robert Jordan 92fc010b9a Feature: "Load Scenario" title sequence command 
New command goes by LOADSC in script files and in the enumeration.
Scenarios are stored using the internal also used for localisation.
Scenarios selected can only be scenarios to originally come with one of
the games or expansions.
Modified Scenario Select window to have a mode just for title editor
scenario selection.
 2017-12-31 12:42:40 +01:00
Tobias Kohlbau ec69af0410 docs: adds code style reference 
The contribution guideline is outdated and needs a
reference to coding style.

Signed-off-by: Tobias Kohlbau <tobias@kohlbau.de>
 2017-12-31 12:19:24 +01:00
Hielke Morsink 4459eb09b9 Fix invalid entries in surface boundries table 2017-12-30 13:55:39 +01:00
rwjuk 1736a08b04 Fix potential access violation when setting park name 2017-12-29 21:56:07 +01:00
Hielke Morsink d2f732bbb6 Fix garbage in buffer 2017-12-29 12:33:34 +00:00
rwjuk 50f16b6600 Fix #6388: Con. rights wrongly shown as available on some RCT1 parks 
I am an idiot
 2017-12-29 08:43:26 +01:00
rwjuk 29c604d850 Fix #6846: Ride overview window zoom level set too high 2017-12-28 08:55:13 +01:00
OpenRCT2 git bot 6b2a0063ee Merge Localisation/master into OpenRCT2/develop. 2017-12-28 04:00:35 +00:00
Hielke Morsink 32cc3082b2 Remove check that would never pass 
`safe_strcpy` already takes the null terminator into
account, making the check useless. If the string was too
long, `safe_strcpy` already prints a warning anyway.

Two small fixups included:
 - Sorting includes
 - Comparing char with `\0` instead of 0
 2017-12-27 23:11:04 +01:00
Hielke Morsink acc33aa47e Remove duplicated code in text window 
The two functions for opening were almost identical. The only
difference was that one was passed a string ID and the other a
raw string. The one taking the string ID now converts it to a
raw string, and then calls the other functions.

This also makes the utf8 string const and replaces some C-string
code with String::Set.
 2017-12-27 16:19:46 +00:00
Tomas Dittmann a9aaaf17a3 log exceptionmessage instead of custom string. 2017-12-27 14:32:19 +00:00
Tomas Dittmann b7d26665d6 Add console output for handled exceptions. 2017-12-27 14:32:19 +00:00
Tomas Dittmann f9e0865f31 use unique_ptr to prevent memoryleaks. 2017-12-27 14:32:19 +00:00
Tomas Dittmann c22dac0a29 add missing exception handling. 
LoadParkFromStream() now handles exceptions from parkImporter->LoadFromStream().
 2017-12-27 14:32:19 +00:00
Tomas Dittmann 51bbfb084f add missing exception handling. 
Every TryClassifyAsX()-method now has exceptionhandling.
 2017-12-27 14:32:19 +00:00
Aaron van Geffen a5ae503f0a Take font line height into account for bottom toolbar 2017-12-27 14:54:09 +01:00
Aaron van Geffen 759c51bbad Fix #6869: incorrect Map button appearance in Guest List. 
* Fixes the map button overlapping with the new search icon.

* Fixes the map button not being repositioned when the window is resized.
 2017-12-27 14:51:17 +01:00
Michał Janiszewski ad687a7ecf Remove use of problematic __DATE__ and __TIME__ 
Replace with a placeholder to be filled by external tools
 2017-12-27 14:50:42 +01:00
Aaron van Geffen 4455925fcb Move braces to follow code style. 2017-12-27 13:18:24 +01:00
Aaron van Geffen 10ed48611c Refactor bottom toolbar: hex to dec, apply macro. 
This was one of the few windows that had its widget positions defined in
hexadecimals rather than decimals.

The logic was further obscured by using a macro to offset an experimental
change to accomodate longer dates. This change has been widely embraced,
so this patch applied said macro to improve legibility.
 2017-12-27 13:18:07 +01:00
Michael Steenbeek 6d5dd061d7 Fix crash when opening object selection 2017-12-27 13:17:09 +01:00
Michał Janiszewski 8fdec42ff9 Remove redundant declarations 2017-12-26 22:16:03 +01:00
Michał Janiszewski c4c5439943 Add missing include guards 2017-12-26 22:16:03 +01:00
Michał Janiszewski b574c23172 Fix function declaration 2017-12-26 18:09:00 +01:00
Michał Janiszewski 8089cadc40 Reduce code duplication 2017-12-26 18:08:56 +01:00