 jmarshall23
|
bbfefbf9ab
|
Merge branch 'master' into jm-linux
|
2020-06-14 08:23:26 -07:00 |
|
|
jmarshall23
|
48ba992ee7
|
Merge pull request #6 from nev6502/nev6502_branch
Nev6502 branch
|
2020-06-14 08:19:08 -07:00 |
|
 nev6502
|
c8d084c4f1
|
Merge remote-tracking branch 'upstream/master' into nev6502_branch
|
2020-06-14 00:14:32 -06:00 |
|
 Justin Marshall
|
41691916b3
|
MouseHotX/Y now used with new mouse code.
|
2020-06-13 21:39:32 -07:00 |
|
|
nev6502
|
ccbdfd163d
|
Merge remote-tracking branch 'upstream/master' into nev6502_branch
|
2020-06-13 21:29:31 -06:00 |
|
|
Justin Marshall
|
c43b0dd047
|
Hack for new cursor code to be in the right spot.
|
2020-06-13 19:14:58 -07:00 |
|
|
Justin Marshall
|
e7f1372fdd
|
Cursor now renders in OpenGL.
|
2020-06-13 18:57:47 -07:00 |
|
|
nev6502
|
25f220ec74
|
First draft for completion of Lua implementation of all vanilla trigger actions
|
2020-06-13 19:15:38 -06:00 |
|
|
nev6502
|
a30d5e8243
|
Revert "First draft for completion of Lua implementation of all vanilla actions within Red Alert"
This reverts commit 8f5da5531e.
|
2020-06-13 19:05:13 -06:00 |
|
|
nev6502
|
8f5da5531e
|
First draft for completion of Lua implementation of all vanilla actions within Red Alert
|
2020-06-13 18:47:27 -06:00 |
|
|
Justin Marshall
|
fb58966e1b
|
Cleaned up imgui integration.
|
2020-06-13 15:52:07 -07:00 |
|
 Diego Iastrubni
|
80b6038cb7
|
Fix CMake
|
2020-06-14 00:36:52 +03:00 |
|
|
Diego Iastrubni
|
8483eed94f
|
Merge remote-tracking branch 'jmarshall23/master' into jm-linux
|
2020-06-14 00:31:05 +03:00 |
|
|
Diego Iastrubni
|
75202e20d9
|
More compile fixes - upper case includes
|
2020-06-14 00:21:39 +03:00 |
|
|
Diego Iastrubni
|
d14ec76dbb
|
Make the project "confirgure" on linux
- replaced all REDALERT direcotry to upper case
- filenames are all capital
- the CL switches are behing a IF
|
2020-06-14 00:11:19 +03:00 |
|
|
jmarshall23
|
507079c455
|
Merge pull request #4 from nev6502/nev6502_branch
Work done on the scripting engine
|
2020-06-12 20:01:21 -07:00 |
|
|
nev6502
|
eb7ddd289c
|
Work done on the scripting engine
Probably going to need some discussion
|
2020-06-12 20:44:44 -06:00 |
|
|
Justin Marshall
|
7994e304bf
|
Removed some left over ddraw code and used proper linear_blit* bits from Chronoshift.
|
2020-06-12 17:32:11 -07: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
|
ea55bbdb4c
|
Moved readme to root folder.
|
2020-06-12 08:26:25 -07:00 |
|
|
Justin Marshall
|
ba0c51a7f2
|
Moved code into the code folder.
|
2020-06-12 08:15:26 -07:00 |
|
|
jmarshall23
|
18edb80aac
|
Merge pull request #2 from benlankamp/master
Getting to cleaner code base
|
2020-06-12 08:01:32 -07:00 |
|
 Ben Lankamp
