Merge branch 'next' of github.com:erkin/ponysay into next

This commit is contained in:
Mattias Andrée 2012-11-21 00:17:17 +01:00
commit db5d34d50a
19 changed files with 251 additions and 33 deletions

View file

@ -1,9 +1,9 @@
Version 3.0 Version 3.0
New ponies: beautybrass, cloudchaser, flitter, mrbreezy, rumble, shiningarmorcrystal, New ponies: beautybrass, cloudchaser, flitter, mrbreezy, orangebird, orangefrog,
sombra, spikecrystal, twinkleshine pinkiecrazyface, rumble, shiningarmorcrystal, sombra, spikecrystal, twinkleshine
New extraponies: pizzapony New extraponies: pipsqueak (without pirate suit), pizzapony
Renamed option -F to +f and option --F to ++f. Renamed option -F to +f and option --F to ++f.

View file

@ -693,3 +693,6 @@ http://images1.wikia.nocookie.net/__cb20110329021538/mlp/images/thumb/c/ce/RD%2C
Wild life: Wild life:
http://mlp.wikia.com/wiki/Wildlife http://mlp.wikia.com/wiki/Wildlife
Orangebirdy
Orangefrogy

View file

@ -0,0 +1,38 @@
$$$
APPEARANCE: s2e4m00s55
BASED ON: pipsqueaks
COAT: brown
EYE: white
FREE: no
GROUP: colt
KIND: earth
MANE: brown
MEDIA: TV series
NAME: pipsqueak
OTHER NAMES: pip
SOURCE: desktop ponies
WIDTH: 33
HEIGHT: 20
$$$
$balloon9$
$\$
$\$
$\$
   
     
        
     
       
            
       
          
       
      
      
   
        
        
        
  

View file

@ -5,7 +5,7 @@ FREE: yes
GROUP: stallion GROUP: stallion
GROUP NAME: mane-63 GROUP NAME: mane-63
KIND: pegasus KIND: pegasus
MANE: red, orange, yellow, green, blue MANE: rainbow
NAME: rainbow blitz NAME: rainbow blitz
WIDTH: 43 WIDTH: 43
HEIGHT: 26 HEIGHT: 26

View file

@ -2914,10 +2914,11 @@ sequences.
@heading Version 3.0 @heading Version 3.0
@itemize @bullet @itemize @bullet
@item @item
New ponies: @file{beautybrass}, @file{cloudchaser}, @file{flitter}, @file{mrbreezy}, @file{rumble}, New ponies: @file{beautybrass}, @file{cloudchaser}, @file{flitter}, @file{mrbreezy}, @file{orangebird},
@file{shiningarmorcrystal}, @file{sombra}, @file{spikecrystal}, @file{twinkleshine} @file{orangefrog}, @file{pinkiecrazyface}, @file{rumble}, @file{shiningarmorcrystal}, @file{sombra},
@file{spikecrystal}, @file{twinkleshine}
@item @item
New extraponies: @file{pizzapony} New extraponies: @file{pipsqueak}, @file{pizzapony}
@item @item
Renamed option @option{-F} to @option{+f} and option @option{--F} to @option{++f}. Renamed option @option{-F} to @option{+f} and option @option{--F} to @option{++f}.
@item @item

45
ponies/orangebird.pony Normal file
View file

@ -0,0 +1,45 @@
$$$
APPEARANCE: S3c3m00s33
COAT: orange
FREE: yes
GROUP: bird, fruit
GROUP NAME: wildlife
KIND: animal, item
MANE: blue
MEDIA: TV series
NAME: orangebirdy
OTHER NAMES: orangebird
SOURCE: [jristz]
WIDTH: 44
HEIGHT: 28
$$$
$balloon28$
$\$
$\$
$\$
 
     
        
           
           
         
            
         
        
        
       
         
       
    
     
      
         
      
    
   
   
  
  
 

49
ponies/orangefrog.pony Normal file
View file

@ -0,0 +1,49 @@
$$$
APPEARANCE: s3e3m3s35
COAT: orange
FREE: yes
GROUP: frog, orange
GROUP NAME: wildlife
KIND: animal, item
MEDIA: TV series
NAME: orangefrogy
OTHER NAMES: orangefrog
SOURCE: [jristz]
WIDTH: 58
HEIGHT: 33
$$$
$balloon19$
$\$
$\$
$\$
 
     
      
       
   
    
  
      
       
        
       
       
          
          
        
          
          
    
       
       
          
           
          
           
          
           
        
      
 

