izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity
2,954 Commits 2 Branches 11 Tags
develop
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
engineer124 0350836d94 fix merge 2023-10-28 08:11:01 +11:00
engineer124 cbbd7ce4fe Merge branch 'main' into sys_math3d_bss 2023-10-28 08:06:27 +11:00
engineer124 e46a451ace merge main 2023-10-26 21:19:22 +11:00
engineer124 986e34c036 cleanup 2023-10-25 12:50:39 +11:00
engineer124 6d30630d73 Merge branch 'main' into sys_math3d_bss 2023-10-25 12:48:11 +11:00
engineer124 08035011c8 PR Review 2023-10-22 17:27:35 +11:00
engineer124 9d8554e05a Merge branch 'main' into sys_math3d_bss 2023-10-22 17:19:13 +11:00
engineer124 9c2c3f1bb8 cleanup 2023-10-22 03:35:44 +11:00
engineer124 b4626812f6 cleanup and docs 2023-10-22 03:30:02 +11:00
engineer124 fd7a96b9a1 Merge branch 'main' into sys_math3d_bss 2023-10-22 01:42:17 +11:00
engineer124 195b02c622 hotfix 2023-10-04 15:56:07 +11:00
engineer124 eb5c68eb3e merge main 2023-10-04 15:54:49 +11:00
engineer124 dbedc29429 merge master 2023-06-22 14:26:30 +10:00
engineer124 c6420cd33c merge master 2023-06-22 14:24:08 +10:00
engineer124 a01ee3c056 Merge branch 'master' into voice 2023-06-20 22:36:02 +10:00
engineer124 e0606f5cbe merge master 2023-06-20 21:55:12 +10:00
engineer124 6ef3cefb9f small cleanup 2023-06-13 12:02:48 +10:00
engineer124 db5335c42a cow voice weekeventflag 2023-06-13 11:58:13 +10:00
engineer124 721d097c10 more cleanup 2023-06-13 11:44:07 +10:00
engineer124 5194d2be8b cleanup 2023-06-13 11:32:00 +10:00
engineer124 9af1d1cb80 merge master 2023-06-13 11:12:05 +10:00
engineer124 5fc0024b72 Merge branch 'master' into parameter 2023-06-11 01:34:53 +10:00
engineer124 90e45cce37 small cleanup 2023-06-11 01:18:07 +10:00
engineer124 8746bc6e95 merge master 2023-06-11 01:03:12 +10:00
engineer124 3dd8096af5 Merge branch 'master' into parameter 2023-06-06 00:34:07 +10:00
engineer124 3de6100344 merge master 2023-06-02 18:53:29 +10:00
engineer124 d684bdc876 merge master, tatl enum 2023-05-29 18:07:41 +10:00
engineer124 25da52d30b OK 2023-05-26 19:13:23 +10:00
engineer124 8c7fb93844 WIP 2023-05-26 18:50:27 +10:00
engineer124 f0aa038426 match Math3D_CylVsLineSeg 2023-05-26 17:52:38 +10:00
engineer124 0ab669a539 merge master 2023-05-13 19:26:44 +10:00
engineer124 902992a32c Merge branch 'master' into parameter 2023-03-01 18:10:33 -05:00
engineer124 46fb761890 cleanup desync 2023-01-17 14:26:10 -05:00
engineer124 8bf3a0d8f0 merge master 2023-01-17 14:19:42 -05:00
engineer124 43e9eb2c4e cleanup picto, sync with play 2022-11-23 11:57:49 -05:00
engineer124 e6d93a7155 Merge branch 'master' into parameter 2022-11-23 11:27:26 -05:00
engineer124 ea32607658 cleanup 2022-11-20 20:59:01 -05:00
engineer124 5dc523d8af cleanup 2022-11-20 19:15:48 -05:00
engineer124 3959a5c1d0 merge master 2022-11-20 19:03:20 -05:00
engineer124 69a2db7eec merge master 2022-11-20 13:44:27 -05:00
engineer124 10b0755676 sync to PRs 2022-11-20 13:35:22 -05:00
engineer124 c74e89857d cleanup 2022-11-14 14:38:30 -05:00
engineer124 6e7f0f2cd4 Merge branch 'master' into parameter 2022-11-14 14:25:40 -05:00
engineer124 962428840d merge master 2022-11-08 17:05:34 -05:00
engineer124 9a5444ca33 merge master 2022-10-22 12:02:01 -04:00
engineer124 f7bdec8aaf merge master 2022-10-18 16:53:13 -04:00
engineer124 58e89b3769 minigame docs 2022-10-18 16:47:12 -04:00
engineer124 737a50c4da merge master 2022-10-16 16:05:20 -04:00
engineer124 8b2048280e Merge branch 'master' into parameter 2022-10-12 15:08:49 -04:00
engineer124 612819cbbc regs, cleanup 2022-10-08 14:06:57 -04:00
engineer124 2d64b28e8e pictograph docs 2022-10-06 15:07:26 -04:00
engineer124 abd997d27f merge master 2022-10-05 13:54:29 -04:00
engineer124 f85afc978f more docs 2022-10-03 09:37:48 -04:00
engineer124 bdb2001b05 time, button, misc docs 2022-10-02 22:29:01 -04:00
engineer124 ddbc03fed3 merge master 2022-10-02 19:56:28 -04:00
engineer124 cd05be7049 some docs 2022-10-02 09:18:23 -04:00
engineer124 c0b227ff17 more docs 2022-10-01 15:29:45 -04:00
engineer124 78ec6752b8 update button comments 2022-10-01 15:12:49 -04:00
engineer124 049559804a begin vtx docs 2022-10-01 14:33:12 -04:00
engineer124 8e65c29040 z64interface.h, cleanup 2022-10-01 11:50:19 -04:00
engineer124 21c3e39d22 merge master, story docs 2022-10-01 11:20:36 -04:00
engineer124 2ce9ebdd5d small docs 2022-09-29 22:25:24 -04:00
engineer124 dcf8af218e add comment 2022-09-29 21:32:11 -04:00
engineer124 9bf6bedd75 misc docs 2022-09-29 21:13:54 -04:00
engineer124 615d945bf9 minigame docs 2022-09-29 15:11:03 -04:00
engineer124 16ea0c48b3 merge master 2022-09-29 09:05:14 -04:00
engineer124 b029ad4a45 comment 2022-09-29 08:58:29 -04:00
engineer124 864f3037a4 merge master 2022-09-28 19:40:44 -04:00
engineer124 ee1773c7e6 merge master 2022-09-25 18:35:14 -04:00
engineer124 29693f68a1 more cleanup and sync 2022-09-14 18:55:27 -04:00
engineer124 35c4f2ee65 cleanup 2022-09-14 18:45:43 -04:00
engineer124 00766775ed fix some merge, still bss issues 2022-09-14 17:13:53 -04:00
engineer124 2acf4283b8 Merge branch 'master' into parameter 2022-09-14 14:42:54 -04:00
engineer124 0ed70ec465 restrictions 2022-08-31 12:18:14 -04:00
engineer124 c330a7e015 sync with timers PR 2022-08-26 13:04:45 -04:00
engineer124 dc7c5ec634 more docs 2022-08-22 13:16:32 -04:00
engineer124 c3d51994b3 gfx functions first attempt 2022-08-22 12:53:04 -04:00
engineer124 85df65eb17 fix bss 2022-08-22 12:45:23 -04:00
engineer124 075a0c9d71 Merge branch 'master' into parameter 2022-08-16 00:31:52 -04:00
engineer124 e78bbc6566 more timer docs 2022-08-16 00:31:08 -04:00
engineer124 8615f46250 lots of timer docs 2022-08-15 23:25:25 -04:00
engineer124 6292de0b3e merge master 2022-08-15 18:40:51 -04:00
engineer124 48e1537905 docs and cleanup 2022-08-11 21:16:56 -04:00
engineer124 c3ac3fc4b8 match Interface_DrawTimers 2022-08-11 20:52:33 -04:00
engineer124 d110947d43 merge master 2022-08-11 18:44:36 -04:00
engineer124 bde57967b6 Merge branch 'master' into parameter 2022-07-24 10:31:51 +10:00
engineer124 58d545c423 Fix bss 2022-07-24 09:45:43 +10:00
engineer124 03947a3ccb Merge branch 'master' into voice 2022-07-24 09:43:24 +10:00
engineer124 dc950a93ea fix bss 2022-07-23 00:52:17 +10:00
engineer124 b2a9c40b30 Merge branch 'master' into voice 2022-07-23 00:49:56 +10:00
engineer124 7cc7f8bf6e some three day clock docs 2022-07-19 04:10:02 +10:00
engineer124 a3f2655594 Begin timer docs 2022-07-14 13:12:03 +10:00
engineer124 74de44b357 Small update 2022-07-14 05:45:55 +10:00
engineer124 3a27f65cdd Document hud mode 2022-07-14 05:29:39 +10:00
engineer124 91dd5910c2 Merge branch 'master' into parameter 2022-07-13 01:49:15 +10:00
engineer124 a565bcf522 merge prep 2022-07-13 01:22:22 +10:00
engineer124 4e6a6f2dfa Merge branch 'master' into voice 2022-06-28 09:49:03 +10:00
engineer124 d1947c0f1b cleanup 2022-06-28 09:48:27 +10:00
engineer124 f8e57470b2 Merge branch 'master' into parameter 2022-06-28 09:20:36 +10:00
engineer124 bea9c0341e Restore DW with a match 2022-06-21 03:08:57 +10:00