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

3181 Commits

Author SHA1 Message Date
Robert Jordan 0a71b633c7 Added game speed button sprites 
Also added empty.png to resources to fill in g2 sprites reserved by
other contributors.
 2015-05-19 11:51:59 -04:00
Ted John 20057ef46c Merge pull request #1095 from noitatum/decompile_0x0069DEAD 
First decompilation, criticism welcome.
 2015-05-19 14:20:11 +01:00
Ted John 8f19ecbdef Merge pull request #1094 from trigger-death/new-title-logo 
Changed Title Logo
 2015-05-19 14:18:22 +01:00
Ted John 8ab5fec68a Merge pull request #1096 from Gymnasiast/increase-num-laps 
Increase max circuits to 20 and max number of people in maze to 64
 2015-05-19 14:17:50 +01:00
Gymnasiast 257e330503 Increase maximum number of laps to 20 and maximum number of people in maze to 64. 2015-05-19 11:18:08 +02:00
Robert Jordan c48645a67a Changed Title Logo 
Started placing g2.dat sprites in resources/g2
 2015-05-18 23:33:21 -04:00
noitatum 3b9a5bd2f4 Decompiled 0x0069DEAD, it's now called finance_shift_expenditure_table. 
Added some defines for the expenditure table size, the expenditure table saves the history up to 16 months but only shows 5 ingame.
Fixed an inconsitency with the assembler code in finance_init(), it only initializes the first month, not four.
 2015-05-19 00:12:06 -03:00
Ted John e2ba2696ee Merge Localisation/master into OpenRCT2/develop. 2015-05-19 04:00:13 +01:00
IntelOrca 8772cdd7aa add in game console 2015-05-19 03:54:09 +01:00
Ted John 9b9338d90c Merge pull request #1093 from trigger-death/patch-1 
Added Robert Jordan to Contributors
 2015-05-19 02:19:33 +01:00
Robert Jordan 35ca58a033 Added Robert Jordan to Contributors 2015-05-18 19:35:45 -04:00
IntelOrca c1260fc11f add command line sprite editor and additional custom graphics (g2.dat) 2015-05-19 00:26:31 +01:00
Ted John 27737cc086 Merge pull request #1092 from trigger-death/game-speed-button 
Added game speed button and other changes
 2015-05-19 00:01:02 +01:00
Robert Jordan 77767a6bc5 Didn't update top_toolbar 2015-05-18 18:16:43 -04:00
Robert Jordan 6faaca53aa Added game speed button and other changes 
Game speed button with up to 4/5 speeds.
Debugging tools option to enable non-playable changes.
Cheat window is now a setting.
Game speeds 5-7 are removed.
Game speed 8 added with enabling debugging tools.
Windows and news ticker update once per tick instead of based on game
speed.
 2015-05-18 18:15:43 -04:00
Ted John cca1933318 Merge pull request #1091 from duncanspumpkin/scenario_bugs 
Fix scenario bugs.
 2015-05-18 22:28:16 +01:00
Duncan Frost 5180c247d6 Fix scenario bugs. 
Number of guests and currency were accidentaly being truncated to bytes. This was causing display issues when creating custom scenarios in OpenRCT2.
There was a small bug in research loading that was causing a crash due to exiting of a loop to early. As this was after a call to random this would only occur occasionally.
 2015-05-18 22:21:12 +01:00
Ted John fec6584961 Merge pull request #1090 from duncanspumpkin/refactor 
Refactor of update_park_fences
 2015-05-18 18:53:01 +01:00
Duncan Frost a69575dbea Refactor of update_park_fences 
Now uses functions to work out map location ownership.
Also uses mapElements instead of tileIdxs.
 2015-05-18 18:27:01 +01:00
Ted John 694b86da16 Merge Localisation/master into OpenRCT2/develop. 2015-05-18 04:00:12 +01:00
Ted John 7a22ff57cf Merge pull request #1085 from Gymnasiast/disable-all-breakdowns 
Add cheat option to disable breakdowns completely.
 2015-05-17 23:01:58 +01:00
Ted John 372ab2f685 Merge pull request #1082 from trigger-death/decompiled-functions 
Decompiled sub_6EC847 & sub_664D05
 2015-05-17 18:21:42 +01:00
Ted John 14db9a78cd Merge pull request #1081 from Gymnasiast/allow-high-launch-speeds 
Allow maxing out launch speed and many other operation settings as well
 2015-05-17 18:21:08 +01:00
