plus

54

--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -180,8 +180,17 @@ public BungeeCord() throws IOException
             bundle = ResourceBundle.getBundle( "messages", Locale.ENGLISH );
         }
 
-        Log.setOutput( new PrintStream( ByteStreams.nullOutputStream() ) ); // TODO: Bug JLine
-
+        // This is a workaround for quite possibly the weirdest bug I have ever encountered in my life!
+        // When jansi attempts to extract its natives, by default it tries to extract a specific version,
+        // using the loading class's implementation version. Normally this works completely fine,
+        // however when on Windows certain characters such as - and : can trigger special behaviour.
+        // Furthermore this behaviour only occurs in specific combinations due to the parsing done by jansi.
+        // For example test-test works fine, but test-test-test does not! In order to avoid this all together but
+        // still keep our versions the same as they were, we set the override property to the essentially garbage version
+        // BungeeCord. This version is only used when extracting the libraries to their temp folder.
+        System.setProperty( "library.jansi.version", "BungeeCord" );
+
+        AnsiConsole.systemInstall();
         consoleReader = new ConsoleReader();
         consoleReader.setExpandEvents( false );
 
@@ -189,12 +198,6 @@ public BungeeCord() throws IOException
         System.setErr( new PrintStream( new LoggingOutputStream( logger, Level.SEVERE ), true ) );
         System.setOut( new PrintStream( new LoggingOutputStream( logger, Level.INFO ), true ) );
 
-        if ( consoleReader.getTerminal() instanceof UnsupportedTerminal )
-        {
-            logger.info( "Unable to initialize fancy terminal. To fix this on Windows, install the correct Microsoft Visual C++ 2008 Runtime" );
-            logger.info( "NOTE: This error is non crucial, and BungeeCord will still function correctly! Do not bug the author about it unless you are still unable to get it working" );
-        }
-
         if ( NativeCipher.load() )
         {
             logger.info( "Using OpenSSL based native cipher." );
plus

3

--- a/RE-Chess-AI/src/chess/Space.java
+++ b/RE-Chess-AI/src/chess/Space.java
@@ -2,6 +2,7 @@
  * 
  */
 package chess;
+import chess.Piece;
 
 /**
  * Class to create a space on a chess board.
@@ -9,7 +10,7 @@
  */
 public class Space {
 	
-	char piece;
+	Piece piece;
 	int whiteDefenseValue, blackDefenseValue;
 	
 	/**
plus

116

--- a/lib/recipes.js
+++ b/lib/recipes.js
@@ -202,7 +202,7 @@ module.exports = function recipes(proto) {
       function normalizeTimemarks(next) {
         config.timemarks = config.timemarks.map(function(mark) {
           return utils.timemarkToSeconds(mark);
-        }).sort();
+        }).sort(function(a, b) { return a - b; });
 
         next();
       },
plus

49

--- a/src/ProxyManager/Configuration.php
+++ b/src/ProxyManager/Configuration.php
@@ -83,25 +83,6 @@ class Configuration
     protected $classSignatureGenerator;
 
     /**
-     * @deprecated deprecated since version 0.5
-     * @codeCoverageIgnore
-     */
-    public function setAutoGenerateProxies()
-    {
-    }
-
-    /**
-     * @return bool
-     *
-     * @deprecated deprecated since version 0.5
-     * @codeCoverageIgnore
-     */
-    public function doesAutoGenerateProxies()
-    {
-        return true;
-    }
-
-    /**
      * @param AutoloaderInterface $proxyAutoloader
      */
     public function setProxyAutoloader(AutoloaderInterface $proxyAutoloader)
plus

299

--- a/src/features/move-columns/js/column-movable.js
+++ b/src/features/move-columns/js/column-movable.js
@@ -117,7 +117,7 @@
         var findPositionForRenderIndex = function (index) {
           var position = index;
           for (var i = 0; i <= position; i++) {
-            if (angular.isDefined(columns[i]) && angular.isDefined(columns[i].colDef.visible) && columns[i].colDef.visible === false) {
+            if (angular.isDefined(columns[i]) && ((angular.isDefined(columns[i].colDef.visible) && columns[i].colDef.visible === false) || columns[i].isRowHeader === true)) {
               position++;
             }
           }
@@ -255,7 +255,7 @@
 
                       //Cloning header cell and appending to current header cell.
                       movingElm = $elm.clone();
-                      $elm.append(movingElm);
+                      $elm.parent().append(movingElm);
 
                       //Left of cloned element should be aligned to original header cell.
                       movingElm.addClass('movingColumn');
@@ -269,9 +269,6 @@
                         movingElementStyles.width = reducedWidth + 'px';
                       }
                       movingElm.css(movingElementStyles);
-
-                      //Binding the mouseup event handler
-                      $document.on('mouseup', mouseUpHandler);
                     };
 
                     var moveElement = function(changeValue) {
@@ -295,8 +292,8 @@
                         movingElm.css({visibility: 'visible', 'left': newElementLeft + 'px'});
                       }
                       else {
-                        changeValue *= 5;
-                        uiGridCtrl.fireScrollingEvent({ x: { pixels: changeValue * 2.5} });
+                        changeValue *= 6;
+                        uiGridCtrl.fireScrollingEvent({ x: { pixels: changeValue * 4} });
                       }
                       totalMouseMovement += changeValue;
 
@@ -319,11 +316,14 @@
                       }
                     };
 
