Commit Graph

2526 Commits

Author SHA1 Message Date
Worros
4cc08763fc Add query getPlayerIdBySite 2009-08-18 18:44:47 +08:00
grindi
b8af93efb5 Merge branch 'master' of git://git.assembla.com/fpt_fpdb
Conflicts:
	pyfpdb/FulltiltToFpdb.py
2009-08-18 13:47:11 +04:00
sqlcoder
1640ab3cfc attempt to stop a KeyError problem (problem patching up the symptoms rather than fixing the cause) 2009-08-17 21:51:13 +01:00
Mika Bostrom
1eb17e90e1 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-08-17 19:24:07 +03:00
Ray
038375b1ea Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-08-16 15:34:59 -04:00
Eric Blade
9f89340881 timeout in startbutton reset resets to Stop or Start as appropriate 2009-08-16 14:30:52 -05:00
PassThePeas
c5aedf321f Modification to FulltiltToFpdb.py mostly for tourneys contexts
modified:   FulltiltToFpdb.py
- Sitting out players are no longer considered out of a hand (in a tourney context, they can act even if out at the beggining of the hand)
- re_CollectPot modified to take into account Tournament context (no $ in the pot)
- Try to read buy-in/fee from topline in Tournament context
- Deal with commas in pot size (readCollectPot)
2009-08-16 20:01:36 +02:00
grindi
15c854d368 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-08-16 20:07:19 +04:00
Eric Blade
8bba1fd932 structured Exceptions a bit more like most python apps seem to do it (and as suggested in the manual) 2009-08-16 07:32:56 -05:00
Eric Blade
d495606f2a GuiAutoImport:
do_import: change label of Stop button when running an import, to provide a visual indicator
 startClicked: refactor so only the Pipe Open is inside the exception handler, since that should be the only thing in there that we need to ignore an exception from.
2009-08-16 05:30:11 -05:00
Eric Blade
aa0610dcfa fpdb: remove error trap on "Recreate Tables" menu option - trapping should be much more localized. 2009-08-16 04:46:41 -05:00
grindi
e7dc9ed586 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-08-16 13:40:28 +04:00
Eric Blade
a90415bc84 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2009-08-16 04:23:49 -05:00
Eric Blade
b26f4a09ce Absolute: support Pot Limit and Fixed Limit ("Normal" as they call it)
Configuration: Only trap the thrown error when checking for existence of site default paths, if not found set path to a reasonable ERROR message instead of "default"
2009-08-16 04:22:22 -05:00
grindi
6133d0f9bb Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-08-16 02:07:54 +04:00
Mika Bostrom
49022fcf83 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-08-16 00:47:46 +03:00
Matt Turnbull
29a0ad85c7 full path to logging.config, small fix in Configuration.Database string repr 2009-08-15 22:36:14 +01:00
grindi
40b8ce799b Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-08-15 21:53:34 +04:00
Ray
46085cba5d Repair missing line in regex, comment out skipping tournaments. 2009-08-15 13:30:31 -04:00
Worros
6648036399 Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-08-15 23:38:54 +08:00
Mika Bostrom
b79f0ddccf Actually call position update on reposition
Forgot to commit the call that does hud and aux window repositioning
2009-08-15 14:36:08 +03:00
Worros
dede86521a Merge branch 'master' of git://github.com/grindi/fpdb-grindi 2009-08-15 19:06:39 +08:00
Worros
ecad66f7d8 Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-08-15 19:06:18 +08:00
Mika Bostrom
53eaee4d7c Fix mucked cards' position update
When menu->reposition is called, only the HUD windows were moved to
their new positions. The auxiliary windows used for mucked cards
remained where they were at the time the HUD instance was created. This
caused mucked cards to appear in wrong places after the poker table was
moved.

Split positioning code in Mucked.py to its own method. Now the same
routine that moves HUD windows to their new places also invokes code
to reposition auxiliary windows.

Now the mucked cards are displayed at correct screen coordinates too.
2009-08-15 10:44:04 +03:00
grindi
2cfbb07cd1 Merge branch 'experimental'
Conflicts:
	pyfpdb/Hand.py
