1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 12:03:07 +01:00
Commit Graph

4356 Commits

Author SHA1 Message Date
Ted John
6a88ca17d0 Merge pull request #1835 from medsouz/cleanupscenery
Add names for all memory addresses in world/scenery.c
2015-08-22 17:43:28 +01:00
medsouz
e9269cb882 Finish naming scenery.c addresses 2015-08-22 12:03:40 -04:00
IntelOrca
745365ca69 implement crash particles 2015-08-22 16:39:24 +01:00
IntelOrca
3062bbf3b6 refactor balloon, duck and money effect 2015-08-22 12:11:20 +01:00
IntelOrca
1a877e637d refactor sprite_invalidate 2015-08-22 11:56:32 +01:00
Duncan
8c2ea82a7e Merge pull request #1832 from Gymnasiast/fix-special-dropdown
Fill ride construction dropdown properly before drawing it, fixes #1793
2015-08-21 12:23:07 +01:00
Gymnasiast
11fa6bbab7 Fill ride construction dropdown properly before drawing it, fixes #1793 2015-08-21 09:34:58 +02:00
Ted John
ebf9a42956 Merge pull request #1831 from LRFLEW/save-prompt-fix
Fixed autosaves preventing saving before quitting dialog from appearing
2015-08-21 07:30:07 +01:00
Ted John
3bfeddbee7 Merge Localisation/master into OpenRCT2/develop. 2015-08-21 04:00:16 +01:00
LRFLEW
5d19c44e46 Fixed autosaves preventing saving before quitting dialog from appearing 2015-08-20 20:57:09 -05:00
Ted John
415fac21e3 Merge pull request #1830 from Gymnasiast/update-gitignore
Add build_nonet to .gitignore
2015-08-20 20:27:32 +01:00
Gymnasiast
903fba2747 Only build the nonet version if specified 2015-08-20 20:48:22 +02:00
Gymnasiast
27df537559 Use wildcard to include all differing build configurations 2015-08-20 20:05:18 +02:00
Ted John
32a46e699d Merge pull request #1828 from Gymnasiast/fix-menu-saving
Fix file menu for editor, restore menu order, add shortcut for quick saving
2015-08-20 18:19:00 +01:00
Gymnasiast
51b278c58a Add build_nonet to .gitignore 2015-08-20 13:49:33 +02:00
Gymnasiast
f384a9cbf8 Remove test code 2015-08-20 13:23:07 +02:00
Gymnasiast
93d49e314e Fix file menu for editor, restore menu order, add shortcut for quick saving 2015-08-20 12:13:08 +02:00
Ted John
c0ac3ba06d Merge pull request #1826 from zsilencer/develop
fix some multiplayer bugs
2015-08-20 07:30:00 +01:00
zsilencer
720076acb5 fix cmake error 2015-08-19 22:59:55 -06:00
Ted John
2500ee452e Merge Localisation/master into OpenRCT2/develop. 2015-08-20 04:00:15 +01:00
zsilencer
7322307a04 fix issues with pausing in multiplayer 2015-08-19 20:34:52 -06:00
zsilencer
5bb3218d4c make desync detection work again 2015-08-19 19:07:11 -06:00
zsilencer
abcd0afa9a make setting player name actually work 2015-08-19 18:26:42 -06:00
zsilencer
be42f10d7a fix crash in server_list_save_saved_servers 2015-08-19 18:13:38 -06:00
Ted John
4bcf0e67e6 Merge pull request #1824 from runelaenen/quicksave-save-as
Easier saving
2015-08-19 23:16:49 +01:00
Runelaenen
2830cdd3a3 Capitalisation of 5512 2015-08-19 23:16:07 +02:00
Runelaenen
3b1708f1be Wrong logging fixed 2015-08-19 23:09:54 +02:00
Runelaenen
6ec01c6d65 Changed localisation strings 2015-08-19 22:35:20 +02:00
Runelaenen
d34a446d61 Easier saving
Replace Save game functionality and add 'save game as' function
2015-08-19 22:02:06 +02:00
Ted John
4e578aeaf2 Merge pull request #1823 from runelaenen/headless
--headless
2015-08-19 18:32:11 +01:00
Runelaenen
fe0e1d1207 arguments 2015-08-19 18:10:08 +02:00
Runelaenen
fb5921db6d First headless version 2015-08-19 18:07:04 +02:00
IntelOrca
408628c80c fix building on VS 2015-08-19 07:47:21 +01:00
Ted John
d5cd9902f8 Merge pull request #1820 from janisozaur/disable_network
disable network
2015-08-19 07:27:52 +01:00
medsouz
4207b41855 Name more addresses 2015-08-18 23:53:24 -04:00
Ted John
f836590a18 Merge Localisation/master into OpenRCT2/develop. 2015-08-19 04:00:15 +01:00
Michał Janiszewski
fc533c92c4 Add switch to disable network at compile-time 2015-08-19 01:47:33 +02:00
IntelOrca
d9fdb0950a patch exe to remove DirectDraw, DirectInput and DirectPlay dependencies. 2015-08-18 21:32:21 +01:00
Ted John
f20d1c7110 Merge pull request #1819 from Gymnasiast/audio-device-translatable
Make the string for 'Default audio device' translatable, fix comment
2015-08-18 21:07:38 +01:00
Gymnasiast
59202f97f8 Make the string for 'Default audio device' translatable, fix comment 2015-08-18 21:55:04 +02:00
Ted John
4ee28af18c Merge pull request #1816 from Gymnasiast/allow-incorrect-checksum
Add option to allow loading scenarios with an incorrect checksum, closes #1790
2015-08-18 19:52:46 +01:00
Ted John
1948c0b84f Merge pull request #1818 from Gymnasiast/fix-track-placement
Keep the same orientation as in the preview when placing track, fixes #1817
2015-08-18 18:42:20 +01:00
Gymnasiast
9c23414fbe Keep the same orientation as in the preview when placing track, fixes #1817 2015-08-18 18:22:23 +02:00
Gymnasiast
e8cc1738ca Fix saving of feature 2015-08-18 15:49:16 +02:00
Gymnasiast
8cf34ca662 Add option the Options window, clean up some string ids in that window 2015-08-18 11:58:47 +02:00
Gymnasiast
4fa571a041 Add option to allow loading scenarios with an incorrect checksum 2015-08-18 10:47:31 +02:00
Ted John
abe02bb408 Merge pull request #1811 from xperia64/develop
Re-add PLUGIN.DAT
2015-08-18 07:27:28 +01:00
medsouz
958f2fb296 Document some scenery memory addresses 2015-08-17 23:05:46 -04:00
Ted John
3a8dd25020 Merge Localisation/master into OpenRCT2/develop. 2015-08-18 04:00:15 +01:00
xperia64
a6043c6f78 Re-add PLUGIN.DAT 2015-08-17 20:48:18 -04:00