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

3297 Commits

Author SHA1 Message Date
IntelOrca b4d88e9d92 fix returning of text fields in twitch window 2015-06-02 16:11:17 +01:00
Ted John 48711988c5 Merge pull request #1200 from mzmiric5/twitch-window 
Twitch window
 2015-06-02 16:00:35 +01:00
Miso Zmiric (Mike Squinter) 63808c2599 add stubs for twitch window text input event and window invalidate 2015-06-02 15:56:18 +01:00
Miso Zmiric (Mike Squinter) 68d8163fc1 fix character pointer and prepare to send data back to window 2015-06-02 15:56:17 +01:00
Miso Zmiric (Mike Squinter) 6e690bdd61 add multi text input, add decorations to twitch window 2015-06-02 15:56:16 +01:00
Miso Zmiric (Mike Squinter) 2d57f82b25 add the base for the twitch window 2015-06-02 15:51:22 +01:00
Ted John 9144080ef7 Merge pull request #1197 from ThomasdenH/develop 
Sprite tool now can export all sprites in a file
 2015-06-02 14:45:04 +01:00
IntelOrca 137c8c190d add giant screenshot to file menu 2015-06-02 14:12:36 +01:00
Thomas den Hollander 2f6bff4def #include fix 2015-06-02 13:37:18 +02:00
Ted John 24f349b3f2 Merge pull request #1196 from zsilencer/optimize 
make hardware mode much faster
 2015-06-02 12:21:17 +01:00
Thomas den Hollander 5b8919480b Add name to contributors 2015-06-02 12:54:37 +02:00
Thomas df25e7a15a Add command 'exportall' to sprite tool 2015-06-02 12:50:16 +02:00
zsilencer 14b9445d8a make texture screen blit faster 2015-06-02 02:21:07 -06:00
Ted John bf39fc36b1 Merge Localisation/master into OpenRCT2/develop. 2015-06-02 04:00:13 +01:00
IntelOrca f827234dc8 fix sprite compile issue, entry offsets were not updated when data was reallocated. 2015-06-02 00:53:51 +01:00
Ted John 954db85e8c Merge pull request #1193 from zsilencer/bugfix 
#1192
 2015-06-01 21:36:54 +01:00
Ted John a63b7906c8 Merge pull request #1191 from ThomasdenH/develop 
Add dithering to sprite importer
 2015-06-01 21:36:14 +01:00
Ted John cea0f77c03 Merge pull request #1190 from trigger-death/themes-rename 
Renamed Colour Schemes to Themes
 2015-06-01 21:35:23 +01:00
zsilencer 603233a583 #1192 2015-06-01 13:07:18 -06:00
Robert Jordan c0ea64b83d Minor visual improvements 2015-06-01 11:38:27 -04:00
Robert Jordan 80aaae3c8d Changed preset to theme 2015-06-01 11:06:07 -04:00
Robert Jordan 765bf976ee Renamed Colour Schemes to Themes 
Themes window now opens to settings/presets tab so it's less confusing
for others.
Can no longer change default presets, you get a warning when you try.
now stores themes in themes folder.
Now clips theme names.
 2015-06-01 11:02:09 -04:00
Thomas a3368c4a54 Fix issue 2015-06-01 15:14:15 +02:00
Thomas f262ef977d Fix warning and remove debugging 2015-06-01 14:04:35 +02:00
Thomas c266c21c9c Fix overflow issue 2015-06-01 13:19:40 +02:00
Ted John 0a5236be1c Merge Localisation/master into OpenRCT2/develop. 2015-06-01 04:00:13 +01:00
Thomas 55456559bb Added dithering and closest pixel conversion for sprite tool 2015-05-31 20:35:40 +02:00
Ted John 15791a2921 Merge pull request #1186 from rd3k/fix-parksize 
Use uint16 for park size, fix #1162
 2015-05-31 13:08:49 +01:00
rd3k 9d7dc3bacc Use uint16 for park size 2015-05-31 13:00:39 +01:00
Ted John da532dd7f0 Merge Localisation/master into OpenRCT2/develop. 2015-05-31 04:00:13 +01:00
Ted John 505216e82f Merge pull request #1182 from rd3k/peep-sick-cheat 
Add cheat to make all guests feel nauseous
 2015-05-31 02:13:11 +01:00
rd3k 395773cdd6 Add cheat to make all guests feel nauseous 2015-05-31 02:04:01 +01:00
Ted John 4cd81766f5 Merge pull request #1180 from jcdavis/build_g2_sh 
build_g2 for OS X/Linux
 2015-05-31 00:26:25 +01:00
IntelOrca 1fdf1f57f7 add zoom button images to viewport window 2015-05-31 00:20:42 +01:00
Jackson Davis ebc8d798b8 build_g2 for OS X/Linux 2015-05-30 16:20:15 -07:00
Ted John 9f74eecb50 Merge pull request #1179 from mzmiric5/improve-build 
Improve build
 2015-05-30 22:18:06 +01:00
Miso Zmiric (Mike Squinter) aad8c8771e delete old batch pre-build 2015-05-30 22:12:03 +01:00
Miso Zmiric (Mike Squinter) 21a5c02333 use powershell pre-build, switch back to /MT 2015-05-30 22:11:06 +01:00
Ted John 121c3a1575 Merge pull request #1174 from trigger-death/window-colour-schemes-2 
Window Colour Schemes
 2015-05-30 21:18:00 +01:00
Robert Jordan 3fae3c2017 Resolved more conflicts 2015-05-30 16:03:39 -04:00
Robert Jordan 41171aa304 Resolved Merge Conflicts 2015-05-30 16:00:13 -04:00
Ted John ea2082b0a0 Merge pull request #1175 from rd3k/mapgen-inputwindows 
Add handy input windows to mapgen first tab
 2015-05-30 20:11:06 +01:00
rd3k 3bd079a9f4 Add handy input windows to mapgen first tab 2015-05-30 20:10:10 +01:00
Robert Jordan eb19ae7995 Final changes 2015-05-30 12:43:24 -04:00
Robert Jordan 53a241d197 Finished ini file loading and removed warnings 2015-05-30 11:52:08 -04:00
Ted John 039227b3df Merge pull request #1173 from Gymnasiast/patch-3 
Consistently use colons after labels that are followed by a dropdown
 2015-05-30 13:54:49 +01:00
Michael Steenbeek b1e94bf110 Consistently use colons after labels that are followed by a dropdown 2015-05-30 14:35:59 +02:00
IntelOrca 4bb4b197dd make small change to screenshot command line 2015-05-30 13:06:36 +01:00
IntelOrca 85bf7c77d0 Merge branch 'cmdline-screenshot' into develop 2015-05-30 13:03:16 +01:00
Ted John e9f7ec0a6a Merge pull request #1172 from duncanspumpkin/cmdline-screenshot 
Fix rotation issue
 2015-05-30 13:02:38 +01:00