Leahnaya/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-09-30 12:26:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
848 Commits 4 Branches 0 Tags
863e1d40a46f50ea66a30fe6b68e7a2c5ceb82d2
Commit Graph

848 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Revo
863e1d40a4 Merge pull request #146 from red031000/master 
finally finish OS_reset and stop git being stupid
 2020-06-08 12:18:23 -04:00
Cleverking2003
5bd65c61af Merge branch 'master' into master 2020-06-08 17:07:26 +03:00
Revo
7594546ee9 Merge pull request #149 from mid-kid/master 
Pass down host variables
 2020-06-08 09:47:57 -04:00
mid-kid
43fc22bcac Quotes are important sometimes I guess 2020-06-08 15:03:30 +02:00
mid-kid
672325017c Pass down host variables 2020-06-08 14:57:36 +02:00
Cleverking2003
59508fe7f8 Merge branch 'master' into master 2020-06-08 15:51:55 +03:00
Cleverking2003
a9a1e08aca Merge pull request #148 from kr3nshaw/master 
Fixed knarc makefile conflict with devkitARM
 2020-06-08 15:51:28 +03:00
kr3nshaw
1dd31333cf Changed first line of knarc makefile 2020-06-08 22:42:54 +10:00
kr3nshaw
f162b8beba Changed = to := in main makefile 2020-06-08 22:29:57 +10:00
kr3nshaw
dd04f2ba09 Merge remote-tracking branch 'upstream/master' 2020-06-08 20:46:44 +10:00
kr3nshaw
9243be03ab Changed g++-9 to g++ in knarc makefile 2020-06-08 20:41:34 +10:00
kr3nshaw
a7b3fd6036 Amended knarc makefile so as not to conflict with devkitARM 2020-06-08 20:36:34 +10:00
red031000
8baf7924fc finally finish OS_reset and stop git being stupid 2020-06-07 22:35:13 +01:00
PikalaxALT
5dfe344038 Merge pull request #142 from red031000/master 
nitrogfx nclr (palette) support
 2020-06-07 16:21:48 -04:00
red031000
5f9e55a24b Merge branch 'master' of https://github.com/martmists/pokediamond 2020-06-07 21:00:20 +01:00
Cleverking2003
c5a0d49cba Merge pull request #144 from kr3nshaw/master 
Replaced narccomp with knarc
 2020-06-07 22:59:16 +03:00
kr3nshaw
19d0c085f7 Added preprocessor macros to switch experimental on and off 2020-06-08 05:54:51 +10:00
red031000
fce2c89d6e more efficient gfx.c 2020-06-07 20:34:43 +01:00
kr3nshaw
61df5c9cad Merge pull request #7 from PlatinumMaster/patch-5 
Revert .travis.yml.
 2020-06-08 05:31:08 +10:00
PlatinumMaster
6e113814ff Revert .travis.yml. 2020-06-07 15:26:42 -04:00
red031000
19f7d55504 too -> to 2020-06-07 20:24:53 +01:00
red031000
550c03c212 cleanup and address issues 2020-06-07 20:18:30 +01:00
kr3nshaw
d20e69e76f Changed filesystem to experimental/filesystem 2020-06-08 05:17:22 +10:00
kr3nshaw
4513e52798 Fixed indentation error 2020-06-08 05:09:40 +10:00
kr3nshaw
78af155b6c Readded .travis.yml 2020-06-08 05:04:18 +10:00
kr3nshaw
a6c4e1cf03 .travis.yml needs to be recommitted 2020-06-08 05:03:33 +10:00
kr3nshaw
4d7019cdaa Merge pull request #5 from PlatinumMaster/patch-3 
GCC 9.
 2020-06-08 04:52:13 +10:00
PlatinumMaster
98a0ac436c Update Makefile. 2020-06-07 14:49:52 -04:00
PlatinumMaster
3c8f606c61 Add test repository and bump to gcc9. 2020-06-07 14:48:27 -04:00
kr3nshaw
1aade2794c Merge pull request #4 from PlatinumMaster/patch-2 
Update .travis.yml.
 2020-06-08 04:42:48 +10:00
PlatinumMaster
79de470b79 Update .travis.yml 2020-06-07 14:40:46 -04:00
kr3nshaw
539a438924 Merge pull request #3 from PlatinumMaster/patch-1 
Force g++-8 usage.
 2020-06-08 04:35:55 +10:00
PlatinumMaster
7860c28c3f Force g++-8 usage. 2020-06-07 14:34:31 -04:00
red031000
36a3f6f46f cleanup 2020-06-07 19:33:50 +01:00
kr3nshaw
ff60ecd00a Merge pull request #2 from PlatinumMaster/patch-1 
Try to compile with gcc-8.
 2020-06-08 04:30:12 +10:00
PlatinumMaster
aae365a639 Update .travis.yml 2020-06-07 14:25:02 -04:00
PlatinumMaster
095ec67481 Update .travis.yml 2020-06-07 14:24:49 -04:00
PlatinumMaster
24764e2481 Change order of linked files. 2020-06-07 14:24:18 -04:00
kr3nshaw
2efa529b4d Added &gcc9 addon 2020-06-08 03:57:08 +10:00
kr3nshaw
e80bd72182 Changed GCC 9 back to GCC 8 and added fs flag 2020-06-08 03:44:31 +10:00
kr3nshaw
dda7198000 Changed GCC 8 to GCC 9 2020-06-08 03:41:19 +10:00
kr3nshaw
e6cf189c30 My turn to try and fix Travis 2020-06-08 03:26:25 +10:00
kr3nshaw
bc4f89e2ba Merge pull request #1 from PlatinumMaster/master 
Attempt to fix travis for knarc.
 2020-06-08 03:18:50 +10:00
kr3nshaw
f1bc71afe2 Merged with upstream 2020-06-08 03:16:03 +10:00
PlatinumMaster
cafc25c1fe Attempt to fix travis. 2020-06-07 13:07:05 -04:00
PlatinumMaster
0eb4920e8e Update Makefile to support g++8. 2020-06-07 13:05:55 -04:00
red031000
6bd0b1970c bit of cleanup 2020-06-07 17:34:32 +01:00
red031000
1c7bd60010 Merge branch 'master' of https://github.com/martmists/pokediamond 2020-06-07 17:28:17 +01:00
Cleverking2003
c2d3d0fb11 Merge pull request #143 from PikalaxALT/pikalax_work 
Update NARC rules; decompile growth rates
 2020-06-07 19:27:06 +03:00
kr3nshaw
d419d521b3 Added .gitignore for compiled binary 2020-06-08 02:12:10 +10:00