-                    // On scope destroy, remove the mouse event handlers from the document body
+/*
+//Commenting these lines as they are creating trouble with column moving when grid has huge scroll
+ // On scope destroy, remove the mouse event handlers from the document body
                     $scope.$on('$destroy', function () {
                       $document.off('mousemove', mouseMoveHandler);
                       $document.off('mouseup', mouseUpHandler);
                     });
+*/
                     $document.on('mousemove', mouseMoveHandler);
 
                     var mouseUpHandler = function (evt) {
@@ -415,6 +415,8 @@
                       });
                     };
 
+                    //Binding the mouseup event handler
+                    $document.on('mouseup', mouseUpHandler);
                   }
                 };
                 $elm.on('mousedown', mouseDownHandler);
plus

3

--- a/lib/ship.js
+++ b/lib/ship.js
@@ -27,12 +27,24 @@
   };
 
   Ship.prototype.fireBullet = function() {
-    var posx = this.pos[0] + this.radius;
-    var posy = this.pos[1] + this.radius;
-    var velx = this.vel[0] + 1;
-    var vely = this.vel[1] + 1;
-    var bullet = new Asteroids.Bullet([posx, posy], [velx, vely], this.game);
+    var posx = this.pos[0] + 10;
+    var posy = this.pos[1] + 10;
+    var bullet = new Asteroids.Bullet([posx, posy], this.findBulletVel(), this.game);
     this.game.bullets.push(bullet);
   }
+
+  Ship.prototype.findBulletVel = function() {
+    var newVel = [0,0]
+
+    var norm = Math.sqrt(Math.pow(this.vel[0], 2) + Math.pow(this.vel[1], 2))
+    newVel[0] = this.vel[0]/norm+this.vel[0]
+    newVel[1] = this.vel[1]/norm+this.vel[1]
+
+    if(this.vel[0] === 0 && this.vel[1] === 0){
+      newVel = [0, 1.4]
+    }
+    return newVel
+  }
+
   
 })();
\ No newline at end of file
plus

19

