MirrorHub/atlas
0
0
Fork 0
mirror of https://github.com/placeAtlas/atlas.git synced 2024-11-12 21:13:11 +01:00
Code Issues Projects Releases Wiki Activity
2053 commits 3 branches 0 tags 1.7 GiB
Commit graph

2053 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alex Tsernoh
57ac93c817
Merge branch 'master' into time-travel 2022-04-07 22:35:27 +01:00
ash
97c0204026
Merge pull request #1047 from nico-abram/nowarning 
Remove double quote warning
 2022-04-07 22:32:02 +01:00
ash
0fb17c5d35
Merge branch 'master' into nowarning 2022-04-07 22:30:50 +01:00
Alex Tsernoh
0038245876
Merge pull request #1046 from Wayland-Smithy/small-feature-prio 
Make ObjectsList order small areas before overlapping larger ones on hover
 2022-04-07 22:25:55 +01:00
unknown
db86c77019 Remove double quote warning 2022-04-07 18:18:36 -03:00
Wayland-Smithy
5cc49d2fc8 Change hover display to list small areas first 2022-04-07 14:09:41 -07:00
Nicolas Abram
24b551f6ae
Merge pull request #1045 from SpiderInMyEar/cleanup 2022-04-07 18:08:43 -03:00
Nicolas Abram
508ac85031
Merge pull request #1042 from Falki-git/cleanup 2022-04-07 18:08:18 -03:00
SpiderInMyEar
2d99f8b3fa
Fixes to Omori title screen area 
Removed duplicate main entry; other submission makes it redundant.
Redrew Omocat submission's outline.
 2022-04-07 22:58:18 +02:00
Nicolas Abram
a009ca69be
Merge pull request #1044 from Sparing134/cleanup 2022-04-07 17:52:04 -03:00
Nicolas Abram
e8bad74e2e
Merge pull request #1040 from mia-cx/totalbiscuit-lulw 2022-04-07 17:50:29 -03:00
Nicolas Abram
f40091cde5
Merge pull request #1041 from mia-cx/fix-brazil 2022-04-07 17:50:11 -03:00
Sparing134
d05df65f52
trollpixia fix 2022-04-07 23:49:57 +03:00
Falki-git
0eec973023 Remove duplicate for KSP - twpo1b 2022-04-07 22:46:11 +02:00
Nicolas Abram
46fc02964f
Merge pull request #1039 from SkylaEris/cleanup 2022-04-07 17:43:06 -03:00
mia-cx
73bd545ff3 improve description & path on TotalBiscuit tribute 2022-04-07 22:41:56 +02:00
Nicolas Abram
e566930f48
Merge pull request #1033 from mia-cx/doaln-pikachu 2022-04-07 17:41:29 -03:00
Nicolas Abram
78eea6957c
Merge pull request #1032 from Querez/cleanup 2022-04-07 17:40:53 -03:00
Nicolas Abram
c2436d19b5
Merge pull request #1037 from riuneko/cleanup 2022-04-07 17:39:40 -03:00
Nicolas Abram
75ea1400eb
Merge pull request #1031 from Fincent7/cleanup 2022-04-07 17:39:25 -03:00
Fincent
82ea8c30ed
Merge branch 'cleanup' into cleanup 2022-04-07 22:38:59 +02:00
Nicolas Abram
73fbc77461
Merge pull request #1035 from mia-cx/the-eel 2022-04-07 17:38:53 -03:00
Fincent
d9abe13499
Merge branch 'cleanup' into cleanup 2022-04-07 22:38:51 +02:00
Nicolas Abram
b805eb85a6
Merge pull request #1038 from mia-cx/jack-frost-atlus 2022-04-07 17:38:34 -03:00
Fincent
adddd7d808
Merge branch 'cleanup' into cleanup 2022-04-07 22:38:30 +02:00
Nicolas Abram
2442819dfc
Merge pull request #1036 from GeoDash897/cleanup 2022-04-07 17:38:11 -03:00
SkylaEris
718dd17227
Corrected "dreamgender" entry to "aromantic" 
The flag highlighted in the entry txy11o was the aromantic flag, not the dreamgender flag as put in the entry. Also corrected definition or aromantic in entry tx8gaz. Corrected spelling of "flag" in entry tx0soi.
 2022-04-07 21:37:59 +01:00
