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

132 Commits

Author SHA1 Message Date
Ted John d07b9535c2 integrate variables: object entry lists 2016-06-16 11:36:15 +02:00
Ted John 4896d14940 extract texture generation code to new class 2016-06-11 19:13:18 +01:00
Ted John e3ecb91b91 implement DrawLine with shader 2016-06-11 17:43:53 +01:00
Ted John 2a569dc062 implement a ping-pong framebuffer 2016-06-11 15:18:31 +01:00
Ted John b0b0b82fd1 implement scaling for OpenGL 2016-06-11 02:24:39 +01:00
Ted John 84ca31a240 implement masked image shader 2016-06-10 20:17:00 +01:00
Ted John 808afe0a81 add drawimage shader and optimise 2016-06-10 17:54:29 +01:00
Ted John e7e92f02c1 re-enable OpenGL 2016-06-10 17:54:29 +01:00
Ted John dc7b8b4d3b add initial shader code 2016-06-10 17:54:29 +01:00
Michał Janiszewski a92972eef6 Disable OpenGL for all platforms 
OpenGL rendering is not yet ready, but the infrastructure is in place.
 2016-06-08 18:02:18 +01:00
Ted John 40bd085f35 add OPENGL_NO_LINK ability for all platforms 2016-06-07 22:47:31 +01:00
Ted John 8edc97bebe add support for OpenGL extensions 2016-06-07 22:45:36 +01:00
Ted John 2fa0c7977a add OpenGL drawing engine with FillRect impl 2016-06-07 22:45:36 +01:00
Ted John 3e6eb48d4c draw rain via new IRainDrawer interface 2016-06-07 22:45:36 +01:00
Ted John 3da57d0865 route old functions to new drawing interface 
- hardware display temporarily removed
- rain, fps and other non-window elements not drawn
 2016-06-07 22:45:36 +01:00
