Ted John
daf61d0ca5
Merge pull request #1920 from Gymnasiast/fix-warnings-2
...
Fix more warnings
2015-09-12 13:54:22 +01:00
Ted John
70c88edb5d
Merge pull request #1925 from janisozaur/memory
...
Memory access fixes
2015-09-11 23:40:55 +01:00
Michał Janiszewski
788e988992
Memory access fixes
2015-09-12 00:16:05 +02:00
Ted John
967fccdac9
Merge pull request #1924 from janisozaur/painter-fix
...
Incrementation of paint_struct pointer looks bogus
2015-09-11 22:13:05 +01:00
Michał Janiszewski
27ea266de1
Incrementation of paint_struct pointer looks bogus
...
Since the value incremented is a pointer, pointer arithmetics apply,
so instead of incrementing by 52, incrementation by 52^2 = 2704 takes
place, which was confirmed by inspecting generated listing.
2015-09-11 22:53:01 +02:00
Ted John
94fe643b4c
Merge pull request #1921 from Gymnasiast/fix-filters-in-rc-designer-2
...
Fix filter buttons in RC designer and TD manager, clean up some strings
2015-09-11 17:40:34 +01:00
Ted John
642a90cd63
Merge pull request #1919 from Gymnasiast/entrances-exits-while-paused
...
Extend build-in-pause-mode to entrances and exits, clear up some flags, fix ghost sticking in pause mode, fixes #1918
2015-09-11 17:39:23 +01:00
Gymnasiast
a6ee08de11
Fix filter buttons in RC designer and TD manager, clean up some strings
2015-09-11 16:21:27 +02:00
Gymnasiast
68fc066fc5
Fix two more warnings
2015-09-11 15:23:11 +02:00
Gymnasiast
6bd003c67f
Fix more warnings
2015-09-11 15:13:54 +02:00
Gymnasiast
7e67f0381e
Extend build-in-pause-mode to entrances and exits, clear up some flags, fix ghost sticking in pause mode, fixes #1918
2015-09-11 14:38:45 +02:00
Ted John
408665e4a4
Merge Localisation/master into OpenRCT2/develop.
2015-09-11 04:00:15 +01:00
IntelOrca
4dd95c650b
implement RideData4 data
2015-09-10 22:16:41 +01:00
IntelOrca
bda7550e33
fix #1913
2015-09-10 20:06:13 +01:00
Ted John
70e14360ce
Merge pull request #1916 from Gymnasiast/patch-2
...
Fix Condor Ride description, fixes #1021
2015-09-10 17:41:58 +01:00
Michael Steenbeek
2c71e8c419
Fix Condor Ride description, fixes #1021
2015-09-10 14:39:49 +02:00
Ted John
f516028413
Merge pull request #1915 from janisozaur/type-fixes
...
In C++11 use actual pointer types instead of C's defines
2015-09-10 12:37:03 +01:00
Michał Janiszewski
17e635b8af
In C++11 use actual pointer types instead of C's defines
...
This is mostly `NULL` -> `nullptr` in cpp files, but I only noticed
because `LanguagePack::GetObjectOverride` and
`LanguagePack::GetScenarioOverride` were returning false instead of real
pointer.
Also fixes some whitespaces, you can `w=1` to github's URL to make it
skip these.
2015-09-10 08:22:36 +02:00
Ted John
85bbdde056
Merge Localisation/master into OpenRCT2/develop.
2015-09-10 04:00:15 +01:00
IntelOrca
72b153115b
fix #1909
2015-09-09 22:56:40 +01:00
IntelOrca
b55d81e561
implement ride_set_start_finish_points
2015-09-09 22:14:43 +01:00
IntelOrca
88db4f12aa
fix #1910
2015-09-09 20:25:34 +01:00
IntelOrca
289555c082
fix #1908
2015-09-09 19:22:41 +01:00
Ted John
f271bc0721
Update .travis.yml
2015-09-09 18:27:01 +01:00
Ted John
7c81d6b38c
Update readme.md
2015-09-09 18:25:48 +01:00
Ted John
acf27afb3e
Merge pull request #1907 from OpenRCT2/language-dat
...
Localisation for objects and scenarios.
2015-09-09 17:50:33 +01:00
Ted John
7d6291ad26
Merge pull request #1906 from janisozaur/language-dat
...
fix travis builds by forcing it to ubuntu 14.04
2015-09-09 08:20:46 +01:00
Michał Janiszewski
cc6832cf48
fix travis builds by forcing it to ubuntu 14.04
...
This (for now) will force Travis' hand to use ubuntu 14.04 which has
mingw 4.8 available. It is enough to compile the project as it stands.
2015-09-09 09:08:28 +02:00
Ted John
d7a7a81cd0
Merge Localisation/master into OpenRCT2/develop.
2015-09-09 04:00:15 +01:00
IntelOrca
fddf057d68
add scenario overrides
2015-09-08 21:37:25 +01:00
Gymnasiast
188978936b
Fix Math.Clamp definition
2015-09-08 21:37:24 +01:00
IntelOrca
fc65a92275
fix object override strings for scenario editor and plugin.dat
2015-09-08 21:37:24 +01:00
IntelOrca
fe7879f0a3
add capacity overriding
2015-09-08 21:37:23 +01:00
IntelOrca
34cd6a9242
fix GCC compile issue
2015-09-08 21:37:22 +01:00
IntelOrca
8085abadd3
add basic support for localisation object string overriding
2015-09-08 21:37:22 +01:00
IntelOrca
7a0478404e
add new C++ memory utility functions
2015-09-08 21:37:21 +01:00
IntelOrca
952a4abdd1
implement DAT translation, part 1
2015-09-08 21:37:20 +01:00
IntelOrca
8ec51b6fc1
add FileStream, IStream and IDisposable
2015-09-08 21:37:20 +01:00
Ted John
2a0366721e
Merge pull request #1896 from janisozaur/some_fixes
...
assorted fixes
2015-09-07 20:11:29 +01:00
Michał Janiszewski
52252f82b3
assorted fixes
2015-09-07 20:51:21 +02:00
IntelOrca
f2beefb33b
fix #1886
2015-09-07 18:43:31 +01:00
IntelOrca
af39fcd35f
fix #1873
2015-09-07 18:18:52 +01:00
IntelOrca
72000196dd
use English UK DAT strings instead of RCT2 Korean strings until fix or workaround is available #1898
2015-09-07 17:35:39 +01:00
Ted John
1a5a4d2e05
Merge pull request #1897 from Gymnasiast/fix-warnings
...
Fix some warnings
2015-09-07 17:20:06 +01:00
Gymnasiast
3ddddec21c
Fix some warnings
2015-09-07 14:57:39 +02:00
Ted John
a0d684a07d
Merge Localisation/master into OpenRCT2/develop.
2015-09-07 04:00:15 +01:00
IntelOrca
efada641a5
implement map_place_fence_check_obstruction
2015-09-06 17:36:55 +01:00
IntelOrca
2753af893b
implement map_obstruction_set_error_text
2015-09-06 13:37:00 +01:00
IntelOrca
ed824d36b0
refactor two CALLPROC functions in track.c
2015-09-05 20:34:56 +01:00
IntelOrca
8c44ddac17
fix 2nd problem of #1848
2015-09-05 20:06:58 +01:00
