 nev6502
|
1d32cf97fd
|
Merge remote-tracking branch 'upstream/master' into nev6502_branch
|
2020-06-22 19:02:05 -06:00 |
|
 Justin Marshall
|
3ea7ac187a
|
Updated version string number.
|
2020-06-22 17:53:13 -07:00 |
|
|
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 |
|
|
nev6502
|
21027f723a
|
Merge remote-tracking branch 'upstream/master' into nev6502_branch
|
2020-06-22 17:16:45 -06:00 |
|
|
nev6502
|
c0c9979fbf
|
Merge remote-tracking branch 'upstream/master' into nev6502_branch
|
2020-06-22 17:15:19 -06:00 |
|
|
Justin Marshall
|
f53249cb24
|
WSA animations now work(thanks Omniblade :)).
|
2020-06-22 16:14:37 -07:00 |
|
|
Justin Marshall
|
9edbf56043
|
64bit version now works. Temp hack in for WSA x64 crash.
|
2020-06-22 13:22:35 -07:00 |
|
|
Justin Marshall
|
e3c998fb16
|
ScoreScreen works again, WSA animations are fullscreen, added loading screen.
|
2020-06-22 12:21:13 -07:00 |
|
|
Justin Marshall
|
fd24e73e0f
|
Inline assembly is now replaced with C.
|
2020-06-22 09:01:10 -07:00 |
|
|
nev6502
|
b37b16f3d0
|
Merge remote-tracking branch 'upstream/master' into nev6502_branch
|
2020-06-21 20:59:03 -06:00 |
|
|
Justin Marshall
|
332c36efa3
|
Aircraft remaster assets now load.
|
2020-06-21 19:53:01 -07:00 |
|
|
Justin Marshall
|
6834288c16
|
Added Infantry HD textures.
|
2020-06-21 19:46:11 -07:00 |
|
|
nev6502
|
ccf506a68b
|
Callback function is now an optional parameter across the various action creation functions, because some times actions are created expressely to be merged into another action to create a 2 action trigger, and thus the standalone action gets discarded. Entering a callback parameter just for the sake of requiring it is not very nice or clean.
|
2020-06-21 18:45:59 -06:00 |
|
 Ben Lankamp
|
fecd7f8ca0
|
Merge branch 'master' into BL/SDL-UserInput-plus-hotfixes
|
2020-06-22 00:09:24 +02:00 |
|
|
Ben Lankamp
|
55ffa4aee3
|
* Fix input on Add object in map editor
|
2020-06-22 00:08:17 +02:00 |
|
|
Ben Lankamp
|
7eff1e1f5a
|
* Re-added Normal_Move_Point
|
2020-06-22 00:03:57 +02:00 |
|
 jmarshall23
