Commit graph

4742 commits

Author SHA1 Message Date
Nicolas 'Pixel' Noble
37c16e9e24 Merge remote-tracking branch 'upstream/main' into integrating-lua
# Conflicts:
#	.gitmodules
#	Makefile
#	src/gui/gui.h
#	vsprojects/mainthunk/mainthunk.vcxproj
2020-06-28 21:06:12 -07:00
Nicolas Noble
b9c2418d38
Merge pull request #255 from nicolasnoble/psyq-obj-parser
Adding psyq-obj-parser as a tool.
2020-06-28 14:03:09 -07:00
Nicolas 'Pixel' Noble
34d5746985 Merge remote-tracking branch 'upstream/main' into psyq-obj-parser 2020-06-28 13:56:32 -07:00
Nicolas Noble
ed3e31ffad
Merge pull request #257 from grumpycoders/nicolasnoble-patch-1
Reducing CPU usage to help with memory usage.
2020-06-28 13:55:33 -07:00
Nicolas Noble
1fba09ae19
Reducing CPU usage to help with memory usage. 2020-06-28 12:02:28 -07:00
Nicolas Noble
277d1d6c47
Typo. 2020-06-27 22:52:46 -07:00
Nicolas Noble
e7799ea8a9
Excluding psyq-obj-parser.exe from tests 2020-06-27 22:11:30 -07:00
Nicolas 'Pixel' Noble
91c8ec4810 More cleanup 2020-06-27 19:32:19 -07:00
Nicolas 'Pixel' Noble
4040cba88c Adding a readme 2020-06-27 19:03:04 -07:00
Nicolas 'Pixel' Noble
5323763128 Cleanup. 2020-06-27 12:19:32 -07:00
Nicolas 'Pixel' Noble
4d9d3cf58c Getting the cube psyq example to work. 2020-06-27 00:05:49 -07:00
Nicolas 'Pixel' Noble
b965fa7b21 Fixing datastream properly. 2020-06-27 00:04:39 -07:00
Nicolas 'Pixel' Noble
b7d2cea340 Fixing symtab section info. 2020-06-26 20:12:29 -07:00
Nicolas 'Pixel' Noble
02715670c9 Adding two-pass relocation system. 2020-06-26 19:42:46 -07:00
Nicolas 'Pixel' Noble
a1831818f5 Merge remote-tracking branch 'upstream/main' into psyq-obj-parser 2020-06-26 15:54:01 -07:00
Nicolas 'Pixel' Noble
74ba417084 Linux build and fixes. 2020-06-26 15:51:53 -07:00
Nicolas Noble
0a93b24092
Merge pull request #256 from grumpycoders/gte-defines
Fixing GTE problematic defines
2020-06-25 22:25:02 -07:00
Nicolas Noble
d4cd4d9e28
Fixing GTE problematic defines
A lot of these are susceptible to collide.
2020-06-25 20:24:22 -07:00
Nicolas 'Pixel' Noble
b6bbb216ca Few fixes, and adding basic test. 2020-06-25 19:46:33 -07:00
Nicolas 'Pixel' Noble
68eb449b54 Few more relocations. 2020-06-24 23:14:10 -07:00
Nicolas 'Pixel' Noble
59e81fe082 Some more relocations. 2020-06-24 21:22:39 -07:00
Nicolas 'Pixel' Noble
1834e1ee6e Night progress towards relocations. 2020-06-24 00:02:06 -07:00
Nicolas 'Pixel' Noble
dbc83d4bf0 Some cleanup / fixes. 2020-06-23 21:19:14 -07:00
Nicolas 'Pixel' Noble
5281fb2ed5 Adding dockershell scripts. 2020-06-23 21:18:55 -07:00
Nicolas 'Pixel' Noble
a08475f264 Progress with the elf writer. 2020-06-22 23:49:41 -07:00
Nicolas 'Pixel' Noble
1af660c59c Adding display command. 2020-06-22 17:02:50 -07:00
Nicolas 'Pixel' Noble
62a3ca7926 Cleanup. 2020-06-22 00:49:13 -07:00
Nicolas 'Pixel' Noble
13bf02f183 Parsing data in memory. 2020-06-22 00:00:49 -07:00
Nicolas 'Pixel' Noble
e87eacf293 Adding psyq-obj-parser as a tool. 2020-06-21 11:06:19 -07:00
Nicolas Noble
a6edeae9b3
Merge pull request #254 from nicolasnoble/vstweaks
Trying to address out-of-heap-space problems.
2020-06-20 09:27:35 -07:00
Nicolas 'Pixel' Noble
7b0a320ea9 Trying to address out-of-heap-space problems. 2020-06-20 08:59:33 -07:00
Nicolas Noble
e651adf5de
Merge pull request #253 from nicolasnoble/rename-master
Finishing moving from master to main.
2020-06-20 08:51:03 -07:00
Nicolas 'Pixel' Noble
c4e2627c03 Finishing moving from master to main. 2020-06-20 08:34:27 -07:00
Nicolas Noble
ceea5da57c
Merge pull request #251 from nicolasnoble/more-webserver-fixes
More fixes to the webserver.
2020-06-12 15:17:07 -07:00
Nicolas 'Pixel' Noble
4f505f16fb More fixes to the webserver. 2020-06-12 14:47:21 -07:00
Nicolas 'Pixel' Noble
8799f3db27 Merge branch 'master' into mips-unit-testing 2020-06-11 20:19:03 -07:00
Nicolas Noble
36e4f0a2e1
Merge pull request #246 from nicolasnoble/event-fixes
Fixing network events a bit.
2020-06-11 13:16:48 -07:00
Nicolas "Pixel" Noble
2c1ebedb16 std::optional needs has_value. 2020-06-11 12:30:21 -07:00
Nicolas "Pixel" Noble
aec3eaf948 Tweaking runner for better error display, hopefully. 2020-06-11 09:54:14 -07:00
Nicolas 'Pixel' Noble
1b3a95da6a Merge branch 'master' into event-fixes 2020-06-10 21:58:51 -07:00
Nicolas 'Pixel' Noble
edef083e51 Merge branch 'master' into mips-unit-testing 2020-06-10 21:55:35 -07:00
Nicolas Noble
dfb1250205
Merge pull request #249 from nicolasnoble/psexe-ui-load
Supporting ps-exe from ui drag-and-drop load.
2020-06-10 21:47:32 -07:00
Nicolas Noble
3d326d72f7
Merge pull request #248 from nicolasnoble/gitgnore-better
Ignoring a few more files from pcsx-redux itself.
2020-06-10 21:46:42 -07:00
Nicolas Noble
3f56dee19e
Merge pull request #247 from nicolasnoble/ldscript-fixes
Fixing ldscripts a bit.
2020-06-10 21:44:09 -07:00
Nicolas 'Pixel' Noble
6f0de01bd4 Fixing network events a bit. 2020-06-10 21:40:36 -07:00
Nicolas Noble
56dfc335ab
Merge pull request #245 from nicolasnoble/tasks-cleanup
Cleaning up tasks.json a bit.
2020-06-10 21:30:55 -07:00
Nicolas Noble
bbe6bce72a
Merge pull request #243 from nicolasnoble/libelfin-fixes
Fixing latest libelfin crash.
2020-06-10 21:29:03 -07:00
Nicolas Noble
af0f78e9ac
Merge pull request #244 from nicolasnoble/no-cmake-please
Preventing vscode from wrecking code.
2020-06-10 21:28:09 -07:00
Nicolas 'Pixel' Noble
82efaf9e26 Starting to handle mips unit testing. 2020-06-10 17:07:11 -07:00
Nicolas 'Pixel' Noble
4ad75f8727 Supporting ps-exe from ui drag-and-drop load. 2020-06-10 17:05:35 -07:00