View file

@ -0,0 +1,65 @@
$$$
APPEARANCE: s1c1m6s59
BASED ON: pinkie
COAT: pink
EYE: blue
FREE: no
GROUP: mare
GROUP NAME: mane
KIND: earth
MANE: pink
MEDIA: TV series
NAME: pinkie pie
OTHER NAMES: pinkie, pinkamina diane pie
SOURCE: desktop ponies
WIDTH: 91
HEIGHT: 58
$$$
$balloon53$
$\$
$\$
$\$
  
     
        
         
             
             
               
           
               
              
           
         
           
                 
                  
                 
                   
                
                  
                 
                   
                  
               
            
           
             
                
                 
               
                
               
                
               
             
              
            
        
        
           
           
         
         

View file

@ -1,4 +1,19 @@
$$$ $$$
APPEARANCE: s2e4m00s55
COAT: brown
EYE: white
FREE: no
GROUP: colt
KIND: earth
MANE: brown
MEDIA: TV series
NAME: pipsqueak
OTHER NAMES: pip
SOURCE: desktop ponies
WIDTH: 33
HEIGHT: 21
$$$ $$$
$balloon9$ $balloon9$
$\$ $\$

View file

@ -6,7 +6,7 @@ FREE: no
GROUP: mare GROUP: mare
GROUP NAME: mane GROUP NAME: mane
KIND: pegasus KIND: pegasus
MANE: red, orange, yellow, green, blue, purple MANE: rainbows
MEDIA: TV series MEDIA: TV series
NAME: rainbow dash NAME: rainbow dash
OTHER NAMES: rainbow, dash, dashie OTHER NAMES: rainbow, dash, dashie

View file

@ -7,13 +7,13 @@ FREE: no
GROUP: mare GROUP: mare
GROUP NAME: mane GROUP NAME: mane
KIND: pegasus KIND: pegasus
MANE: red, orange, yellow, green, blue, purple MANE: rainbow
MEDIA: TV series MEDIA: TV series
NAME: rainbow dash NAME: rainbow dash
OTHER NAMES: rainbow, dash, dashie OTHER NAMES: rainbow, dash, dashie
SOURCE: desktop ponies SOURCE: desktop ponies
WIDTH: 40 WIDTH: 51
HEIGHT: 22 HEIGHT: 33
$$$ $$$

View file

@ -7,13 +7,13 @@ FREE: no
GROUP: mare GROUP: mare
GROUP NAME: mane GROUP NAME: mane
KIND: pegasus KIND: pegasus
MANE: red, orange, yellow, green, blue, purple MANE: rainbow
MEDIA: TV series MEDIA: TV series
NAME: rainbow dash NAME: rainbow dash
OTHER NAMES: rainbow, dash, dashie OTHER NAMES: rainbow, dash, dashie
SOURCE: desktop ponies SOURCE: desktop ponies
WIDTH: 40 WIDTH: 53
HEIGHT: 22 HEIGHT: 19
$$$ $$$

View file

@ -7,13 +7,13 @@ FREE: no
GROUP: mare GROUP: mare
GROUP NAME: mane GROUP NAME: mane
KIND: pegasus KIND: pegasus
MANE: red, orange, yellow, green, blue, purple MANE: rainbow
MEDIA: TV series MEDIA: TV series
NAME: rainbow dash NAME: rainbow dash
OTHER NAMES: rainbow, dash, dashie OTHER NAMES: rainbow, dash, dashie
SOURCE: desktop ponies SOURCE: desktop ponies
WIDTH: 40 WIDTH: 58
HEIGHT: 22 HEIGHT: 25
$$$ $$$

View file

@ -7,13 +7,13 @@ FREE: no
GROUP: mare GROUP: mare
GROUP NAME: mane GROUP NAME: mane
KIND: pegasus KIND: pegasus
MANE: red, orange, yellow, green, blue, purple MANE: rainbow
MEDIA: TV series MEDIA: TV series
NAME: rainbow dash NAME: rainbow dash
OTHER NAMES: rainbow, dash, dashie OTHER NAMES: rainbow, dash, dashie
SOURCE: desktop ponies SOURCE: desktop ponies
WIDTH: 40 WIDTH: 54
HEIGHT: 22 HEIGHT: 34
$$$ $$$

