Commit Graph

412 Commits

Author SHA1 Message Date
Sharlotte 8149ed6202 weapon 2022-08-24 21:49:29 +09:00
Sharlotte 1d33c26e93 update gradle, fixed overflow in wave display 2022-08-18 16:27:17 +09:00
Sharlotte 7b8479c16e Merge pull request #60 from MEEPofFaith/patch-1
Out of all places to fix a crash in PM, this is not where I expected to end up.
2022-06-23 20:01:52 +09:00
MEEPofFaith babbac85bf Bruh 2022-06-22 10:20:21 -07:00
sharlottes 9030a39d59 Merge remote-tracking branch 'origin/master' 2022-06-20 18:29:06 +09:00
sharlottes 9974df2012 update mindow 2022-06-20 18:28:58 +09:00
Sharlotte 4aaf7e5c39 Merge pull request #59 from Lin-cat/master
Update bundle_zh_CN.properties
v1.5.6
2022-06-05 23:07:49 +09:00
Sharlotte 613afe3856 Update build.gradle 2022-06-05 23:07:39 +09:00
sharlottes 10188b9ebb is it releasable? 2022-06-05 23:05:03 +09:00
sharlottes a95b876b16 code clean up 2022-06-05 15:58:53 +09:00
sharlottes 7091236b4e layout cleanup 2022-06-05 01:39:15 +09:00
sharlottes c5026ffed3 fixed bar icon issue 2022-06-05 00:37:54 +09:00
sharlottes 4962e381e8 wtf 2022-06-04 18:05:33 +09:00
sharlottes 659324c172 fixed pane focus issue 2022-06-04 15:25:11 +09:00
Lin b45f945083 Update bundle_zh_CN.properties 2022-05-23 13:21:39 +08:00
sharlottes 45e7b84790 rename package 2022-05-22 23:58:18 +09:00
Sharlotte c94de34331 Merge pull request #58 from Lin-cat/master
Update bundle_zh_CN.properties
v1.5.5-tmp
2022-05-22 15:53:19 +09:00
Lin 584a110316 Merge branch 'Sharlottes:master' into master 2022-05-15 06:56:45 +08:00
sharlottes d59720feda h 2022-05-08 17:15:56 +09:00
sharlottes ee53c452b3 rename package 2022-04-24 22:25:50 +09:00
Lin 405d029ae8 Merge branch 'Sharlottes:master' into master 2022-04-24 18:29:15 +08:00
sharlottes 0bc93735c0 code cleanup with refactoring 2022-04-24 15:48:41 +09:00
sharlottes 973f5e78d1 code cleanup with refactoring 2022-04-24 15:19:23 +09:00
sharlottes 98e2af269f better ui 2022-04-23 15:05:45 +09:00
sharlottes 0d7733f5f7 fix brush offset 2022-04-23 14:02:33 +09:00
Lin c6f5d1262d Update bundle_zh_CN.properties 2022-04-23 06:10:52 +08:00
Lin 6c3b1f1a69 Merge branch 'Sharlottes:master' into master 2022-04-23 06:10:16 +08:00
sharlottes e98712d350 ui clean up 2022-04-23 00:18:50 +09:00
sharlottes b78a11cd4f team selection 2022-04-22 20:36:16 +09:00
sharlottes b4f3689b1b grid 2022-04-22 01:47:38 +09:00
Lin 117d6488fd Update bundle_zh_CN.properties 2022-04-20 06:11:08 +08:00
sharlottes 33a4a6664a should i draw brush? 2022-04-20 00:51:29 +09:00
sharlottes e0c5cdc7d1 refactoring 2022-04-20 00:18:19 +09:00
Lin 4e42abc53c Update bundle_zh_CN.properties 2022-04-19 20:09:51 +08:00
sharlottes 8cc932a647 map editor windows - edit tools 2022-04-19 19:45:00 +09:00
sharlottes de799fffd7 clean code up 2022-04-19 00:08:49 +09:00
sharlottes 81b2215c9a add ToolDisplay 2022-04-17 17:35:55 +09:00
sharlottes 78f3b2d782 clean up 2022-04-16 23:41:31 +09:00
sharlottes 21a15db1b9 also node link 2022-04-16 19:27:02 +09:00
sharlottes 4bb88c2f45 also payload driver 2022-04-16 18:52:07 +09:00
sharlottes cf59ae385d Merge remote-tracking branch 'origin/master' 2022-04-16 18:49:15 +09:00
sharlottes ac4bdc0090 i still like xelo well 2022-04-16 18:49:06 +09:00
Sharlotte 58332e55a4 Merge pull request #57 from Lin-cat/master
Update bundle_zh_CN.properties
2022-04-16 12:54:46 +09:00
sharlottes 1ce4b31a5a i don't like this 2022-04-14 18:46:39 +09:00
sharlottes 7f6f106890 clean up, bugfix 2022-04-14 18:32:56 +09:00
Lin 8116625123 Update bundle_zh_CN.properties 2022-04-14 07:10:25 +08:00
sharlottes b004db604e turret range cleaning up 2022-04-14 00:40:49 +09:00
sharlottes 040303ece4 android doesn't have iterable 2022-04-13 22:22:36 +09:00
sharlottes 12757b8f12 test2 2022-04-13 21:27:35 +09:00
sharlottes 792575ff25 test2 2022-04-13 21:20:05 +09:00