Ted John
70853d65d6
Merge pull request #4203 from janisozaur/integration
...
Integration commits from #4181
2016-08-03 21:21:27 +01:00
Ted John
bf4e3febeb
Fix #4207 : Scenario Editor freezes the game
...
Recent commits have caused the sprite spatial index to be uninitialised for the editor modes. Call
eset_sprite_spatial_index within
eset_sprite_list as the two come hand in hand.
2016-08-03 21:19:53 +01:00
Ted John
690e0641b4
Merge pull request #4206 from janisozaur/integrate
...
Add more 64-bit compatibility fixes enabling toolbars to work.
2016-08-03 20:58:49 +01:00
Michał Janiszewski
6c28a17906
Fix pointer casting for some strings
2016-08-03 20:53:25 +02:00
Michał Janiszewski
f8e0d4b25b
Add explicit empty string
...
Needed to properly handle toolbars in 64 bit builds
2016-08-03 20:51:53 +02:00
Michael Steenbeek
c522f9cfd3
Implement max people on maze properly
...
Last year the limit for max people on maze was raised using a hack. Since the responsible table has been implemented since then, remove the hack and update the value in the table.
2016-08-03 19:41:31 +01:00
Michał Janiszewski
c8d69c99f4
Make format_string_code capable of handling native pointers
2016-08-03 20:08:53 +02:00
Michał Janiszewski
76d0adb5ed
Remove unused variable
...
0x00F43896 usage has been refactored out in 9c3055224
2016-08-03 19:26:34 +02:00
Michał Janiszewski
e930a09f0b
Free compressed map when failed to connect client
2016-08-03 07:39:55 +02:00
OpenRCT2 git bot
3f07e5929d
Merge Localisation/master into OpenRCT2/develop.
2016-08-03 04:00:19 +00:00
Marijn van der Werf
0333eb760a
Add macro for support height
2016-08-02 23:32:58 +02:00
Marijn van der Werf
7bfdbbd409
Include ride stats labels
2016-08-02 23:32:58 +02:00
Marijn van der Werf
51f4988e06
Clean/include peep/staff vars
2016-08-02 23:32:58 +02:00
Ted John
e80bc86377
Merge pull request #4191 from janisozaur/integrate2
...
Integrate various bits to try and improve 64-bit compatibility.
2016-08-02 22:17:39 +01:00
Michał Janiszewski
a7f31dda4f
Fix issues from gRideProperties review
...
Also renames it to RideProperties
2016-08-02 23:04:18 +02:00
Michał Janiszewski
825f581f5f
Package and push Linux AMD64 builds to transfer.sh ( #4202 )
2016-08-02 19:17:20 +02:00
Michał Janiszewski
6db035f318
Extract gRideProperties ride flags
2016-08-02 12:56:08 +02:00
OpenRCT2 git bot
63c74b40de
Merge Localisation/master into OpenRCT2/develop.
2016-08-02 04:00:18 +00:00
Michał Janiszewski
6ba62ed123
Integrate vehicle synchronisation info
2016-08-01 23:33:55 +02:00
Michał Janiszewski
2db2ef5eec
Fix pointer types
2016-08-01 23:14:42 +02:00
Michał Janiszewski
ec8ac1a805
Change the way scrolling text positions are stored
2016-08-01 23:14:42 +02:00
Michał Janiszewski
2b85801fc3
Integrate 97e1bc
2016-08-01 23:14:42 +02:00
Michał Janiszewski
09a20524a5
Integrate gRideProperties
2016-08-01 23:14:42 +02:00
Michał Janiszewski
a71e60bed5
Make window_start_textbox accept pointer argument
2016-08-01 23:14:42 +02:00
Michał Janiszewski
a40b3c63af
Convert loadsave dialog to new string format
2016-08-01 23:14:42 +02:00
Michał Janiszewski
b16b6814aa
Fix pointer types for 64 bit builds
2016-08-01 23:14:42 +02:00
Michał Janiszewski
ddb72b6f22
Fix sprite pointers for 64 bit builds
2016-08-01 23:14:42 +02:00
Michał Janiszewski
e6575f09ea
Integrate scrolling text position offsets
2016-08-01 23:14:42 +02:00
Michał Janiszewski
2e319c4dd6
Fix CMake flags setup
2016-08-01 23:14:42 +02:00
Ted John
86d5447709
Merge pull request #4176 from janisozaur/ride-types
...
Fix #4172 : Expose ride-type changing capability in UI
2016-08-01 21:40:46 +01:00
Michał Janiszewski
41049e5a32
Fix positions of widgets
2016-08-01 22:17:38 +02:00
zsilencer
5d04e5e03e
Multiplayer desync stuff
2016-08-01 20:47:21 +02:00
Michał Janiszewski
062ab25f95
Fix invalidation issues
2016-08-01 20:30:08 +02:00
Michał Janiszewski
e25c768a3e
Convert rides set
console command to use game_command interface
2016-08-01 20:30:08 +02:00
Michał Janiszewski
155bc054df
Fix #4172 : Expose ride-type changing capability in UI
...
This also allows changing ride type in multiplayer games. Very crashy.
2016-08-01 20:30:08 +02:00
Ted John
61afcbcadf
Merge pull request #4194 from AaronVanGeffen/git-info
...
Define Git variables for CMake, move those to static strings to avoid unnecessary recompilation.
2016-08-01 17:51:29 +01:00
Michael Steenbeek
151903fed4
Add ThePsionic to translators
2016-08-01 13:38:34 +02:00
OpenRCT2 git bot
9cf341940a
Merge Localisation/master into OpenRCT2/develop.
2016-08-01 04:00:20 +00:00
LRFLEW
a320d4d596
Added Git Info for macOS Builds
2016-07-31 23:12:07 +02:00
LRFLEW
d23a90f71a
Added #4194 to Xcode Project
2016-07-31 19:02:09 +02:00
Aaron van Geffen
8ddef5f889
Move version information to separate C file.
...
Note: crash.cpp is still using the constants passed at compile-time.
2016-07-31 19:01:26 +02:00
Aaron van Geffen
24fde98837
Define Git variables for CMake.
2016-07-31 17:32:33 +02:00
Ted John
349684b7ce
Merge pull request #4146 from AaronVanGeffen/reposition-mouse
...
Change mouse scroll zooming behaviour to zoom towards the cursor keeping the map position under the cursor consistent. This new behaviour is opt-out.
2016-07-31 12:38:06 +01:00
Michael Steenbeek
ff7e119b46
Name some track design flags
2016-07-31 12:02:38 +01:00
Michael Steenbeek
05ac1a49b6
Fix #3806 : Other Coaster Vehicle options not showing in Ride Window
...
This error was introduced with aa929e1
(see line 204 in src/management/research.c in that commit).
2016-07-31 12:00:58 +01:00
OpenRCT2 git bot
e4b8e13ee4
Merge Localisation/master into OpenRCT2/develop.
2016-07-31 04:00:36 +00:00
Aaron van Geffen
29b0b4885e
Reduce code verbosity.
...
This introduces the function `platform_get_cursor_position_scaled` as a common means of getting the cursor position compensated for window scaling.
2016-07-30 22:05:13 +02:00
Aaron van Geffen
8ac1b79799
Remember and apply cursor position relative to tile.
2016-07-30 21:18:59 +02:00
Aaron van Geffen
1755fa433f
Enable zoom to cursor by default.
2016-07-30 21:18:59 +02:00
Aaron van Geffen
34bef11f75
Compensate mouse position for window scaling.
2016-07-30 21:18:59 +02:00