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

8106 Commits

Author SHA1 Message Date
Ted John 9b90249f5b re-introduce object hash table 2016-07-08 22:58:38 +01:00
Ted John b207f6112d fix unloading of objects 2016-07-08 22:58:38 +01:00
Ted John d7575732fb get title screen loading correctly 2016-07-08 22:58:38 +01:00
Ted John 25af7d346c add water object loading 2016-07-08 22:58:38 +01:00
Ted John 6912c537bb add scenery group object loading 2016-07-08 22:58:38 +01:00
Ted John a07bbc6bce add banner object loading 2016-07-08 22:58:38 +01:00
Ted John 54f50c1f20 add wall object loading 2016-07-08 22:58:38 +01:00
Ted John 958dfa6623 add large scenery object loading 2016-07-08 22:58:38 +01:00
Ted John 2c02412f98 add ride object loading 2016-07-08 22:58:38 +01:00
Ted John daa5a0c506 add small scenery object 2016-07-08 22:58:38 +01:00
Ted John 7e206d1a85 add path item object 2016-07-08 22:58:38 +01:00
Ted John 90923fbb43 add footpath objects 2016-07-08 22:58:38 +01:00
Ted John 78e15b1d56 start getting object loading working 2016-07-08 22:58:38 +01:00
Ted John e93b2141a1 save object details to repository file 2016-07-08 22:58:38 +01:00
Ted John 2449b7dbf0 add reading of entrance objects 2016-07-08 22:58:38 +01:00
Ted John c9a1357994 add new MemoryStream class 2016-07-08 22:58:38 +01:00
Ted John 28ae0cbee6 add image table reading 2016-07-08 22:58:38 +01:00
Ted John 463e88583d prepare new object classes with EntranceObject 2016-07-08 22:58:38 +01:00
Ted John 3f65a3a383 add object scan call 2016-07-08 22:58:38 +01:00
Ted John 06bf6bb39d settle for ObjectRepository and write load / save 2016-07-08 22:58:38 +01:00
Ted John 0fa703a1cb add new ObjectCache class with Entry 2016-07-08 22:58:38 +01:00
Ted John 76b2621a51 Merge pull request #4000 from SijmenSchoon/develop 
Add a "default" button to the loadsave window
 2016-07-08 22:58:07 +01:00
Josue Acevedo bfce74f905 Minor fix: guest list not contain any guest. (#4016) 
Mistake that I made accidentally in #4006, caused because selected page takes the -1 value if the num of pages is 0 (it only happens if the num of guests is 0).
 2016-07-08 23:57:26 +02:00
Duncan 9af54d0fd7 Merge pull request #4015 from SijmenSchoon/ferris_prison 
Fix #4003: Fix the closing of ferris wheels
 2016-07-08 22:45:27 +01:00
Sijmen Schoon d06633331a Fix the closing of ferris wheels 
Well, that was anticlimactic
 2016-07-08 23:36:59 +02:00
Duncan 9e730c2ba7 Merge pull request #4012 from gDanix/fix-3749 
Fix #3749: Block Brake Issue when Run on Continous Non-block
 2016-07-08 21:13:28 +01:00
Josue Acevedo 68794c8ab8 Fix: page dropdown doesn't appear in guest list window. (#4006) 2016-07-08 20:17:56 +02:00
Daniel Trujillo d731a015ea Fix bug causing block brakes blocking vehicles in non-block mode 
A comparison has been added to ensure that, if the ride isn't in a
block-sectioned mode, the block brakes will act as a simple brakes
(with 6 km/h boosters)
 2016-07-08 19:03:22 +02:00
Sijmen Schoon 511ce8f06a Sort includes 2016-07-08 15:21:08 +02:00
Sijmen Schoon 66628e5131 Remove unused variable 2016-07-08 11:32:34 +02:00
Sijmen Schoon 662d92be74 Fix track load/save last-dir storing 
Doesn't really belong to this PR, but it's needed anyway
 2016-07-08 11:29:45 +02:00
Sijmen Schoon 2d7cd0e719 Change string ids to be consecutive 2016-07-08 11:29:02 +02:00
OpenRCT2 git bot 9efc0cab6a Merge Localisation/master into OpenRCT2/develop. 2016-07-08 04:00:20 +00:00
X123M3-256 6c0d4c52c3 Enable diagonal steep slopes for the junior coaster 2016-07-07 21:36:00 +01:00
Sijmen Schoon 47d69998e7 Straighten up window_loadsave_widgets 2016-07-07 11:50:06 +02:00
Sijmen Schoon 127d94d451 Add a default button to the loadsave window 2016-07-07 11:29:22 +02:00
OpenRCT2 git bot 52ed90ed95 Merge Localisation/master into OpenRCT2/develop. 2016-07-07 04:00:19 +00:00
Ted John 6a5ecf04de Merge pull request #3998 from gDanix/fix-3324 
Fix #3324: Opening tile inspector then footpath closes both windows.
 2016-07-06 20:59:54 +01:00
Ted John f866e6fac2 Merge pull request #3997 from SijmenSchoon/develop 
Remember previous save/load location
 2016-07-06 20:53:27 +01:00
Ted John ae80ba4888 Merge pull request #3993 from Rodbourn/develop 
Prevent rendering of hidden windows.
 2016-07-06 18:52:10 +01:00
Daniel Trujillo 6083bddc06 Vanity commit 2016-07-06 19:35:33 +02:00
Daniel Trujillo 966fbe812c Refactorize "update" callback to match coding standards. 2016-07-06 19:33:12 +02:00
Daniel Trujillo 2ea8ab1441 Fix #3324 
This commit fixes a bug involving tool windows being closed when the
tile inspector was opened. This was caused by calling tool_cancel()
from wrong places, causing all tool windows being closed.
 2016-07-06 19:26:14 +02:00
Sijmen Schoon e882bfe736 Change strdup to _strdup 2016-07-06 18:50:30 +02:00
Sijmen Schoon edbca4907a Update my entry in contributors.md 2016-07-06 18:24:42 +02:00
Sijmen Schoon fcf4008395 Remember previous save/load location 
Works for games, landscapes, scenarios and tracks (but this is commented out due to tracks not being separated or something?)
 2016-07-06 18:22:08 +02:00
OpenRCT2 git bot f4ca5870db Merge Localisation/master into OpenRCT2/develop. 2016-07-06 04:00:21 +00:00
Charles Cook 8b36e4c54a Use four spaces instead of tabs in c++ 2016-07-05 20:32:37 -04:00
Charles Cook 6d268099f5 Follow coding standard for project. 2016-07-05 19:40:20 -04:00
Charles Cook 5c9110b99a Prevent viewport_invalidate from causing covered viewports to redraw and cache window and viewport visibility. 2016-07-05 18:02:23 -04:00