Fincent7
6071569c10 removed duplicate entry & updated lain entries per request 2022-04-07 22:35:45 +02:00
Fincent7
5303077b80 Merge branch 'cleanup' of https://github.com/Fincent7/place-atlas into cleanup 2022-04-07 22:31:21 +02:00
Fincent7
1fd8516c0f Merge remote-tracking branch 'up/cleanup' into cleanup 2022-04-07 22:31:13 +02:00
chocomint1
cb240e35b1
Revision (twvcnn) 
Removed duplicate entry
 2022-04-07 16:25:03 -04:00
mia-cx
5149beb79c merge jack frost duplicates into best path 2022-04-07 22:24:37 +02:00
chocomint1
649f771694
Revision: DBZ (txe1lg, twmt33) 
Slightly edited descriptions and modified outlines
 2022-04-07 16:23:16 -04:00
GeoDash897
618a40b4dd Add Name to Flag of Equestria Entry 2022-04-07 16:17:28 -04:00
mia-cx
9dc4dc6026 addition to "the eel" description 2022-04-07 22:09:41 +02:00
Fincent
fd8f734572
Merge branch 'cleanup' into cleanup 2022-04-07 22:02:53 +02:00
GeoDash897
f2f9c0ab36 Update Berserk MLP entry to sound less aggressive 
While the MLP fandomw was initially annoyed by the inclusion of the
Guts picture to the Berserk mural due to feeling betrayed by the
Berserk Pixel discord, the fandom did eventually the
acceptance of the piece due to its high quality and being
a respectful tribute. I tried to make this more clear in the
description of the art.
 2022-04-07 16:01:15 -04:00
unknown
93e80dc7f9 New submissions, flair editing script 2022-04-07 17:00:30 -03:00
GeoDash897
467e71f178 Update tiny TARDIS entry to better explain MLP alliance 2022-04-07 15:53:42 -04:00
mia-cx
473cbc307d pikachu art, covered by the last doaln 2022-04-07 21:52:42 +02:00
Querez
fcf7525294
Change to twsq63 
I made a change 4 hours ago but I made a slight mistake. I wrote "the" founder instead of "a" founder. This edit is just to fix that.
 2022-04-07 21:46:33 +02:00
GeoDash897
76ac3811a3 Merge branch 'cleanup' of github.com:GeoDash897/place-atlas into cleanup 2022-04-07 15:44:39 -04:00
GeoDash897
89d045b8f6 Update Flag of Equestria Entry Description 2022-04-07 15:42:50 -04:00
Fincent7
1e031beb22 removed a duplicate entry 2022-04-07 21:33:53 +02:00
mia-cx
8fbd7e1c58 merge brazil flag entries & clean up path 2022-04-07 21:23:36 +02:00
ash
3b37c3e834
Merge pull request #1028 from placeAtlas/master 
Merge pull request #1027 from placeAtlas/cleanup
 2022-04-07 20:19:19 +01:00
ash
f25856f615
Merge pull request #1027 from placeAtlas/cleanup 
Cleanup
 2022-04-07 20:18:36 +01:00
ash
8abb24a705
Merge branch 'master' into cleanup 2022-04-07 20:18:08 +01:00
ash
50690688d8
Merge pull request #1026 from Fincent7/cleanup 
cleaning up duplicate entries
 2022-04-07 20:17:08 +01:00
ash
44c6b4fe9d
Merge pull request #1025 from mia-cx/cleanup 
Cleanup for thread <#961669126747725864>
 2022-04-07 20:16:46 +01:00