 Justin Marshall
|
21f30aad44
|
Patch 1.01 Merge branch 'master' of https://github.com/electronicarts/CnC_Remastered_Collection
# Conflicts, ignored these upstream changes:
# REDALERT/MiscAsm.cpp
# REDALERT/WIN32LIB/DrawMisc.cpp
|
2020-06-22 17:19:05 -07:00 |
|
|
Justin Marshall
|
e3c998fb16
|
ScoreScreen works again, WSA animations are fullscreen, added loading screen.
|
2020-06-22 12:21:13 -07: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 |
|
|
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 |
|
|
Justin Marshall
|
d098540971
|
Fix for mission briefing crash.
|
2020-06-16 17:07:16 -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 |
|
 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 |
|
|
jmarshall23
|
c8c5ef4e34
|
Merge branch 'master' into master
|
2020-06-15 11:07:10 -07: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
|
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 |
|
|
Ben Lankamp
|
054394ecea
|
* Show version number
|
2020-06-14 16:47:31 +02:00 |
|
|
Ben Lankamp
|
52f249f2c0
|
Merge from Marshall
|
2020-06-14 15:06:07 +02:00 |
|
|
Ben Lankamp
|
7fb577abf7
|
Restructuring of code
|
2020-06-14 15:03:29 +02:00 |
|
|
Justin Marshall
|
712a5e519d
|
Map command can now be called from anywhere in the main menu UI
|
2020-06-12 14:03:10 -07:00 |
|
|
Justin Marshall
|
f261a00a0a
|
Initial Developer Console code.
|
2020-06-12 13:16:21 -07:00 |
|
|
Justin Marshall
|
ba0c51a7f2
|
Moved code into the code folder.
|
2020-06-12 08:15:26 -07:00 |
|