GitHub PushEvent at 2014-06-23 19:44:24
Repository: OpenXcom
Actor: sfalexrog
Payload: {"shas":[["efa4334f24b10499982c73088c261e94eda882c0","969e1403e749114e9e66c3a1af51f0372a0b2651@yandex.ru","SoldierInfoState: armour's effects","redv",false],["df141c3c763d6c23d6e38a0d865c078254478336","969e1403e749114e9e66c3a1af51f0372a0b2651@yandex.ru","refactoring","redv",false],["6082802dfd8167ce649247812871e9a971e43d07","f024f907a714befadba355d3f8b23bc5d4de6b31@gmail.com","Show item info by hovering cursor over item.\nDeselect item only if unload actually happened.\nClose inventory screen by its hotkey.","dtrushn",false],["d6ec4b2ccdaa15b8de3ca13805346c468b8beb35","03d5a1b1c13054d5cbbb797fb134edaee2d81a6b@yahoo.com","proof of concept impl for inventory copy/paste","Myk",false],["c2550e9e8e74f5fb84e6e7d259c288768b59864a","03d5a1b1c13054d5cbbb797fb134edaee2d81a6b@yahoo.com","Merge remote-tracking branch 'upstream/master' into loadout_copy_paste\n\nConflicts:\n\t.gitignore\n\tsrc/Battlescape/InventoryState.h","Myk",false],["7f1e31421bc85b1fdba28be9a6fbc3795f303e88","03d5a1b1c13054d5cbbb797fb134edaee2d81a6b@yahoo.com","fix compiler error from merge","Myk",false],["c424da94c7a2f2e7203b3b63cc102e1d6c03ac8c","03d5a1b1c13054d5cbbb797fb134edaee2d81a6b@yahoo.com","Merge remote-tracking branch 'upstream/master' into loadout_copy_paste","Myk",false],["358b3f39bfaf691fb49f017e0febb956c0d6bf2b","03d5a1b1c13054d5cbbb797fb134edaee2d81a6b@yahoo.com","Merge remote-tracking branch 'upstream/master' into loadout_copy_paste","Myk",false],["905a44d1859f3446b505f474202338850387dd28","03d5a1b1c13054d5cbbb797fb134edaee2d81a6b@yahoo.com","Merge remote-tracking branch 'upstream/master' into loadout_copy_paste","Myk",false],["d979a942ae94ddaad3cbf1b57feb691251136a9b","03d5a1b1c13054d5cbbb797fb134edaee2d81a6b@yahoo.com","use redv's button graphics","Myk",false],["4d47d471b4f37453fc7960e6b9e4228851bd76d3","03d5a1b1c13054d5cbbb797fb134edaee2d81a6b@yahoo.com","Merge remote-tracking branch 'upstream/master' into loadout_copy_paste","Myk",false],["ad5bd275d4b4f78070583bd3f2bc30607fcf1859","03d5a1b1c13054d5cbbb797fb134edaee2d81a6b@yahoo.com","fix build error from last merge","Myk",false],["8ad3cb3d2721f75fcc72cb441347a9217f74aa6c","03d5a1b1c13054d5cbbb797fb134edaee2d81a6b@yahoo.com","make template-related hotkeys configurable","Myk",false],["ff3853373d465de3a1fd5621cdddaaa3bf6ccac0","03d5a1b1c13054d5cbbb797fb134edaee2d81a6b@yahoo.com","copy inv templ so we can reapply to orig soldier","Myk",false],["ee76fdcf1d29f5dd8d00bfc833facce33eb0f977","03d5a1b1c13054d5cbbb797fb134edaee2d81a6b@yahoo.com","when copying blank templ, revert imgs to orig","Myk",false],["ec9141287488d41658b6f05ef46fa4fd028f6ac3","969e1403e749114e9e66c3a1af51f0372a0b2651@yandex.ru","Palette::blockOffset(0)+15 is black; 0 is transparent.","redv",false],["9999d6454e2a71335c19c90dd6b680d07acb25d3","969e1403e749114e9e66c3a1af51f0372a0b2651@yandex.ru","fixed issue with palette","redv",false],["23a071112036043c1b5689b39e79d96861c2cee8","03d5a1b1c13054d5cbbb797fb134edaee2d81a6b@yahoo.com","Merge pull request #1 from redv/myk002\n\nfix: transparent rectangle and buttons palette","Myk",false],["7217e17ef87f178b8aa7b95718a7e64990a5197e","03d5a1b1c13054d5cbbb797fb134edaee2d81a6b@yahoo.com","move buttons down below ammo text","Myk",false],["0600b636e135a481673714ea96b2b62cc1d3dc10","03d5a1b1c13054d5cbbb797fb134edaee2d81a6b@yahoo.com","Merge branch 'loadout_copy_paste' of github.com:myk002/OpenXcom into loadout_copy_paste","Myk",false]],"size":116,"ref":"refs/heads/experimental","head":"25a50398dc0a75c4733a97160b4973243f283a15"}