Ted John 2de332369c add initial interfaces and software engine 2016-06-07 22:45:36 +01:00
Jeroen D Stout 21dcb405ce Merged with Open dev 2016-06-04 15:35:14 +02:00
Michał Janiszewski a79e793e67 Disable whole-project alignment for MSVC & MinGW (#3807) 
As OpenRCT2/OpenRCT2#3783 has now been merged, this should be
unnecessary.
 2016-06-03 19:07:52 +01:00
Ted John 8dfbabbd07 refactor network, create ITcpSocket 
Abstracts all socket code into a new class TcpSocket which is only exposed by a light interface, ITcpSocket. This now means that platform specific headers like winsock2.h and sys/socket.h do not have to be included in OpenRCT2 header files reducing include load and other issues.
 2016-06-01 23:01:20 +01:00
Jeroen D Stout ee360ecb3d Fixed line endings in vcxproj 2016-06-01 15:09:53 +02:00
JeroenDStout 4f4003b499 vcxproj 2016-05-31 23:56:58 +02:00
Ted John c0ad5aadd8 revert unintentional changes to vcxproj 2016-05-30 11:28:14 +01:00
Ted John 623318a35d refactor NetworkPlayer 2016-05-30 11:18:07 +01:00
Ted John 3591026078 refactor NetworkAction 2016-05-30 11:18:07 +01:00
Ted John 31ac6e7fdf refactor NetworkConnection and NetworkPacket 2016-05-30 11:18:07 +01:00
Ted John 46ecd53a99 refactor NetworkAddress 2016-05-30 11:18:07 +01:00
Ted John 3a1a474c7c refactor key map to User and UserManager classes 2016-05-27 20:28:35 +02:00
Ted John fe057c4470 handle null group ids 2016-05-27 20:28:34 +02:00
Michał Janiszewski 839fc3938f Add NetworkKey files to VS project 2016-05-27 20:28:33 +02:00
Ted John d42a708d1a turn on warnings as errors 2016-05-23 20:54:51 +01:00
Ted John 4eb7a7ee0e add S6 exporter 2016-05-08 22:35:08 +01:00
Ted John 3557c7c8eb add S6 importer and chunk loading 2016-05-08 22:35:05 +01:00
Ted John d88ef5e4c2 rename track list to track design index 2016-05-08 14:03:52 +01:00
Ted John 1908743c71 refactor track save, move into own source 2016-05-08 14:03:49 +01:00
Ted John 77e7313540 move track design related functions to new source 2016-05-08 14:03:48 +01:00
Ted John 5ad8fb272e create new track index file format at startup 2016-05-08 14:02:46 +01:00
duncanspumpkin 7f02193411 Move around map element and sprite functions into seperate files 
Add dummy files for big file move around

Fix files so they can compile

Add copyright header

Split up functions into seperate files

Remove suffix

Move supports again

Change functions signatures to remove viewport_setup

Rename folder structure

Finish moving about files
 2016-05-05 21:41:53 +01:00
duncanspumpkin 72ca648135 Move painter functions into paint.c. Fix mistake in paint_attach_to_previous_ps 2016-05-04 18:54:42 +01:00
Duncan 64b4d751fc Add paint_surface to VS filters (#2) 2016-04-28 20:03:17 +02:00
Ted John a6ca76813d rename import.h and remove includes 2016-04-22 20:14:29 +01:00
Ted John f3356caa39 add a CLI command for converting saved games <-> scenarios 2016-04-22 18:26:27 +01:00
Ted John f1b41bf51d rename tables.cpp and update filters 2016-04-22 18:26:26 +01:00
Ted John 7754204a25 finish conversion of RCT1 import to c++ 2016-04-22 18:25:19 +01:00
Ted John cf7b81fd3a start moving RCT1 importer to C++ 2016-04-22 18:24:54 +01:00
janisozaur 7d2e62ba56 Fix typo introduced in 288d11a, fixes #3376 (#3379) 
See https://sourceforge.net/p/predef/wiki/Architectures/

This reverts commit 67a86fe22f.
 2016-04-22 07:59:50 +01:00
Ted John 67a86fe22f fix #3376: define PLATFORM_X86 so that CALLPROC is used again 2016-04-22 00:26:39 +01:00
Ted John b499a4589f embed OpenRCT2 icon for Windows (#3372) 
Embeds the OpenRCT2 icon file using Win32 native resources and sets the window icon to it.
 2016-04-21 19:17:26 +01:00
IntelOrca 4b2776f266 move code from Diagnostics and Guard to cpp 2016-04-20 18:11:06 +01:00
Ted John 9fd6c9df5f update VS filters 2016-04-19 22:52:41 +01:00
Michał Janiszewski 736fdc2f33 Enable breakpad on Appveyor 2016-04-09 20:21:13 +02:00
Michał Janiszewski 17bc485fb5 Breakpad for windows 
This enables breakpad Windows support **only**.

The scope of this was limited to allow for inclusion into 0.0.4 release.
Breakpad for now is a Windows-only functionality, as this platform has
largest audience and is the only one that has no system-provided stack
tracing utility.

Upon crash, breakpad will try to create a dump and save current game,
present user with some vital information, then open explorer on the
created files for user convenience, asking him/her to create a new
issue with OpenRCT2 on Github.
 2016-04-09 18:57:14 +02:00
IntelOrca 1daa657657 fix #3091: Korean words corrupted if over byte limit 2016-03-10 18:48:00 +00:00
IntelOrca 3edc5c6f0a compile multiple versions of draw RLE sprite 2016-02-20 13:41:43 +00:00
IntelOrca 7e1ce4fcc6 reinstate theme editor and fix bugs 2016-02-03 18:23:45 +00:00
IntelOrca b1b9741090 add JSON helpers 2016-02-03 18:23:42 +00:00
IntelOrca d67d6a4831 add more core classes 2016-02-03 18:23:41 +00:00
IntelOrca 470ac384e2 refactor window themes and use JSON for format 2016-02-03 18:23:40 +00:00
Ted John 6eaa93c9bc Merge pull request #2783 from zsilencer/multiplayer 
MP groups and permissions
 2016-01-24 12:29:27 +00:00
Michał Janiszewski 8599468760 Cleanup unused lodepng stuff 2016-01-23 17:13:15 +01:00
zsilencer 6e3068cd0a MP groups and permissions 2016-01-20 21:42:31 -07:00
Michał Janiszewski 753d430eaa Add zlib-based compression and decompression 2016-01-20 15:30:59 +01:00
IntelOrca 8cf53c12af add ability to set RCT2 path by command line 2016-01-12 23:10:18 +00:00
IntelOrca e9d222fdd3 new-argparse: finish new argparse integration and clean up 2016-01-10 22:50:31 +00:00
IntelOrca 3f0073f29c new-argparse: implement most of the root commands, fix issues 2016-01-10 22:50:30 +00:00
IntelOrca 9d98147b75 new-argparse: implement argument and option parsing 2016-01-10 22:50:29 +00:00
IntelOrca 14a266c177 new-argparse: add basic definitions and help display 2016-01-10 22:50:28 +00:00
duncanspumpkin 2bd6dac20f Merge branch 'develop' into vehicle-update 
Conflicts:
 openrct2.vcxproj
 2016-01-10 08:57:41 +00:00
IntelOrca df279b178b clean up VS solution and project 2016-01-09 21:50:04 +00:00
IntelOrca 00f0f06e83 update VS project to use new dependencies 2016-01-09 21:50:03 +00:00
duncanspumpkin 268e2d34ce Merge branch 'develop' into vehicle-update 
Conflicts:
 object.c
 2016-01-09 16:51:23 +00:00
IntelOrca 15bc414581 add stopwatch class for profiling 2016-01-08 20:50:23 +00:00
Michał Janiszewski 133096cd64 Merge branch 'develop' into vehicle-update 2016-01-05 09:59:53 +01:00
IntelOrca 0c933234e0 remove all tutorial code 2016-01-04 23:21:23 +00:00
IntelOrca af67cf5703 refactor scenario sources and improve scenario select window 2016-01-02 21:04:44 +00:00
IntelOrca 6a768c4a3c redo entire scenario highscore load / saving 
- load and save highscores to new file format (highscores.dat)
- scan scenarios from RCT2 data and user data
- load highscores from legacy file (scores.dat)
- fix various issues with new scenario select window
 2016-01-02 21:04:10 +00:00
Michał Janiszewski 5f66cd48f8 Merge branch 'develop' into vehicle-update 
Conflicts:
	openrct2.vcxproj.filters
 2015-12-31 11:41:23 +01:00
IntelOrca 00e5c4418d refactor image IO to new source file 2015-12-30 13:36:09 +00:00
IntelOrca 652e9f6829 update VS project and filters 2015-12-30 13:20:28 +00:00
Michał Janiszewski 4c6ee9570c Merge branch 'develop' into vehicle-update 
Conflicts:
	openrct2.vcxproj.filters
 2015-12-27 18:11:13 +01:00
IntelOrca cd99b87de6 add UI for notification settings 2015-12-26 17:30:13 +00:00
Michał Janiszewski cd2ec16290 Merge branch 'develop' into vehicle-update 
Conflicts:
	openrct2.vcxproj.filters
	projects/openrct2.vcxproj
 2015-12-23 19:47:16 +01:00
IntelOrca cb5dab3e57 move projects and add environment setup script 2015-12-22 21:31:26 +00:00