--- a/options.c
+++ b/options.c
@@ -249,8 +249,8 @@ static optionDescription LongOptionDescription [] = {
  {1,"       Guess the language of input file more eagerly: "},
  {1,"       (but taking longer time for guessing)"},
  {1,"       o shebang even the input file is not executable,"},
- {1,"       o emacs mode specificatoin at the beginning and end of input file, and"},
- {1,"       o vim syntax specificatoin at the end of input file."},
+ {1,"       o emacs mode specification at the beginning and end of input file, and"},
+ {1,"       o vim syntax specification at the end of input file."},
  {0,"  --format=level"},
 #if DEFAULT_FILE_FORMAT == 1
  {0,"       Force output of specified tag file format [1]."},
plus

5

--- a/plink_common.h
+++ b/plink_common.h
@@ -15,7 +15,7 @@
 
 // Uncomment this to prevent all unstable features from being accessible from
 // the command line.
-#define STABLE_BUILD
+// #define STABLE_BUILD
 
 #define PROG_NAME_STR "plink"
 #define PROG_NAME_CAPS "PLINK"
plus

27

--- a/radio/src/tests/lcd.cpp
+++ b/radio/src/tests/lcd.cpp
@@ -210,6 +210,13 @@ TEST(Lcd, Smlsize)
   lcd_putsAtt(10, 22, "TESTgy,", SMLSIZE|INVERS);
   lcd_filled_rect(8, 40, 100, 20);
   lcd_putsAtt(10, 42, "TESTgy,", SMLSIZE);
+
+  bool invert = false;
+  for(int i=0; i<3; i++) {
+    lcd_putsAtt(40+(4*i), 0+(4*i), "ABC", SMLSIZE|(invert?INVERS:0));  
+    invert = !invert;
+  }
+
   EXPECT_TRUE(checkScreenshot("smlsize"));
 }
 
@@ -220,6 +227,13 @@ TEST(Lcd, Stdsize)
   lcd_putsAtt(10, 22, "TEST", INVERS);
   lcd_filled_rect(8, 40, 100, 20);
   lcd_putsAtt(10, 42, "TEST", 0);
+
+  bool invert = false;
+  for(int i=0; i<3; i++) {
+    lcd_putsAtt(40+(4*i), 0+(4*i), "ABC", (invert?INVERS:0));  
+    invert = !invert;
+  }
+
   EXPECT_TRUE(checkScreenshot("stdsize"));
 }
 
@@ -230,6 +244,13 @@ TEST(Lcd, Midsize)
   lcd_putsAtt(10, 22, "TEST", MIDSIZE|INVERS);
   lcd_filled_rect(8, 40, 100, 20);
   lcd_putsAtt(10, 42, "TEST", MIDSIZE);
+
+  bool invert = false;
+  for(int i=0; i<3; i++) {
+    lcd_putsAtt(40+(4*i), 0+(4*i), "ABC", MIDSIZE|(invert?INVERS:0));  
+    invert = !invert;
+  }
+
   EXPECT_TRUE(checkScreenshot("midsize"));
 }
 
@@ -240,6 +261,13 @@ TEST(Lcd, Dblsize)
   lcd_putsAtt(42, 10, "TST", DBLSIZE|INVERS);
   lcd_filled_rect(80, 8, 46, 24);
   lcd_putsAtt(82, 10, "TST", DBLSIZE);
+
+  bool invert = false;
+  for(int i=0; i<3; i++) {
+    lcd_putsAtt(10+(4*i), 30+(4*i), "ABC", DBLSIZE|(invert?INVERS:0));  
+    invert = !invert;
+  }
+
   EXPECT_TRUE(checkScreenshot("dblsize"));
 }
 #endif
plus

4