|
f8e5b57f7d
|
Include actual changes :\
|
2020-06-12 16:55:53 +02:00 |
|
|
Ben Lankamp
|
66b80220cc
|
* Remove all DirectX remnants.
* Added copying of DLLs to Binary folder
* Handle system events through SDL
|
2020-06-12 16:52:26 +02:00 |
|
|
Justin Marshall
|
8cbbaa12b0
|
Added Release config.
|
2020-06-12 07:50:12 -07:00 |
|
|
Justin Marshall
|
482d5c0722
|
Disabled scroll bar on framebuffer window.
|
2020-06-11 19:39:31 -07:00 |
|
|
Justin Marshall
|
0a26a05572
|
GBuffer video mem now blit directly to the backbuffer cpu array.
|
2020-06-11 19:35:27 -07:00 |
|
|
Justin Marshall
|
f289eca079
|
Unit health now works again.
|
2020-06-11 19:23:52 -07:00 |
|
|
Justin Marshall
|
ed18ca9a37
|
Complete removal of directdraw and replaced with OpenGL. Has some bugs, movies disabled.
|
2020-06-11 17:59:36 -07:00 |
|
|
Justin Marshall
|
a7fdd19b5a
|
ASM files removed, functions replaced with bits from Chronoshift.
|
2020-06-11 13:28:41 -07:00 |
|
|
Justin Marshall
|
04b14ea4a2
|
Fixed font and render bug from TXTPRNT integration.
|
2020-06-11 08:53:09 -07:00 |
|
|
Justin Marshall
|
b6d525a5cd
|
Removed font.cpp.
|
2020-06-11 05:58:03 -07:00 |
|
|
Justin Marshall
|
b64c955970
|
Replaced TXTPRNT.ASM with TXTPRNT.CPP from Chronoshift.
|
2020-06-11 05:47:59 -07:00 |
|
|
Justin Marshall
|
cc6c6092c7
|
Added more scripting functions.
|
2020-06-10 20:13:22 -07:00 |
|
|
Justin Marshall
|
0b23dd5223
|
Initial Lua Script implementation. Credit/Timer now renders.
|
2020-06-10 17:50:06 -07:00 |
|
|
Justin Marshall
|
f230b5bd0f
|
Alt key now functions properly, fixed a-z and f1-f12 scancodes.
|
2020-06-10 14:32:01 -07:00 |
|
|
Justin Marshall
|
96c214819f
|
Removed unneeded file from CMakeLists.txt
|
2020-06-10 13:50:54 -07:00 |
|
|
Justin Marshall
|
45bcd847f9
|
CMake Projects, temp disabled MMX line blit.
|
2020-06-10 13:34:18 -07:00 |
|
|
Justin Marshall
|
baeaf6c807
|
New triggers work properly.
|
2020-06-09 21:54:06 -07:00 |
|
|
Justin Marshall
|
6fcd7a484e
|
Triggers should now be save and load able.
|
2020-06-09 21:40:10 -07:00 |
|
|
Justin Marshall
|
17464353dd
|
Initial edit trigger and trigger list screens. Trigger List screen complete, edit trigger screen needs some more work.
|
2020-06-09 20:05:14 -07:00 |
|
|
Justin Marshall
|
b777f2bd5c
|
Changing Theater now works.
|
2020-06-08 20:23:03 -07:00 |
|
|
Justin Marshall
|
ad43c33b7d
|
Grabbed LCW_Comp from Chronoshift to fix editor save bug with compression.
|
2020-06-08 19:31:04 -07:00 |
|
|
Justin Marshall
|
d9f1b24124
|
SizeMap buttons now work properly(needed unique id's).
|
2020-06-08 18:54:38 -07:00 |
|
|
Justin Marshall
|
562af3f7bf
|
Map Editor Mouse Control expands to the entire window.
|
2020-06-08 18:40:29 -07:00 |
|
|
Justin Marshall
|
797ba8fa64
|
Scenerio Dialog front end moved over to imgui.
|
2020-06-08 17:18:51 -07:00 |
|
|
Justin Marshall
|
0fd2b13225
|
Initial work on the scenerio editor screen.
|
2020-06-08 15:36:50 -07:00 |
|
|
Justin Marshall
|
8409c49675
|
Size Map editor screen ported to imgui.
|
2020-06-08 13:26:00 -07:00 |
|
|
Justin Marshall
|
c1d2434921
|
Switched "create entity" dialog to imgui.
|
2020-06-08 12:42:44 -07:00 |
|