|
fa19c1361b
|
Merge pull request #12 from benlankamp/BL/SDL-UserInput-plus-hotfixes
Input fixes for ImGui in map editor
|
2020-06-21 14:58:43 -07:00 |
|
|
jmarshall23
|
e4d06a99e6
|
Merge pull request #11 from nev6502/nev6502_branch
Nev6502 branch
|
2020-06-21 14:57:19 -07:00 |
|
|
Justin Marshall
|
95e0bbb3aa
|
Added remaster units support, Image_t now supports multiple image resolutions per shape.
|
2020-06-21 14:56:25 -07:00 |
|
|
Ben Lankamp
|
3ced844e55
|
* Disable VSYNC
* Fixed input for text etc. (focus messages got lost)
|
2020-06-21 23:48:48 +02:00 |
|
|
nev6502
|
7836514a16
|
Removed some commented out debug code
|
2020-06-21 15:17:08 -06:00 |
|
|
Ben Lankamp
|
6676b00cc5
|
* Remove pasted word
|
2020-06-21 23:05:52 +02:00 |
|
|
Ben Lankamp
|
168bd74ffc
|
* Credits working TEMP (without pictures)
|
2020-06-21 23:04:20 +02:00 |
|
|
nev6502
|
569c925c04
|
Added ability to fire trigger only once (VOLATILE). It's a good thing I did because it exposed an issue with the merge trigger function. The old code was allowing a trigger to exist more than once in the various lists (eg. LogicTriggers), causing major issues when a temporary (VOLATILE) trigger got sprung. This is resolved.
|
2020-06-21 14:51:56 -06:00 |
|
|
Ben Lankamp
|
8f8b0a7dc1
|
* Centering of choosing Difficulty dialog
* Centering of Counterstrike/Aftermath mission dialogs
|
2020-06-21 22:33:41 +02:00 |
|
|
Ben Lankamp
|
bf229c1593
|
* Fixes for ImGui map editing dialogs
|
2020-06-21 22:27:25 +02:00 |
|
|
Justin Marshall
|
c124589708
|
All building animations now work.
|
2020-06-21 11:55:46 -07:00 |
|
|
Justin Marshall
|
378a615ffd
|
Fixed a bug were cache was generating bad file names(increased to v4), some building animations now work.
|
2020-06-21 11:37:05 -07:00 |
|
|
nev6502
|
2b0c6f4157
|
Further formatting and organization
|
2020-06-21 12:26:50 -06:00 |
|
|
Justin Marshall
|
b19e278529
|
Remaster Building Source filenames are now sourced from the XML file.
|
2020-06-21 10:54:00 -07:00 |
|
|
nev6502
|
b554ba4448
|
Global header added
Several new utility functions
|
2020-06-21 05:32:19 -06:00 |
|
|
nev6502
|
1343dcd1d5
|
FINALLY finished all vanilla actions and all vanilla events. Every one has been tested along the way. Up next will be utilities as well as functionality to combine 2 triggers to allow for efficient multi triggers and ways to set various trigger options after creating.
|
2020-06-21 01:10:01 -06:00 |
|
|
Justin Marshall
|
dac4c157cf
|
Added animation support for the HD remaster assets, idle terrain animations work.
|
2020-06-20 20:29:25 -07:00 |
|
|
Justin Marshall
|
ae4763251c
|
Remaster tilesets now load correctly.
|
2020-06-20 16:59:56 -07:00 |
|
|
nev6502
|
2cfc369190
|
Merge remote-tracking branch 'upstream/master' into nev6502_branch
|
2020-06-20 15:48:25 -06:00 |
|
|
Justin Marshall
|
acc1af0c05
|
Fix for placement editor crash.
|
2020-06-20 14:47:37 -07:00 |
|
|
jmarshall23
|
5d8b853436
|
Merge pull request #10 from benlankamp/BL/SDL-UserInput-plus-hotfixes
* Fixed input loops/too much callbacks.
|
2020-06-20 14:39:07 -07:00 |
|
|
Ben Lankamp
|
e7697aa3ac
|
* Fixed input loops/too much callbacks.
|
2020-06-20 23:33:26 +02:00 |
|
|
Justin Marshall
|
79b24cb81d
|
Initial HD stamp loading code.
|
2020-06-20 14:31:11 -07:00 |
|
|
nev6502
|
cbf0c3cd74
|
Merge branch 'nev6502_branch' of https://github.com/nev6502/CnC_Remastered_Collection into nev6502_branch
|
2020-06-20 14:18:27 -06:00 |
|
|
nev6502
|
f1cb462b89
|
Heavy work done to scripting engine
|
2020-06-20 14:18:19 -06:00 |
|
|
Justin Marshall
|
2ba8a7a2dd
|
Tileset stamps are now loaded before the level is rendered.
|
2020-06-20 09:51:38 -07:00 |
|
|
Justin Marshall
|
381f12b8c5
|
More remastered buildings should now load(temp workaround).
|
2020-06-20 08:54:15 -07:00 |
|
|
jmarshall23
|
4abf80eb0e
|
Merge pull request #9 from benlankamp/BL/SDL-UserInput-plus-hotfixes
Bl/sdl user input plus hotfixes
|
2020-06-20 07:24:49 -07:00 |
|
|
Ben Lankamp
|
09197ee12f
|
* Added arrow keys
* Fixed position of radar button
|
2020-06-20 11:48:49 +02:00 |
|
|
Ben Lankamp
|
28e98329b6
|
Mouse X/Y-reversal
|
2020-06-20 11:44:21 +02: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 |
|
|
nev6502
|
ea14d1bc82
|
Merge remote-tracking branch 'upstream/master' into nev6502_branch
|
2020-06-19 23:46:11 -06:00 |
|