Commit graph

196 commits

Author SHA1 Message Date
Wolf
8b12bed403 Merge branch 'main' into 'main'
Main

See merge request Wolf/do-disciplinary-committee-members!11
2025-05-12 21:10:24 +00:00
2dfd2c62c4 Title Logo image translations (iltrof) 2025-05-12 15:35:53 -05:00
Maou
7c4ffdb304 polished images 2025-05-12 20:52:00 +01:00
7f631c6014 forgot to polish these earlier (HUD images) 2025-05-12 12:22:23 -05:00
Maou
d8235d94d8 Merge branch 'main' of https://gitgud.io/Wolf/do-disciplinary-committee-members 2025-05-12 17:46:53 +01:00
Maou
22322a0edd and th 2025-05-12 17:42:52 +01:00
Wolf
a19134a82d Merge branch 'main' into 'main'
Main

See merge request Wolf/do-disciplinary-committee-members!10
2025-05-12 15:52:03 +00:00
8a746f37b8 disciplinary to public morals committee (image edits) 2025-05-12 10:46:03 -05:00
06d9b054fa Merge branch 'main' into 'main'
what do succubi dream of?

See merge request onms/do-disciplinary-committee-members!3
2025-05-12 08:50:01 -05:00
Maou
295faa91cf reeeee 2025-05-12 13:34:52 +01:00
Maou
b82adf34e7 get ur fixes 2025-05-12 13:18:34 +01:00
Maou
a90f39d8b7 fiii 2025-05-12 12:09:51 +01:00
Maou
c3fbf4d73c fixing 2025-05-12 09:11:45 +01:00
Maou
48cce3ae5a bug report fixes 2025-05-12 08:32:40 +01:00
Maou
ca495e953d red light 2025-05-12 01:56:48 +01:00
Wolf
1faa9a755f Merge branch 'main' into 'main'
Overflow, name consistency and some text formatting fixes

See merge request Wolf/do-disciplinary-committee-members!9
2025-05-12 00:01:37 +00:00
DogePrime
98f00b7158 Some name consistency fixes 2025-05-11 22:29:22 +00:00
DogePrime
edfd5d7cb4 Overflow fixes, Shrine shrin text formatting, some phrasing 2025-05-11 20:00:44 +00:00
Wolf
ce85f692ab Merge branch 'main' into 'main'
Change to Public Morals

See merge request Wolf/do-disciplinary-committee-members!8
2025-05-11 16:01:42 +00:00
Maou
5e3a91524a zzzz 2025-05-11 16:57:07 +01:00
Maou
cfb49451da iiii 2025-05-11 16:35:39 +01:00
DogePrime
8b8d969ae6 Reverts items changes 2025-05-11 15:25:01 +00:00
Maou
8f52229201 testing 2025-05-11 16:22:01 +01:00
Maou
b3a3e9c0ea hmm 2025-05-11 16:18:05 +01:00
DogePrime
a9983273f8 Added back changed that were reverted 2025-05-11 14:47:51 +00:00
DogePrime
4a08b4da08 Change to Public Morals 2025-05-11 14:12:50 +00:00
Wolf
930fb9890a Merge branch 'main' into 'main'
Game title fix

See merge request Wolf/do-disciplinary-committee-members!7
2025-05-11 13:03:01 +00:00
DogePrime
f2d230269d Merge branch 'main' into 'main'
Wolf/Doge edits + my edits

See merge request DogePrime/do-disciplinary-committee-members!3
2025-05-11 12:50:00 +00:00
DogePrime
8e6d884504 Game title translation and fix 2025-05-11 12:48:14 +00:00
Wolf
bddb8f9888 Merge branch 'main' into 'main'
Wolf/Doge edits + my edits

See merge request Wolf/do-disciplinary-committee-members!6
2025-05-11 11:27:14 +00:00
d6d2dfe849 fixed some code in the intro for instant line displays 2025-05-11 05:27:36 -05:00
103621464c fixed line spacing for all Armors (CE ones as well) 2025-05-11 05:27:02 -05:00
037ea62e7a made all Skills and Passives look neat 2025-05-11 05:26:06 -05:00
dd93c8d467 smaller fixes (similar) 2025-05-11 05:25:34 -05:00
a73032cac1 Merge branch 'main' into 'main'
i believe this works

See merge request onms/do-disciplinary-committee-members!1
2025-05-11 00:45:20 -05:00
Wolf
2cce6ea6c1 Merge branch 'main' into 'main'
Reformatted dragon shrine text to be less all over the place

See merge request Wolf/do-disciplinary-committee-members!5
2025-05-11 05:38:55 +00:00
DogePrime
be04540609 Update 2 files
- /www/data/CommonEvents.json
- /www/data/Items.json
2025-05-11 05:35:46 +00:00
DogePrime
62a05df61b tweak 2025-05-11 05:26:45 +00:00
DogePrime
b3fc8d5d0b Reformatted dragon shrine text to be less all over the place 2025-05-11 04:05:50 +00:00
DogePrime
ccf581c1bd Merge branch 'main' into 'main'
go get them

See merge request DogePrime/do-disciplinary-committee-members!2
2025-05-11 02:07:06 +00:00
Maou
ec0c6a2c77 fixed the map pop and couple new line 2025-05-11 02:58:38 +01:00
Maou
f8468e2b58 Merge branch 'main' of https://gitgud.io/Wolf/do-disciplinary-committee-members 2025-05-11 00:51:09 +01:00
Maou
c02b679a3a the hell why didnt the F commit 2025-05-11 00:50:34 +01:00
Wolf
024c7077db Merge branch 'main' into 'main'
Update to 1.06

See merge request Wolf/do-disciplinary-committee-members!4
2025-05-10 23:47:24 +00:00
DogePrime
48fcf1f034 Update to 1.06 2025-05-10 23:30:41 +00:00
DogePrime
f0c8f27e36 Merge branch 'main' into 'main'
get up to date

See merge request DogePrime/do-disciplinary-committee-members!1
2025-05-10 23:07:52 +00:00
Maou
01483813ff missing a \\F 2025-05-10 23:55:43 +01:00
Maou
3d5dc9c574 Lineeeeeees 2025-05-10 19:45:15 +01:00
Maou
4901513153 Capitalize , 1st row of gallery, consistences. 2025-05-10 16:25:48 +01:00
Maou
602875e302 Maka Pinpin 2025-05-10 11:16:53 +01:00