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
nev6502
7836514a16
Removed some commented out debug code
2020-06-21 15:17:08 -06: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
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
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
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
Ben Lankamp
829f27c76f
Rewrote UserInput <> SDL interaction.
2020-06-18 16:11:40 +02: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