17 Commits

Author	SHA1	Message	Date
Ben Lankamp	7962ff2124	Merge of Marshall/master into BL/master. ... Merge of SDL code from feature branch into BL/master.	2020-06-20 11:41:29 +02:00
Justin Marshall	b8a912f3a6	Remaster palettes now work correctly.	2020-06-19 19:37:06 -07:00
Justin Marshall	f36a4ddf2f	Added initial code to display buildings from the remaster.	2020-06-18 21:31:52 -07:00
Ben Lankamp	829f27c76f	Rewrote UserInput <> SDL interaction.	2020-06-18 16:11:40 +02:00
Justin Marshall	07f6df5f5b	New Church is now a new building type, placement editor can now render 32bit images.	2020-06-17 13:36:18 -07:00
Justin Marshall	92cc33e4aa	Used additional Chronoshift code to remove legacy assembly for stamp/icon rendering.	2020-06-15 11:47:17 -07:00
Justin Marshall	e571a66f0e	Re-added dlls	2020-06-15 11:16:49 -07:00
jmarshall23	c8c5ef4e34	Merge branch 'master' into master	2020-06-15 11:07:10 -07:00
Justin Marshall	0a1ef9aa84	Initial checkin of the new UI blit code(there are issues and will be fixed one by one).	2020-06-14 09:20:39 -07:00
Justin Marshall	2b84397244	Revert "Merge branch 'master' into jm-linux" ... This reverts commit bbfefbf9ab, reversing changes made to 48ba992ee7.	2020-06-14 08:40:03 -07:00
jmarshall23	bbfefbf9ab	Merge branch 'master' into jm-linux	2020-06-14 08:23:26 -07:00
Ben Lankamp	ef38daafef	* Cleanup of COORD.cpp ... * Show Credits and move tab in the right place	2020-06-14 16:11:07 +02:00
Justin Marshall	e7f1372fdd	Cursor now renders in OpenGL.	2020-06-13 18:57:47 -07:00
Diego Iastrubni	80b6038cb7	Fix CMake	2020-06-14 00:36:52 +03:00
Diego Iastrubni	8483eed94f	Merge remote-tracking branch 'jmarshall23/master' into jm-linux	2020-06-14 00:31:05 +03:00
Justin Marshall	f261a00a0a	Initial Developer Console code.	2020-06-12 13:16:21 -07:00
Justin Marshall	ba0c51a7f2	Moved code into the code folder.	2020-06-12 08:15:26 -07:00