jmarshall23
da8d47dc66
Merge pull request #8 from nev6502/nev6502_branch
...
Various Scripting Changes and Updates, Fixed Red UI backgrounds
2020-06-20 07:23:02 -07:00
nev6502
ea14d1bc82
Merge remote-tracking branch 'upstream/master' into nev6502_branch
2020-06-19 23:46:11 -06: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
nev6502
3d7b8e9941
Merge remote-tracking branch 'upstream/master' into nev6502_branch
2020-06-18 18:27:50 -06:00
Justin Marshall
ddebcd6033
Fixed airplane rendering
2020-06-18 17:23:16 -07:00
nev6502
d251106f01
Merge remote-tracking branch 'upstream/master' into nev6502_branch
2020-06-18 17:54:57 -06:00
Justin Marshall
a516544743
8bit images are now linear sampled.
2020-06-18 16:53:01 -07:00
nev6502
400efc84c6
Merge remote-tracking branch 'upstream/master' into nev6502_branch
2020-06-18 17:51:14 -06:00
Justin Marshall
647519138b
Switched in game rendering to OpenGL.
2020-06-18 16:45:01 -07:00
nev6502
66ef62dd2c
Merge remote-tracking branch 'upstream/master' into nev6502_branch
2020-06-17 20:14:52 -06:00
nev6502
fb70a122cf
Missed a line in base .gitignore
2020-06-17 19:45:31 -06:00
nev6502
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)
2020-06-17 19:35:11 -06:00
Justin Marshall
df88871b13
Added 8bit image upload code.
2020-06-17 17:08:45 -07:00
Justin Marshall
ad91794bb2
Removed examples folder.
2020-06-17 13:37:07 -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
nev6502
d756b1f5b4
Merge remote-tracking branch 'upstream/master' into nev6502_branch
2020-06-16 18:14:39 -06:00
Justin Marshall
d098540971
Fix for mission briefing crash.
2020-06-16 17:07:16 -07:00
nev6502
0f410e2078
Merge remote-tracking branch 'upstream/master' into nev6502_branch
2020-06-16 17:45:43 -06: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
fca09a5f32
Added example HD structure.
2020-06-16 07:26:50 -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
nev6502
d15fb8ddec
Merge branch 'nev6502_branch' of https://github.com/nev6502/CnC_Remastered_Collection into nev6502_branch
2020-06-15 20:19:43 -06:00
Justin Marshall
a8494d7de4
Disabled legacy win32 key code that was causing a random crash.
2020-06-15 18:31:53 -07:00
nev6502
841ec98c5f
Fixed faded red UI backgrounds (they now use the same colors as RA95)
2020-06-15 18:37:19 -06: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
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
5d61070b9a
Merge pull request #3 from benlankamp/master
...
Re-enabling of features
2020-06-15 11:07:37 -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