View file

@ -7,13 +7,13 @@ FREE: no
GROUP: mare GROUP: mare
GROUP NAME: mane GROUP NAME: mane
KIND: pegasus KIND: pegasus
MANE: red, orange, yellow, green, blue, purple MANE: rainbow
MEDIA: TV series MEDIA: TV series
NAME: rainbow dash NAME: rainbow dash
OTHER NAMES: rainbow, dash, dashie OTHER NAMES: rainbow, dash, dashie
SOURCE: desktop ponies SOURCE: desktop ponies
WIDTH: 40 WIDTH: 48
HEIGHT: 22 HEIGHT: 25
$$$ $$$

View file

@ -5,15 +5,15 @@ COAT: blue
EYE: purple EYE: purple
FREE: no FREE: no
GROUP: mare GROUP: mare
GROUP NAME: mane GROUP NAME: mane, shadowbolts
KIND: pegasus KIND: pegasus
MANE: red, orange, yellow, green, blue, purple MANE: rainbow
MEDIA: TV series MEDIA: TV series
NAME: rainbow dash NAME: rainbow dash
OTHER NAMES: rainbow, dash, dashie OTHER NAMES: rainbow, dash, dashie
SOURCE: desktop ponies SOURCE: desktop ponies
WIDTH: 40 WIDTH: 52
HEIGHT: 22 HEIGHT: 25
$$$ $$$

View file

@ -7,13 +7,13 @@ FREE: no
GROUP: mare GROUP: mare
GROUP NAME: mane GROUP NAME: mane
KIND: pegasus KIND: pegasus
MANE: red, orange, yellow, green, blue, purple MANE: rainbow
MEDIA: TV series MEDIA: TV series
NAME: rainbow dash NAME: rainbow dash
OTHER NAMES: rainbow, dash, dashie OTHER NAMES: rainbow, dash, dashie
SOURCE: desktop ponies SOURCE: desktop ponies
WIDTH: 40 WIDTH: 53
HEIGHT: 22 HEIGHT: 21
$$$ $$$

View file

@ -1,4 +1,4 @@
And into her own reflection she stared, eeh, And into her own reflection she stared,
yearning for one whose reflection she shared, eeh, yearning for one whose reflection she shared,
and... solemnly sweared not to be scared, and... solemnly sweared not to be scared,
at the prospect of being doubly mared! at the prospect of being doubly mared!

View file

@ -114,6 +114,8 @@ noteworthy+blues
octavia octavia
opal opal
orange orange
orangebird
orangefrog
owl+owlowiscious owl+owlowiscious
parasprite parasprite
peppermoon peppermoon
@ -129,7 +131,7 @@ pinacolada
pinkamina pinkamina
pinkie+pinkiecannonfront+pinkiecannon+pinkiebounce+pinkiecannonhappy+pinkiegala+pinkiechicken+pinkiehugfluttershy+pinkiegummy+pinkietongue+pinkiesilly pinkie+pinkiecannonfront+pinkiecannon+pinkiebounce+pinkiecannonhappy+pinkiegala+pinkiechicken+pinkiehugfluttershy+pinkiegummy+pinkietongue+pinkiesilly
pinkie+pinkiepartycannon+pinkieprincess+pinkiehugsfluttershy+pinkiewhoops+oinkoinkoink+pinkiewhoopsout+pinkiewhoopseat+fillypinkie+fillypinkiecurly+pinkieoink pinkie+pinkiepartycannon+pinkieprincess+pinkiehugsfluttershy+pinkiewhoops+oinkoinkoink+pinkiewhoopsout+pinkiewhoopseat+fillypinkie+fillypinkiecurly+pinkieoink
pinkie+pinkiegummydisguise+pinkacopter+pinkiefly+pinkieparade+pinkieumbrellahat+pinkieumbrelahatfear pinkie+pinkiegummydisguise+pinkacopter+pinkiefly+pinkieparade+pinkieumbrellahat+pinkieumbrelahatfear+pinkiecrazyface
pipsqueak pipsqueak
pokey+pokeypierce pokey+pokeypierce
ponet ponet