2009-08-12 22:04:41 +04:00
grindi
bdfc6ef83f Unified locale handling.
Added support for importing filenames containig non-latin symbols
2009-08-12 21:55:19 +04:00
grindi
25923b02d1 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-08-12 19:58:29 +04:00
Worros
116141b833 Merge branch 'master' of git://git.assembla.com/fpdb-eric
Conflicts:
	pyfpdb/HandHistoryConverter.py
2009-08-12 22:53:49 +08:00
Worros
0baabb0368 Merge branch 'master' of git://github.com/grindi/fpdb-grindi
Conflicts:
	pyfpdb/HandHistoryConverter.py
2009-08-12 22:51:49 +08:00
Worros
cfd7b40ab6 Merge branch 'master' of git://repo.or.cz/fpbd-bostik
Conflicts:
	pyfpdb/HandHistoryConverter.py
2009-08-12 22:49:18 +08:00
Worros
5a4bcf3997 Add streetXPot and showdownPot to hhc insert
totalPot not actually calcuated yet, and valued need to be converted from Decimal() to cents
2009-08-12 22:21:54 +08:00
Worros
483334b899 Fix Absolute plugin from recent change 2009-08-12 18:34:17 +08:00
grindi
442d96b862 Removed hack in FTP parser 2009-08-12 14:30:54 +04:00
Eric Blade
7dc635670d Merge branch 'master' of git://git.assembla.com/free_poker_tools.git
Conflicts:
	pyfpdb/HandHistoryConverter.py
	pyfpdb/SQL.py
2009-08-12 04:26:42 -05:00
Eric Blade
f31f2e442e Merge branch 'master' of git://git.assembla.com/fpdboz.git
Conflicts:
	pyfpdb/HandHistoryConverter.py
2009-08-12 04:24:04 -05:00
Eric Blade
bfec6916f6 trying to get my new install of git to freaking work 2009-08-12 04:09:04 -05:00
grindi
dd17155aa9 Fixed bug 7 ( http://trac-git.assembla.com/free_poker_tools/ticket/7 ) 2009-08-12 12:47:18 +04:00
grindi
0aed2c2461 Party hhc: fixes 2009-08-12 11:18:42 +04:00
Mika Bostrom
185f9660c5 Use same locale conversion everywhere
It is not enough to use actual system locale in just one spot if all
the other encodings are hard-coded to latin1. Now that we have the real
locale available, do all string conversions [.encode($locale)] with
that.
2009-08-12 10:00:23 +03:00
Mika Bostrom
89dccac169 Merge branch 'master' of git://git.assembla.com/free_poker_tools
Conflicts:
	pyfpdb/GuiTableViewer.py
2009-08-12 08:30:31 +03:00
Mika Bostrom
35cd58545a More generic locale use, I hope
Instead of assuming conversion is from latin1, use locale information
2009-08-12 08:26:06 +03:00
Matt Turnbull
222d713169 too much changes to go into master 2009-08-12 01:46:39 +01:00
grindi
8de2072f82 Merge branch 'experimental' of git@github.com:grindi/fpdb-grindi into experimental
Conflicts:
	pyfpdb/Hand.py
2009-08-12 03:50:52 +04:00
grindi
56a6d77e9c Hand: added ante support 2009-08-12 03:48:48 +04:00
grindi
433d0948ec Merge branch 'master' of git://git.assembla.com/fpdboz 2009-08-12 02:43:10 +04:00
grindi
70e8a49b10 Merge branch 'master' of git://git.assembla.com/free_poker_tools
Conflicts:
	pyfpdb/HandHistoryConverter.py
2009-08-12 02:39:33 +04:00
grindi
1107d9c6be Party hhc: removed trailing spaces, fixes 2009-08-12 02:35:34 +04:00
grindi
f18d0e10cf Hand: added ante support 2009-08-12 02:30:08 +04:00
Ray
d69ab83ee5 Fix encoding problem in the written Stars HHs. 2009-08-11 17:43:28 -04:00
grindi
39d55e093d Hand: improved BB+SB blind type support; added common money feature to the Pot 2009-08-12 01:19:01 +04:00