mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-22 18:31:59 -05:00
Code Issues Projects Releases Packages Wiki Activity
9839 commits 10 branches 46 tags 399 MiB
Commit graph

9839 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ted John
f3b0044c8a Merge pull request #4659 from IntelOrca/refactor/painting 
Refactor some of the paint and draw functions to pass parameters instead of using globals as the first steps towards nicer paint code and multi-threaded paint code.
 2016-10-22 14:30:45 +01:00
Ted John
84e8b00900 Merge pull request #4678 from marijnvdwerf/fix/paint-4 
Track Paint fixes: segment support height
 2016-10-22 14:22:03 +01:00
Ted John
3e260fcfc5 Merge pull request #4677 from marijnvdwerf/fix/paint-3 
Track Paint fixes: general support height
 2016-10-22 14:21:28 +01:00
Ted John
d15a179eae Rename / refactor paint quadrant variables 2016-10-22 14:20:57 +01:00
Marijn van der Werf
1ce7f38785 Fix various segment heights 2016-10-22 14:42:31 +02:00
Marijn van der Werf
4b4c00a1af Check for SEGMENTS_ALL when printing 2016-10-22 14:42:30 +02:00
Marijn van der Werf
1ebfba60d9 Fix right vertical loop 2016-10-22 14:42:30 +02:00
Ted John
60df18ee0f Refactor paint_arrange_structs 2016-10-22 13:35:21 +01:00
Ted John
86dd18a65d Rename paint functions 2016-10-22 13:35:21 +01:00
Ted John
504257ce08 Refactor paint_init 2016-10-22 13:35:21 +01:00
Ted John
e4429641a4 Refactor viewport_paint_column 2016-10-22 13:35:21 +01:00
Ted John
b81fe09469 Reformat sub_688217 2016-10-22 13:35:21 +01:00
Ted John
67e9ccb1fc Refactor paint_ps_money_effects 2016-10-22 13:35:21 +01:00
Ted John
1f810375a8 Refactor paint_attached_ps 2016-10-22 13:35:21 +01:00
Ted John
2aa0271222 Refactor paint_quadrant_ps 2016-10-22 13:35:21 +01:00
Ted John
ce58c2e4e7 Merge pull request #4674 from marijnvdwerf/fix/paint-2 
More various track paint fixes
 2016-10-22 12:30:00 +01:00
Ted John
188e2efe9c Merge pull request #4675 from zsilencer/bugfixes 
A couple of bugs that I noticed while playing online
 2016-10-22 12:28:06 +01:00
zsilencer
e2e4201112 Validate peep game command which caused crash from invalid sprite index 2016-10-22 01:53:33 -06:00
zsilencer
b184a16d8c Fix bug that caused sign text to be deleted on client without permission in multiplayer 2016-10-22 01:45:44 -06:00
Marijn van der Werf
5c0279f3e1 Fix general support heights 2016-10-22 02:42:02 +02:00
Marijn van der Werf
157d535f67 Only fallback if only one element differs 2016-10-22 02:40:35 +02:00
Marijn van der Werf
6f2b20d3c0 Fix lay down rc station tunnels 2016-10-22 01:51:55 +02:00
Marijn van der Werf
b2177b137e Fix helix tunnels 2016-10-22 01:49:32 +02:00
Marijn van der Werf
ce5831f9b4 Fix upward single-tile turns 2016-10-22 01:36:50 +02:00
Marijn van der Werf
ffbe380da7 Fix tunnel dumping 2016-10-22 01:04:17 +02:00
Marijn van der Werf
76188d2c4c Fix station drawing 2016-10-22 00:22:05 +02:00
Michał Janiszewski
c26b5ec2b8 Add checks ensuring CI scripts only run on CI 2016-10-21 17:08:16 +02:00
Ted John
2aac1dd4e3 Merge pull request #4620 from marijnvdwerf/clean/testpaint-1 
Start cleanup of testpaint
 2016-10-21 08:50:07 +01:00
OpenRCT2 git bot
f241ae2181 Merge Localisation/master into OpenRCT2/develop. 2016-10-21 04:00:17 +00:00
Ted John
aeb6d40703 Change Windows x64 output name to openrct2.exe 2016-10-20 22:45:22 +01:00
duncanspumpkin
8187b4a4d1 Remove setenv.ps1 file no longer used. Fixes #4657. 
This file has been broken for some time since the msbuild version was introduced.
 2016-10-20 17:50:15 +01:00
Duncan
81bb6cb950 Merge pull request #4649 from zsilencer/multiplayer 
Guest+staff pickup and balloon pop commands
 2016-10-20 12:46:27 +01:00
Duncan
a572ecf477 Merge pull request #4576 from zaxcav/fixPathFind 
Pathfinding checks all map elements on each tile.
 2016-10-20 12:42:48 +01:00
Duncan
912080c473 Merge pull request #4529 from zaxcav/adjacentStationRatingBonus 
Check for adjacent station(s) when applying rating bonus.
 2016-10-20 12:42:36 +01:00
Duncan
811111b08e Merge pull request #4585 from zaxcav/fixPeepHappiness 
Fixes to peep happiness, hunger, thirst, thoughts.
 2016-10-20 12:38:15 +01:00
Ted John
12cddd10bd Merge pull request #4653 from marijnvdwerf/paint/fix-1 
Various paint fixes
 2016-10-20 12:25:14 +01:00
Michał Janiszewski
bcf8d5422c Make sure to not push pull requests from travis 2016-10-20 11:47:54 +02:00
zaxcav
b85e53e898 Replace hex number with decimal number per PR review comments. 2016-10-20 11:08:14 +02:00
zaxcav
989a8fc4bc Update comment with new limits of ride satisfaction following commit 7f58c89. 2016-10-20 11:06:56 +02:00
zaxcav
d36c756ee7 Spelling corrections in code comments. 2016-10-20 11:06:56 +02:00
zaxcav
b92cddf536 Bump network version. 2016-10-20 11:03:54 +02:00
zaxcav
68f89c6b07 Comment peep update code related to updating happiness, etc. 2016-10-20 11:03:54 +02:00
zaxcav
6011429630 Fix potential under/over-flow of happiness, hunger, thirst in peep generation. 2016-10-20 10:45:15 +02:00
zaxcav
dfd27efaba Correct condition on running out of money thought. 2016-10-20 10:45:15 +02:00
Duncan
b0c500e79b Merge pull request #4655 from duncanspumpkin/satisfaction 
Re-refactor peep calculate satisfaction
 2016-10-20 08:42:15 +01:00
Michał Janiszewski
4d61396146 Set openrct2.org token for x86 builds on Travis-CI 2016-10-20 09:05:59 +02:00
OpenRCT2 git bot
04783e8905 Merge Localisation/master into OpenRCT2/develop. 2016-10-20 04:00:17 +00:00
zsilencer
d83df63acf Increment network version 2016-10-19 16:24:14 -06:00
zsilencer
3617c2cb93 Code review 2016-10-19 16:20:13 -06:00
zsilencer
986c2ab97e Fix bug - prevent firing of staff while being picked up 2016-10-19 16:20:05 -06:00