hans/CnC_Remastered_Collection
1
0
Fork 0
mirror of https://github.com/jmarshall23/CnC_Remastered_Collection.git synced 2026-08-12 08:00:55 +02:00
Code Issues Packages Projects Releases Wiki Activity
197 Commits 2 Branches 2 Tags
6676b00cc5fbab782d2a53417329b2a7f9e03a10
Commit Graph

93 Commits

Author SHA1 Message Date
Ben Lankamp 6676b00cc5 * Remove pasted word 2020-06-21 23:05:52 +02:00
Ben Lankamp 168bd74ffc * Credits working TEMP (without pictures) 2020-06-21 23:04:20 +02:00
Ben Lankamp 8f8b0a7dc1 * Centering of choosing Difficulty dialog 
* Centering of Counterstrike/Aftermath mission dialogs
 2020-06-21 22:33:41 +02:00
Ben Lankamp bf229c1593 * Fixes for ImGui map editing dialogs 2020-06-21 22:27:25 +02:00
Ben Lankamp e7697aa3ac * Fixed input loops/too much callbacks. 2020-06-20 23:33:26 +02:00
Ben Lankamp 09197ee12f * Added arrow keys 
* Fixed position of radar button
 2020-06-20 11:48:49 +02:00
Ben Lankamp 28e98329b6 Mouse X/Y-reversal 2020-06-20 11:44:21 +02:00
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
Ben Lankamp e4da9ac861 Merge remote-tracking branch 'upstream/master' 2020-06-20 11:14:55 +02:00
Ben Lankamp 9d5eb0ac1e * Centering of mission accomplished 
* Added 8 px next to the Options bar
* TEMP: everything costs $50
 2020-06-20 10:27:17 +02:00
Justin Marshall 5087eeb294 Adjusted HD colors so the they the team colors. 2020-06-19 22:45:03 -07:00
Justin Marshall c511b0f9bf Added image cache for remaster assets. 2020-06-19 22:02:50 -07:00
Justin Marshall e3c5e96c81 Removed CPU side memory buffer for textures 2020-06-19 20:57:48 -07:00
Justin Marshall b8a912f3a6 Remaster palettes now work correctly. 2020-06-19 19:37:06 -07:00
Justin Marshall 28e37d2d6e Removed bad add in remaster palette rasterization. 2020-06-19 17:54:59 -07:00
Justin Marshall 8a94ae2a46 Some progress on the palette remapping bits. 2020-06-19 17:32:09 -07:00
Justin Marshall 681c762dce Added house palette to remaster textures, AO is missing. 2020-06-19 15:26:41 -07:00
Justin Marshall 3f1e353296 Added hash comparisons to image load code. 2020-06-19 08:57:02 -07:00
Justin Marshall 2192c10ec1 Radar now works properly in OGL. 2020-06-19 08:06:12 -07:00
Justin Marshall f36a4ddf2f Added initial code to display buildings from the remaster. 2020-06-18 21:31:52 -07:00
Justin Marshall ddebcd6033 Fixed airplane rendering 2020-06-18 17:23:16 -07:00
Justin Marshall a516544743 8bit images are now linear sampled. 2020-06-18 16:53:01 -07:00
Justin Marshall 647519138b Switched in game rendering to OpenGL. 2020-06-18 16:45:01 -07:00
Ben Lankamp 720e7064d1 * Center Abort Skirmish game dialog 
* Savegame compatible centering of skirmish start
 2020-06-18 22:26:39 +02:00
Ben Lankamp 71007c06d0 * Center on player location at Skirmish start 2020-06-18 22:09:37 +02:00
Ben Lankamp 829f27c76f Rewrote UserInput <> SDL interaction. 2020-06-18 16:11:40 +02:00
Justin Marshall df88871b13 Added 8bit image upload code. 2020-06-17 17:08:45 -07: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 d098540971 Fix for mission briefing crash. 2020-06-16 17:07:16 -07:00
Justin Marshall d9ed612d99 Fixed a bug were key/flags from SDL input weren't being cleared every frame. 2020-06-16 16:33:24 -07:00
Justin Marshall 032b6e112f Buffer_To_Page now writes to the correct area. 2020-06-16 16:29:29 -07:00
Justin Marshall 9183814eb8 Fixed a bug were TemplateTypeClass::Display was displaying incorrect pixels. Enabling the editor no longer shows the system cursor. Placement_Editor now renders correctly again. Linear_Blit_Linear and Linear_Scale_To_Linear now work with 32bit images. 2020-06-16 15:39:32 -07:00
Justin Marshall 183302040f Removed uneeded WWSDL_ProcessEvents call. 2020-06-16 13:01:41 -07:00
Justin Marshall f70f3331a0 Mouse L/R Key now goes through the keyboard system. 2020-06-16 12:58:20 -07:00
Justin Marshall 3cbdd10813 SDL event processing is now done in Call_back. Fixed garbage pixels when opening in game menu dialog. Surrender dialog will now always render. Moved WWKeyboardClass::Head/WWKeyboardClass::Tail to static vars in prep for re-write. 2020-06-16 11:54:13 -07:00
Justin Marshall 19b6c46149 Added 32bit image(single frame) overrides for buildings. Image_t now stores raw pixel data. 2020-06-16 07:25:15 -07:00
Ben Lankamp 7091282433 * Handle text input properly from SDL 
* Removed duplicate keyboard.cpp
 2020-06-16 15:11:17 +02:00
Justin Marshall a8494d7de4 Disabled legacy win32 key code that was causing a random crash. 2020-06-15 18:31:53 -07:00
Justin Marshall c25752e638 Ported Linear_Scale_To_Linear to 32bit. 2020-06-15 17:31:34 -07:00
Justin Marshall 4a6f105967 Converted the 8bit palette render functions to render into a 32bit buffer. 2020-06-15 15:27:19 -07:00
Ben Lankamp 2007adbda3 * Change font to Arial 
* Load/save dialog in proper place
 2020-06-15 21:31:03 +02:00
Ben Lankamp d233a82bf8 Merge branch 'master' of https://github.com/benlankamp/CnC_Remastered_Collection 2020-06-15 21:21:45 +02:00
Ben Lankamp 4d5babd812 * Mission Timer at proper place 
* Map view dimensions fixed
 2020-06-15 21:20:57 +02:00
Justin Marshall 92cc33e4aa Used additional Chronoshift code to remove legacy assembly for stamp/icon rendering. 2020-06-15 11:47:17 -07:00
jmarshall23 6bc8e75194 Merge pull request #7 from nev6502/nev6502_branch 
Added ability to attach Lua/MapScript callbacks to a trigger. Can be …
 2020-06-15 11:17:39 -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
Ben Lankamp 47894bc6d4 * Proper fix for Window padding in ImGui. 2020-06-15 19:59:17 +02:00
Ben Lankamp d21592d73b No briefing in Skirmish 2020-06-15 18:34:02 +02:00
Ben Lankamp 2f7e6dbcaa Menus all centered 2020-06-15 18:20:13 +02:00