 Ben Lankamp
|
e4da9ac861
|
Merge remote-tracking branch 'upstream/master'
|
2020-06-20 11:14:55 +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 |
|
|
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 |
|
|
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
|
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 |
|
|
Ben Lankamp
|
1c1737e10d
|
* Main menu now properly aligned.
|
2020-06-15 17:49:18 +02:00 |
|
 nev6502
|
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
Changed GiveCredits to be in line with these commands, and to also allow a player index of -1 to give credits to all players
|
2020-06-15 02:19:09 -06:00 |
|
|
nev6502
|
4a7a3df2cc
|
Added ability to attach Lua/MapScript callbacks to a trigger. Can be set to work with complex trigger actions.
Added scripts path to Lua so that Lua can find scripts within scripts/
|
2020-06-14 23:51:31 -06:00 |
|
|
Justin Marshall
|
393bc868f6
|
Fixed scorescreen page flip issue.
|
2020-06-14 18:58:32 -07:00 |
|
|
Justin Marshall
|
c9e027e1a0
|
Scorescreen no longer crashes but page flips all over the place. Disable color clear each frame.
|
2020-06-14 18:28:42 -07:00 |
|
|
Justin Marshall
|
5b3f63b4e4
|
Team colors are now on the skirmish screen.
|
2020-06-14 17:19:57 -07:00 |
|
|
Justin Marshall
|
3247be0d33
|
Added title screen to skirmish screen.
|
2020-06-14 17:16:36 -07:00 |
|
|
Justin Marshall
|
e54d35c735
|
In Game Load/Save will no longer display the title screen.
|
2020-06-14 15:46:01 -07:00 |
|
|
Justin Marshall
|
b97ed837bf
|
Added red variant of background(needs art pass), fixed bug were g_inMainMenu wasn't updated on map restart.
|
2020-06-14 15:24:44 -07:00 |
|
|
Justin Marshall
|
0d4ead749f
|
Load Mission now works with the new renderer.
|
2020-06-14 15:02:20 -07:00 |
|
|
Justin Marshall
|
efd9ee934c
|
Switched menu render over to OGL.
|
2020-06-14 14:56:34 -07:00 |
|
|
Ben Lankamp
|
105fde711a
|
* Remove unneeded code in game exit
|
2020-06-14 22:18:34 +02:00 |
|
|
Ben Lankamp
|
83e331b9ab
|
* Remove old WinPrc code, proper shutdown in SDL events.
|
2020-06-14 22:05:12 +02:00 |
|
|
Ben Lankamp
|
c412287a3e
|
* Fixes for power, sidebar, etc.
* Padding on display?
|
2020-06-14 21:39:40 +02:00 |
|