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
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
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
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
Justin Marshall
26845809da
Switched to Arial font to match font used in the original game.
2020-06-14 10:03:36 -07:00
Justin Marshall
e8c09e7b36
Font color now uses g_ColorXlat
2020-06-14 10:00:41 -07:00
Justin Marshall
7f00bc46d4
Removed old wndproc code which fixes ESP crash.
2020-06-14 09:25:28 -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
a47304608b
* Mouse cursor working properly on mouse move
...
* Tooltip over undiscovered terrain
2020-06-14 17:02:03 +02:00
Ben Lankamp
054394ecea
* Show version number
2020-06-14 16:47:31 +02:00