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

Commit Graph

  • 8a94ae2a46 Some progress on the palette remapping bits. Justin Marshall 2020-06-19 17:32:09 -07:00
  • 681c762dce Added house palette to remaster textures, AO is missing. Justin Marshall 2020-06-19 15:26:41 -07:00
  • 3f1e353296 Added hash comparisons to image load code. Justin Marshall 2020-06-19 08:57:02 -07:00
  • 2192c10ec1 Radar now works properly in OGL. Justin Marshall 2020-06-19 08:06:12 -07:00
  • f36a4ddf2f Added initial code to display buildings from the remaster. Justin Marshall 2020-06-18 21:31:52 -07:00
  • 3d7b8e9941 Merge remote-tracking branch 'upstream/master' into nev6502_branch nev6502 2020-06-18 18:27:50 -06:00
  • ddebcd6033 Fixed airplane rendering Justin Marshall 2020-06-18 17:23:16 -07:00
  • d251106f01 Merge remote-tracking branch 'upstream/master' into nev6502_branch nev6502 2020-06-18 17:54:57 -06:00
  • a516544743 8bit images are now linear sampled. Justin Marshall 2020-06-18 16:53:01 -07:00
  • 400efc84c6 Merge remote-tracking branch 'upstream/master' into nev6502_branch nev6502 2020-06-18 17:51:14 -06:00
  • 647519138b Switched in game rendering to OpenGL. Justin Marshall 2020-06-18 16:45:01 -07:00
  • 720e7064d1 * Center Abort Skirmish game dialog * Savegame compatible centering of skirmish start Ben Lankamp 2020-06-18 22:26:39 +02:00
  • 71007c06d0 * Center on player location at Skirmish start Ben Lankamp 2020-06-18 22:09:37 +02:00
  • 829f27c76f Rewrote UserInput <> SDL interaction. Ben Lankamp 2020-06-18 16:11:40 +02:00
  • 66ef62dd2c Merge remote-tracking branch 'upstream/master' into nev6502_branch nev6502 2020-06-17 20:14:52 -06:00
  • fb70a122cf Missed a line in base .gitignore nev6502 2020-06-17 19:45:31 -06:00
  • 2d424cd427 - Added the ability to specify a cell or a rectangular area of cells for the various count functions - First two MapScript event creation functions (which creates triggers and attaches callbacks to them) - Changed back to master's gitingore files. (will use the excludes file instead for internal "ignoring" purposes from now on) nev6502 2020-06-17 19:35:11 -06:00
  • df88871b13 Added 8bit image upload code. Justin Marshall 2020-06-17 17:08:45 -07:00
  • ad91794bb2 Removed examples folder. Justin Marshall 2020-06-17 13:37:07 -07:00
  • 07f6df5f5b New Church is now a new building type, placement editor can now render 32bit images. Justin Marshall 2020-06-17 13:36:18 -07:00
  • d756b1f5b4 Merge remote-tracking branch 'upstream/master' into nev6502_branch nev6502 2020-06-16 18:14:39 -06:00
  • d098540971 Fix for mission briefing crash. Justin Marshall 2020-06-16 17:07:16 -07:00
  • 0f410e2078 Merge remote-tracking branch 'upstream/master' into nev6502_branch nev6502 2020-06-16 17:45:43 -06:00
  • d9ed612d99 Fixed a bug were key/flags from SDL input weren't being cleared every frame. Justin Marshall 2020-06-16 16:33:24 -07:00
  • 032b6e112f Buffer_To_Page now writes to the correct area. Justin Marshall 2020-06-16 16:29:29 -07:00
  • 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. Justin Marshall 2020-06-16 15:39:32 -07:00
  • 183302040f Removed uneeded WWSDL_ProcessEvents call. Justin Marshall 2020-06-16 13:01:41 -07:00
  • f70f3331a0 Mouse L/R Key now goes through the keyboard system. Justin Marshall 2020-06-16 12:58:20 -07:00
  • 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. Justin Marshall 2020-06-16 11:54:13 -07:00
  • fca09a5f32 Added example HD structure. Justin Marshall 2020-06-16 07:26:50 -07:00
  • 19b6c46149 Added 32bit image(single frame) overrides for buildings. Image_t now stores raw pixel data. Justin Marshall 2020-06-16 07:25:15 -07:00
  • 7091282433 * Handle text input properly from SDL * Removed duplicate keyboard.cpp Ben Lankamp 2020-06-16 15:11:17 +02:00
  • d15fb8ddec Merge branch 'nev6502_branch' of https://github.com/nev6502/CnC_Remastered_Collection into nev6502_branch nev6502 2020-06-15 20:19:43 -06:00
  • a8494d7de4 Disabled legacy win32 key code that was causing a random crash. Justin Marshall 2020-06-15 18:31:53 -07:00
  • 841ec98c5f Fixed faded red UI backgrounds (they now use the same colors as RA95) nev6502 2020-06-15 18:37:19 -06:00
  • c25752e638 Ported Linear_Scale_To_Linear to 32bit. Justin Marshall 2020-06-15 17:31:34 -07:00
  • 4a6f105967 Converted the 8bit palette render functions to render into a 32bit buffer. Justin Marshall 2020-06-15 15:27:19 -07:00
  • 2007adbda3 * Change font to Arial * Load/save dialog in proper place Ben Lankamp 2020-06-15 21:31:03 +02:00
  • d233a82bf8 Merge branch 'master' of https://github.com/benlankamp/CnC_Remastered_Collection Ben Lankamp 2020-06-15 21:21:45 +02:00
  • 4d5babd812 * Mission Timer at proper place * Map view dimensions fixed Ben Lankamp 2020-06-15 21:20:57 +02:00
  • 92cc33e4aa Used additional Chronoshift code to remove legacy assembly for stamp/icon rendering. Justin Marshall 2020-06-15 11:47:17 -07:00
  • 6bc8e75194 Merge pull request #7 from nev6502/nev6502_branch jmarshall23 2020-06-15 11:17:39 -07:00
  • e571a66f0e Re-added dlls Justin Marshall 2020-06-15 11:16:49 -07:00
  • 5d61070b9a Merge pull request #3 from benlankamp/master jmarshall23 2020-06-15 11:07:37 -07:00
  • c8c5ef4e34 Merge branch 'master' into master jmarshall23 2020-06-15 11:07:10 -07:00
  • 47894bc6d4 * Proper fix for Window padding in ImGui. Ben Lankamp 2020-06-15 19:59:17 +02:00
  • d21592d73b No briefing in Skirmish Ben Lankamp 2020-06-15 18:34:02 +02:00
  • 2f7e6dbcaa Menus all centered Ben Lankamp 2020-06-15 18:20:13 +02:00
  • 1c1737e10d * Main menu now properly aligned. Ben Lankamp 2020-06-15 17:49:18 +02:00
  • 9caebd5a17 First draft of Count functions for everything; units, buildings, aircraft, infantry and vessels. Allows specific types and players or generic "ALL" queries when -1 indexes are passed nev6502 2020-06-15 02:19:09 -06:00
  • 4a7a3df2cc Added ability to attach Lua/MapScript callbacks to a trigger. Can be set to work with complex trigger actions. nev6502 2020-06-14 23:51:31 -06:00
  • fb4d3f272c Added Allied briefing background. Justin Marshall 2020-06-14 19:03:22 -07:00
  • 393bc868f6 Fixed scorescreen page flip issue. Justin Marshall 2020-06-14 18:58:32 -07:00
  • c9e027e1a0 Scorescreen no longer crashes but page flips all over the place. Disable color clear each frame. Justin Marshall 2020-06-14 18:28:42 -07:00
  • 5b3f63b4e4 Team colors are now on the skirmish screen. Justin Marshall 2020-06-14 17:19:57 -07:00
  • 3247be0d33 Added title screen to skirmish screen. Justin Marshall 2020-06-14 17:16:36 -07:00
  • e54d35c735 In Game Load/Save will no longer display the title screen. Justin Marshall 2020-06-14 15:46:01 -07:00
  • b97ed837bf Added red variant of background(needs art pass), fixed bug were g_inMainMenu wasn't updated on map restart. Justin Marshall 2020-06-14 15:24:44 -07:00
  • 0d4ead749f Load Mission now works with the new renderer. Justin Marshall 2020-06-14 15:02:20 -07:00
  • efd9ee934c Switched menu render over to OGL. Justin Marshall 2020-06-14 14:56:34 -07:00
  • 105fde711a * Remove unneeded code in game exit Ben Lankamp 2020-06-14 22:18:34 +02:00
  • 83e331b9ab * Remove old WinPrc code, proper shutdown in SDL events. Ben Lankamp 2020-06-14 22:05:12 +02:00
  • c412287a3e * Fixes for power, sidebar, etc. * Padding on display? Ben Lankamp 2020-06-14 21:39:40 +02:00
  • 26845809da Switched to Arial font to match font used in the original game. Justin Marshall 2020-06-14 10:03:36 -07:00
  • e8c09e7b36 Font color now uses g_ColorXlat Justin Marshall 2020-06-14 10:00:41 -07:00
  • 7f00bc46d4 Removed old wndproc code which fixes ESP crash. Justin Marshall 2020-06-14 09:25:28 -07:00
  • 0a1ef9aa84 Initial checkin of the new UI blit code(there are issues and will be fixed one by one). Justin Marshall 2020-06-14 09:20:39 -07:00
  • 2b84397244 Revert "Merge branch 'master' into jm-linux" Justin Marshall 2020-06-14 08:40:03 -07:00
  • 65013cc9d9 Merge pull request #5 from abergmeier/jm-linux jmarshall23 2020-06-14 08:23:42 -07:00
  • bbfefbf9ab Merge branch 'master' into jm-linux jmarshall23 2020-06-14 08:23:26 -07:00
  • 48ba992ee7 Merge pull request #6 from nev6502/nev6502_branch jmarshall23 2020-06-14 08:19:08 -07:00
  • a47304608b * Mouse cursor working properly on mouse move * Tooltip over undiscovered terrain Ben Lankamp 2020-06-14 17:02:03 +02:00
  • 054394ecea * Show version number Ben Lankamp 2020-06-14 16:47:31 +02:00
  • ef38daafef * Cleanup of COORD.cpp * Show Credits and move tab in the right place Ben Lankamp 2020-06-14 16:11:07 +02:00
  • 8e573d5db8 * Proper shutdown of mouse on exit * Moved DevIL.dll inside external/devil folder Ben Lankamp 2020-06-14 15:25:18 +02:00
  • 52f249f2c0 Merge from Marshall Ben Lankamp 2020-06-14 15:06:07 +02:00
  • 7fb577abf7 Restructuring of code Ben Lankamp 2020-06-14 15:03:29 +02:00
  • c8d084c4f1 Merge remote-tracking branch 'upstream/master' into nev6502_branch nev6502 2020-06-14 00:14:32 -06:00
  • 41691916b3 MouseHotX/Y now used with new mouse code. Justin Marshall 2020-06-13 21:39:32 -07:00
  • ccbdfd163d Merge remote-tracking branch 'upstream/master' into nev6502_branch nev6502 2020-06-13 21:29:31 -06:00
  • c43b0dd047 Hack for new cursor code to be in the right spot. Justin Marshall 2020-06-13 19:14:58 -07:00
  • e7f1372fdd Cursor now renders in OpenGL. Justin Marshall 2020-06-13 18:57:47 -07:00
  • 25f220ec74 First draft for completion of Lua implementation of all vanilla trigger actions nev6502 2020-06-13 19:15:38 -06:00
  • a30d5e8243 Revert "First draft for completion of Lua implementation of all vanilla actions within Red Alert" nev6502 2020-06-13 19:05:13 -06:00
  • 8f5da5531e First draft for completion of Lua implementation of all vanilla actions within Red Alert nev6502 2020-06-13 18:47:27 -06:00
  • fb58966e1b Cleaned up imgui integration. Justin Marshall 2020-06-13 15:52:07 -07:00
  • 80b6038cb7 Fix CMake Diego Iastrubni 2020-06-14 00:36:52 +03:00
  • 8483eed94f Merge remote-tracking branch 'jmarshall23/master' into jm-linux Diego Iastrubni 2020-06-14 00:31:05 +03:00
  • 75202e20d9 More compile fixes - upper case includes Diego Iastrubni 2020-06-14 00:21:39 +03:00
  • e6b928dcd2 Removed calls to CalcX/CalcX functions in ASM. Ben Lankamp 2020-06-13 23:18:31 +02:00
  • d14ec76dbb Make the project "confirgure" on linux Diego Iastrubni 2020-06-14 00:11:19 +03:00
  • 507079c455 Merge pull request #4 from nev6502/nev6502_branch jmarshall23 2020-06-12 20:01:21 -07:00
  • eb7ddd289c Work done on the scripting engine nev6502 2020-06-12 20:44:44 -06:00
  • 7994e304bf Removed some left over ddraw code and used proper linear_blit* bits from Chronoshift. Justin Marshall 2020-06-12 17:32:11 -07:00
  • fc3d06aa21 Re-introduce credits Ben Lankamp 2020-06-13 00:13:40 +02:00
  • 712a5e519d Map command can now be called from anywhere in the main menu UI Justin Marshall 2020-06-12 14:03:10 -07:00
  • f261a00a0a Initial Developer Console code. Justin Marshall 2020-06-12 13:16:21 -07:00
  • 3d995ad22e * Re-enable scrolling * Re-enable ending of game Ben Lankamp 2020-06-12 17:35:39 +02:00
  • ea55bbdb4c Moved readme to root folder. Justin Marshall 2020-06-12 08:26:25 -07:00
  • ba0c51a7f2 Moved code into the code folder. Justin Marshall 2020-06-12 08:15:26 -07:00