Ted John b736649a2c Merge pull request #1083 from trigger-death/small-fixes 
Fixed editor bottom toolbar right button alignment
 2015-05-17 18:20:16 +01:00
Gymnasiast dc524c1b6a Add cheat option to disable breakdowns completely. 2015-05-17 18:55:57 +02:00
Robert Jordan eb85b8f4dd One small mispelled function fix 2015-05-17 12:42:43 -04:00
Robert Jordan db701eca56 Fixed editor bottom toolbar right button alignment 
The button was improperly sized. I just switched 2 sets of values to fix
that.
 2015-05-17 12:41:21 -04:00
Robert Jordan 9eed7dc614 renamed functions 
renamed gfx_invalidate_scrollingtext to gfx_invalidate_tile_if_zoomed
 2015-05-17 12:38:02 -04:00
Robert Jordan 9529f3e179 Decompiled sub_6EC847 & sub_664D05 
sub_6EC847 is named invalidate_viewport_tile
sub_664D05 is named update_park_fences
both functions are in world/park.c
 2015-05-17 12:36:16 -04:00
Ted John 65ff82b187 Merge pull request #1076 from Gymnasiast/disable-brakes-failure 
Add a cheat option to disable brakes failure
 2015-05-17 16:50:52 +01:00
Gymnasiast 8f82175fec Allow maxing out launch speed and many other operation settings as well 2015-05-17 17:26:07 +02:00
Ted John 2fa9b1a5a0 Merge pull request #1075 from Gymnasiast/develop 
Extend the RCT1 colour scheme to the scenario select and start new campaign window
 2015-05-17 13:45:12 +01:00
Ted John e7cbd8bca0 Merge pull request #1074 from duncanspumpkin/bugs 
Fix out of bounds errors
 2015-05-17 13:44:05 +01:00
Gymnasiast f79c9811c9 Add string for 'Disable brakes failure' 2015-05-17 14:28:33 +02:00
Gymnasiast 0b3d2dad41 Add a cheat option to disable brakes failure 2015-05-17 14:26:45 +02:00
Gymnasiast 8d0ab82d65 Extend the RCT1 colour scheme to the scenario select and start new campaign window 2015-05-17 12:55:26 +02:00
Duncan Frost 0701bacc71 Fix yellow arrow when closing construction window. 
Small refactor of map selection globals.
Fixes #1062
 2015-05-17 08:49:39 +01:00
Duncan Frost 328abd1d45 Fix out of bounds errors 
Changed get_surface_element to bubble up the null mapElement to be taken care of by the calling function.
Added checks on the track functions to ensure that invalid coordinates do not call get_surface_element_at.
Fixes #1066 and Fixes #1057
 2015-05-17 07:58:51 +01:00
Ted John f1e3668127 Merge Localisation/master into OpenRCT2/develop. 2015-05-17 04:00:11 +01:00
IntelOrca b762fccdb2 fix format codes that did not backtrack the null terminator. 2015-05-16 16:42:23 +01:00
Ted John 2675d79795 Merge pull request #1072 from Gymnasiast/develop 
Add cheat option for lift hills up to 410 km/h,
 2015-05-16 16:23:48 +01:00
Gymnasiast 02ba241385 Add cheat option for lift hills up to 410 km/h, fix a comment and some spaces 2015-05-16 17:16:09 +02:00
IntelOrca cad8295c53 Merge Localisation/master into OpenRCT2/develop. 2015-05-16 10:27:15 +01:00
IntelOrca 6749146685 Merge branch 'trigger-death-land-rights-tool' into develop 2015-05-15 22:10:23 +01:00
IntelOrca f7972f0d48 Merge branch 'land-rights-tool' of https://github.com/trigger-death/OpenRCT2 into trigger-death-land-rights-tool 
Conflicts:
	data/language/english_uk.txt
 2015-05-15 22:10:13 +01:00
Ted John b4683351f9 Merge pull request #1067 from runelaenen/cheat-create-ride 
[Cheat] Fix all rides
 2015-05-15 21:59:25 +01:00
Robert Jordan 3940bf4538 Fixed spelling error in tooltip 2015-05-15 16:09:25 -04:00
Robert Jordan 730d2bb2e8 Added Buy to land rights tooltip 2015-05-15 16:08:37 -04:00
Robert Jordan e3451df703 Fixed up strings 2015-05-15 16:06:59 -04:00
Robert Jordan 6d5a07f7ef Finished cleaning up land rights tool code 2015-05-15 15:19:36 -04:00