--- a/pgmpy/factors/Factor.py
+++ b/pgmpy/factors/Factor.py
@@ -503,8 +503,8 @@ def factor_product(*args):
     --------
     factor_divide
     """
-    # if not all(isinstance(phi, Factor) for phi in args):
-    #     raise TypeError("Input parameters must be factors")
+    if not all(isinstance(phi, Factor) for phi in args):
+        raise TypeError("Input parameters must be factors")
     return functools.reduce(lambda phi1, phi2: _bivar_factor_operation(phi1, phi2, operation='M'), args)
 
 
plus

28

--- a/Plugin/ColoursAndFontsManager.cpp
+++ b/Plugin/ColoursAndFontsManager.cpp
@@ -209,7 +209,7 @@ void ColoursAndFontsManager::LoadNewXmls(const std::vector<wxXmlDocument*>& xmlF
     }
     
     if(m_tuneColours) {
-        wxBusyInfo info(wxBusyInfoFlags().Text(_("Upgrading Lexers...")).Label(_("CodeLite")));
+        wxBusyInfo info(_("Upgrading Lexers..."));
         // We tuned the colours, save them back to the file system
         Save();
     }
plus

3

--- a/python/experiment_multibot.py
+++ b/python/experiment_multibot.py
@@ -10,6 +10,10 @@
 from lib import command
 import time,sys,os,traceback
 import serial
+
+# Path to imageproc-settings repo must be added
+sys.path.append(os.path.dirname("../../imageproc-settings/"))
+sys.path.append(os.path.dirname("../imageproc-settings/"))      # Some projects have a single-directory structure
 import shared
 
 from velociroach import *
plus

13

--- a/src/config/paths.php
+++ b/src/config/paths.php
@@ -7,11 +7,27 @@
     | Modules path
     |--------------------------------------------------------------------------
     |
-    | Here you may update the modules path.
+    | This path used for save the generated module. This path also will added
+    | automatically to list of scanned folders.
     |
     */
 
     'modules' => base_path('Modules'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Scan Path
+    |--------------------------------------------------------------------------
+    |
+    | Here you define which folder will be scanned. By default will scan vendor
+    | directory. This is useful if you host the package in packagist website.
+    |
+    */
+   
+    'scan' => [
+        base_path('vendor/*/*'),
+    ],
+
     /*
     |--------------------------------------------------------------------------
     | Modules assets path
@@ -22,6 +38,7 @@
     */
 
     'assets' => public_path('modules'),
+
     /*
     |--------------------------------------------------------------------------
     | The migrations path
@@ -33,6 +50,7 @@
     */
 
     'migration' => app_path('database/migrations'),
+
     /*
     |--------------------------------------------------------------------------
     | Generator path
@@ -58,4 +76,5 @@
         'views' => 'Resources/views',
         'test' => 'Tests',
     ]
+    
 ];
\ No newline at end of file
plus

3

--- a/CS4620/src/egl/GLTexture.java
+++ b/CS4620/src/egl/GLTexture.java
@@ -169,6 +169,10 @@ public void writeToImage(int pixelFormat, int pixelType, ByteBuffer img) {
     public void updateImage(int offsetX, int offsetY, int updateWidth, int updateHeight, int pixelFormat, int pixelType, ByteBuffer buf) {
     	GL11.glTexSubImage2D(target, 0, offsetX, offsetY, updateWidth, updateHeight, pixelFormat, pixelType, buf);
     }
+    
+    public void readImage(int offsetX, int offsetY, int updateWidth, int updateHeight, int pixelFormat, int pixelType, ByteBuffer buf) {
+    	GL11.glReadPixels(offsetX, offsetY, updateWidth, updateHeight, pixelFormat, pixelType, buf);
+    }
 
     public void setImage(int[] dim, int pixelFormat, int pixelType, ByteBuffer buf, boolean mipMap) throws Exception {
         if(dim == null || dim.length < 1 || dim.length > 3)
plus

3

--- a/cGraphicsLayer.h
+++ b/cGraphicsLayer.h
@@ -97,7 +97,8 @@ class cGraphicsLayer
 	//Info on texture used for batched drawing
 	float batchTexWidth;
 	float batchTexHeight;
-	int alpha1, alpha2, alpha3,vuelta;
+	int alpha1, alpha2, alpha3;
+	float vuelta,velocidadvuelta;
 	cInterface Interface;
 };
 
plus

12

--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/types/filters/Filtering.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/types/filters/Filtering.java
@@ -570,10 +570,10 @@ public static int colorEffect(int rgb,
         int r = (rgb >> 16) & 0xff;
         int g = (rgb >> 8) & 0xff;
         int b = (rgb) & 0xff;
-        r = cut(((r * redMultTerm) / 255) + redAddTerm);
-        g = cut(((g * greenMultTerm) / 255) + greenAddTerm);
-        b = cut(((b * blueMultTerm) / 255) + blueAddTerm);
-        a = cut(((a * alphaMultTerm) / 255) + alphaAddTerm);
+        r = cut(((r * redMultTerm) / 256) + redAddTerm);
+        g = cut(((g * greenMultTerm) / 256) + greenAddTerm);
+        b = cut(((b * blueMultTerm) / 256) + blueAddTerm);
+        a = cut(((a * alphaMultTerm) / 256) + alphaAddTerm);
         return RGBA.toInt(r, g, b, a);
     }
 
@@ -587,10 +587,10 @@ public static SerializableImage colorEffect(SerializableImage src,
             int r = (rgb[i] >> 16) & 0xff;
             int g = (rgb[i] >> 8) & 0xff;
             int b = (rgb[i]) & 0xff;
-            r = Math.max(0, Math.min(((r * redMultTerm) / 256) + redAddTerm, 255));
-            g = Math.max(0, Math.min(((g * greenMultTerm) / 256) + greenAddTerm, 255));
-            b = Math.max(0, Math.min(((b * blueMultTerm) / 256) + blueAddTerm, 255));
-            a = Math.max(0, Math.min(((a * alphaMultTerm) / 256) + alphaAddTerm, 255));
+            r = cut(((r * redMultTerm) / 256) + redAddTerm);
+            g = cut(((g * greenMultTerm) / 256) + greenAddTerm);
+            b = cut(((b * blueMultTerm) / 256) + blueAddTerm);
+            a = cut(((a * alphaMultTerm) / 256) + alphaAddTerm);
             rgb[i] = (a << 24) | (r << 16) | (g << 8) | (b);
         }
         setRGB(dst, src.getWidth(), src.getHeight(), rgb);
plus

4

--- a/src/nl/hu/pf/coproco/model/pattern/Pattern.java
+++ b/src/nl/hu/pf/coproco/model/pattern/Pattern.java
@@ -2,7 +2,6 @@
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import java.io.File;
 import java.util.Observable;
 
@@ -10,7 +9,6 @@
  * Created by Liam on 13-12-2014.
  */
 @XmlRootElement (name = "Pattern")
-@XmlType (propOrder = {"name", "scope", "purpose", "problem", "solution", "consequences", "diagram"})
 public class Pattern extends Observable {
     private String  name;
     private String  problem;
plus

19

--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -372,7 +372,7 @@ static bool receive_udppacket(node_t *n, vpn_packet_t *inpkt) {
 			}
 			return false;
 		}
-		if(!sptps_receive_data(&n->sptps, ((sptps_packet_t *)&inpkt)->data, inpkt->len)) {
+		if(!sptps_receive_data(&n->sptps, ((sptps_packet_t *)inpkt)->data, inpkt->len)) {
 			logger(DEBUG_TRAFFIC, LOG_ERR, "Got bad packet from %s (%s)", n->name, n->hostname);
 			return false;
 		}
@@ -1077,7 +1077,7 @@ void handle_incoming_vpn_data(void *data, int flags) {
 	}
 
 	if(n->status.sptps) {
-		if(memcmp(&spkt->dstid, &nullid, sizeof nullid)) {
+		if(!memcmp(&spkt->dstid, &nullid, sizeof nullid)) {
 			direct = true;
 			from = n;
 			to = myself;
plus

35

--- a/structr-ui/src/test/java/org/structr/web/common/DiffTest.java
+++ b/structr-ui/src/test/java/org/structr/web/common/DiffTest.java
@@ -454,7 +454,7 @@ public String apply(String from) {
 				final StringBuilder buf = new StringBuilder(from);
 
 				// cut out <div> block
-				int cutStart = buf.indexOf("<h2") - (DOMNode.dataHashProperty.jsonName().length() + 25);
+				int cutStart = buf.indexOf("<h2") - (DOMNode.dataHashProperty.jsonName().length() + 49);
 				int cutEnd = buf.indexOf("</h2>") + 20;
 
 				clipboard.append(buf.substring(cutStart, cutEnd));
plus

373

--- a/examples/widgets/videoplayer.py
+++ b/examples/widgets/videoplayer.py
@@ -6,6 +6,9 @@
 from kivy.app import App
 from kivy.uix.videoplayer import VideoPlayer
 
+#check what formats are supported for your targetted devices
+#for example try h264 video and acc audo for android using an mp4
+#container
 
 class VideoPlayerApp(App):
 
@@ -14,7 +17,7 @@ def build(self):
             filename = argv[1]
         else:
             curdir = dirname(__file__)
-            filename = join(curdir, 'softboy.avi')
+            filename = join(curdir, 'softboy.mpg')
         return VideoPlayer(source=filename, state='play')