{"shas":[["35d16bd58ce89bcbab1ae69e89cd2027e4ea26bd","10e9e46f7f673cb195060b5a4c78eda9b340e9ae@GMaiL.CoM","Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611\n\nConflicts:\n\tsrc/engine/console.h\n\tsrc/engine/server.h\n\tsrc/engine/server/server.cpp\n\tsrc/engine/shared/config_variables.h\n\tsrc/engine/shared/console.cpp\n\tsrc/engine/shared/console.h\n\tsrc/engine/shared/network_server.cpp\n\tsrc/game/client/components/console.cpp\n\tsrc/game/client/components/console.h\n\tsrc/game/client/components/menus_browser.cpp\n\tsrc/game/client/gameclient.cpp\n\tsrc/game/editor/editor.cpp\n\tsrc/game/editor/editor.h\n\tsrc/game/editor/io.cpp\n\tsrc/game/editor/layer_tiles.cpp\n\tsrc/game/editor/popups.cpp\n\tsrc/game/gamecore.cpp\n\tsrc/game/mapitems.h\n\tsrc/game/server/entities/character.cpp\n\tsrc/game/server/entities/laser.cpp\n\tsrc/game/server/gamecontext.cpp\n\tsrc/game/server/gamecontroller.cpp\n\tsrc/game/server/gamecontroller.h\n\tsrc/game/server/gamemodes/ctf.cpp\n\tsrc/game/server/player.cpp\n\tsrc/game/variables.h","GreYFoX"],["5b2775865097ed865b06a56625bcbce1bb908a3a","10e9e46f7f673cb195060b5a4c78eda9b340e9ae@GMaiL.CoM","Removed level stuff\nRemoved client ID stuff\nRemoved console stuff\nResolved merge conflicts\nUpgraded Banmaster\nCleaned up","GreYFoX"],["06afe36db4cb375d9596a1937a6e1159781b7295","10e9e46f7f673cb195060b5a4c78eda9b340e9ae@GMaiL.CoM","Removed old hook through prediction as 0.5.2 servers are no longer compatible\nmade it possible to load old maps\nEnumerated layers","GreYFoX"],["3fba3ee13e93bc6f0086e282668a8ab579ba07da","d59217c5af7080c965c62b53202784cc51488e81@web.de","Merge pull request #832 from GreYFoX/oypull1\n\nCleanup","oy"],["705872623660783e851b33e361d687c02c3e24e9","a387e855f639d6c38faa139ac968014abba5d1d7@web.de","changed default UiPage to PAGE_INTERNET. Closes #839","oy"],["4e830a71a1334a6f47ab4b3fb3cf44419a240f25","a387e855f639d6c38faa139ac968014abba5d1d7@web.de","decreased top offset of image add button in the editor. Closes #834","oy"],["c38c632d067702454f1f706eeefcbfaa0043b738","a387e855f639d6c38faa139ac968014abba5d1d7@web.de","fixed multiple popup creation in the editor. Closes #836","oy"],["367bb4b8372dd8c19445c599df3b30ac6aed04d9","536ae588b55915c05edaff481fedfa5cc4017056@localhost.localdomain","Map Editor: Envelope Preview","Alexandre"],["de5eccef3f18b2a3e2fbe746be559d0a7f078d27","536ae588b55915c05edaff481fedfa5cc4017056@localhost.localdomain","Fix Stuffs & clean comments","Alexandre"],["f36cc57bdd4837f6f148e6d83e6a5185b1328b7d","a387e855f639d6c38faa139ac968014abba5d1d7@web.de","fixed last commit","oy"],["2708256186b7f568e6ce6c34e161bf0d2d349096","a387e855f639d6c38faa139ac968014abba5d1d7@web.de","fixed quad selection via envelope preview","oy"],["2ceb0fde91b53bff6c6d46bc70c9b6f876a9fc90","04c7776fbe4566c1cf02f3e839fe2ec533449a37@xxx.xx","fixed editor zooming if gui is not active","SushiTee"],["244d2bab3cf824d70b7e76b896cfe7543bdbdc7a","a387e855f639d6c38faa139ac968014abba5d1d7@web.de","fixed compiler setting. Closes #272","oy"],["b1e7797b19ca15bd644a98492fc75f0bd73ae76d","a387e855f639d6c38faa139ac968014abba5d1d7@web.de","fixed compiling with mingw","oy"],["de4a95c5d22f36d70ea4d9e0b97fecd9ed4d0dcb","10e9e46f7f673cb195060b5a4c78eda9b340e9ae@GMaiL.CoM","Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611","GreYFoX"],["47a1e2b2303d4d7adabad9a56acc26cd79b70ef5","3fec0e6edb1eb15f09c1a9aa808728ee33d0daf2@gmail.com","Fix banmaster compilation. Fix some sign-compare warnings","Ravomavain"],["5912395554f99e9dbe0e4511221c53501575fe6a","3fec0e6edb1eb15f09c1a9aa808728ee33d0daf2@gmail.com","Clarify this if statement.","Ravomavain"],["15d0a408253d0fd671656e8e9b6a5474e95cd53f","3fec0e6edb1eb15f09c1a9aa808728ee33d0daf2@gmail.com","Add user level access and use this level for /cmds if player is not authed.","Ravomavain"],["e8229f537f3986ef742859c12f53c116a3509c3c","3fec0e6edb1eb15f09c1a9aa808728ee33d0daf2@gmail.com","Fix loading of old maps","Ravomavain"],["b75a26eed909b331348af576345da217a50233a2","10e9e46f7f673cb195060b5a4c78eda9b340e9ae@GMaiL.CoM","Fixed the console","GreYFoX"]],"ref":"refs/heads/DDRace","size":30,"head":"4ca0681689758884e5730881e88c1e98bfc74e46","push_id":40864755}