evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,885 Commits 1 Branch 0 Tags
e4a3de1272144a4e9d5d8c3a5ce019469ac485f5
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Blade 939bb374a4 AP Freeroll tourney 2011-01-17 01:16:43 -05:00
Eric Blade 793244fb6b Merge branch 'master' of git://git.assembla.com/fpdboz.git 2011-01-14 03:38:39 -05:00
Eric Blade 0b967ad76b Merge branch 'master' of git://git.assembla.com/fpdboz.git 2011-01-09 07:27:59 -05:00
Eric Blade 8dac195100 Merge branch 'master' of git://git.assembla.com/fpdb.git 2011-01-01 02:01:24 -05:00
Eric Blade 32ec0d9d7a Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2011-01-01 01:59:34 -05:00
Eric Blade fd86051690 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2011-01-01 01:58:21 -05:00
Eric Blade 565d1397fa Merge branch 'master' of git://git.assembla.com/fpdb.git 2010-12-26 23:24:49 -05:00
Eric Blade 75026dbd30 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-12-26 23:23:24 -05:00
Eric Blade 57447aa6b6 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-12-21 16:37:31 -05:00
Eric Blade 40b1551036 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2010-12-21 16:34:47 -05:00
Eric Blade dd95c8626f license change 2010-12-18 14:58:43 -05:00
Eric Blade f8bf59b5fc Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-12-17 06:57:35 -05:00
Eric Blade ae27bf7f38 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-12-07 03:32:28 -05:00
Eric Blade aef3186cfb remove commented log that ray removed 2010-12-06 18:04:54 -05:00
Eric Blade 515557d45e fix merge error 2010-12-05 16:48:12 -05:00
Eric Blade 301348eb5e Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 
Conflicts:
	pyfpdb/HUD_main.pyw
 2010-12-05 16:39:13 -05:00
Eric Blade 10ab80ff7d apparently i forgot to commit that a long time ago. 2010-12-05 02:15:30 -05:00
Eric Blade 22cf70358f Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-12-05 01:19:18 -05:00
Eric Blade 021fc50236 Merge branch 'master' of git://git.assembla.com/fpdb.git 2010-12-03 16:32:30 -05:00
Eric Blade 8855530617 Merge branch 'master' of git://git.assembla.com/fpdboz.git 
Conflicts:
	pyfpdb/Database.py
	pyfpdb/TableWindow.py
 2010-12-03 16:14:10 -05:00
Eric Blade 2d0ea89b9a comment 2010-11-28 20:24:39 -05:00
Eric Blade 99535cddbb cleanups 2010-11-28 20:15:09 -05:00
Eric Blade 7b1143a6ff make "source" argument to interlocks.acquire mandatory 2010-11-28 20:04:32 -05:00
Eric Blade e5782dd736 some cleanups and comments 2010-11-28 20:00:56 -05:00
Eric Blade 336fee0f3d oops 2010-11-27 20:36:42 -05:00
Eric Blade 7402c57eb1 --hidden --minimized 2010-11-27 20:35:34 -05:00
Eric Blade e2b86eb239 Add --autoimport command argument 2010-11-27 19:32:28 -05:00
Eric Blade f94ad0126a add --xloc and --yloc options for specifying where to start windows at 2010-11-27 19:16:15 -05:00
Eric Blade 2990e5856d Button changes immediately after pressing it instead of waiting until the pipe is ready. 
Terminates HUD process rather than asking it to close
 2010-11-27 18:34:30 -05:00
Eric Blade e5f4f5710d read_stdin: return if fail to find table, rather than continue along, also trap KeyError at end of func when checking tournament tables. 
(maybe this'll finally fix the hud locking up on table close sometimes?)
 2010-11-26 23:13:14 -05:00
Eric Blade bfa3cfc20c check for AttributeError at new window_foreign_new call 2010-11-26 18:51:25 -05:00
Eric Blade c40312b98b Merge branch 'master' of git://git.assembla.com/fpdb-eric 2010-11-26 18:17:39 -05:00
Eric Blade 622b350795 Revert "Merge branch 'chaz' of git://github.com/ChazDazzle/fpdb-chaz" 
This reverts commit 61ac6be0fa, reversing
changes made to 18df2ef2c6.

Conflicts:

	pyfpdb/SQL.py
 2010-11-26 18:15:28 -05:00
Eric Blade 2e54518b4f Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-11-26 18:11:58 -05:00
Eric Blade 7c4d08833b add strptime to Database 2010-11-26 16:57:47 -05:00
Eric Blade 5e04f32519 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-11-26 09:14:25 -05:00
Eric Blade 4b0dcc3e83 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-11-20 03:30:19 -05:00
Eric Blade 0f4b5827d0 re-undo the last merge change i made oops 2010-11-20 03:29:53 -05:00
Eric Blade 742347c5c7 undo my last change as it breaks merge 4.x 2010-11-18 17:54:19 -05:00
Eric Blade eafbc2b2b8 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2010-11-18 17:45:51 -05:00
Eric Blade 990e3d2ed1 remove spurious ( ) from carbon/merge hh detection 2010-11-18 17:44:56 -05:00
Eric Blade fa3883e955 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2010-11-16 20:06:48 -05:00
Eric Blade db467b5957 Merge branch 'master' of git://git.assembla.com/fpdb.git 2010-11-16 20:06:07 -05:00
Eric Blade 75633bb5fb Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-11-16 20:04:45 -05:00
Eric Blade 967e1ff2c4 Merge branch 'master' of git://git.assembla.com/fpdb.git 2010-11-11 04:27:49 -05:00
Eric Blade aa0de0344d finish fix for 4-max 2010-11-07 20:12:21 -05:00
Eric Blade 71ad87b22e Merge branch 'master' of git://repo.or.cz/fpbd-bostik.git 2010-11-07 20:10:35 -05:00
Eric Blade 50246d04ea Merge branch 'master' of git://git.assembla.com/fpdb.git 2010-11-07 20:09:39 -05:00
Eric Blade 02fdcf307e reset AP/UB horse games to 8 seat 
support Everleaf 4-seat (need a layout, i can't get into the games)
 2010-11-07 20:08:56 -05:00
Eric Blade df2f8317f6 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-11-07 20:06:21 -05:00
Eric Blade a6f14c2474 Merge branch 'master' of git://git.assembla.com/fpdb.git 2010-10-28 20:49:32 -04:00
Eric Blade 25eeca1e48 Everleaf support for 8-max 2010-10-28 19:52:33 -04:00
Eric Blade 970b88349b hud doesn't crash when mixing cash/tourney 2010-10-12 02:23:56 -04:00
Eric Blade 5643aeca62 fix another bad debug log 2010-10-11 23:42:05 -04:00
Eric Blade 25e03489fe fix error in logging mechanism, remove a debug print 2010-10-11 22:23:06 -04:00
Eric Blade fed287334a further fixing in WinTables for dealing with a window that has disappeared 2010-10-11 18:40:58 -04:00
Eric Blade bad3fac16e Merge branch 'master' of git://git.assembla.com/fpdb.git 2010-10-11 18:25:20 -04:00
Eric Blade 867a1526c5 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-10-11 18:24:32 -04:00
Eric Blade fb206dfde6 actually import _mysql_exceptions before trying to test against it 2010-10-11 18:23:22 -04:00
Eric Blade dc215a5d01 reflow get_geometry some, pep8 2010-10-11 18:22:55 -04:00
Eric Blade 120ebf4b40 readSupportedGames should return [ring/tour, base-type, limit-structure], not [ring/tour, category, limit-structure] 
add PL holdem/omaha tourney support for everleaf
 2010-10-07 08:34:36 -04:00
Eric Blade 7615f2429b Add Everleaf FLHE Tournament support 2010-10-07 08:13:21 -04:00
Eric Blade 4613f64f8b Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-10-07 07:41:19 -04:00
Eric Blade 8f62b53891 Merge branch 'master' of git://repo.or.cz/fpbd-bostik.git 2010-10-05 20:24:05 -04:00
Eric Blade c894e5e478 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-10-05 20:23:12 -04:00
Eric Blade e9de1a53cd Merge branch 'master' of git://git.assembla.com/fpdb.git 2010-10-04 02:47:24 -04:00
Eric Blade fa529e6e9e Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-10-04 02:46:48 -04:00
Eric Blade fa3a9c54b8 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-10-01 22:20:32 -04:00
Eric Blade 4de792a1eb Merge branch 'master' of git://git.assembla.com/fpdboz.git 
Conflicts:
	pyfpdb/HUD_main.pyw
 2010-09-30 01:46:48 -04:00
Eric Blade 61d2c48da2 Merge branch 'master' of git://git.assembla.com/fpdb.git 
Conflicts:
	pyfpdb/HUD_main.pyw
 2010-09-27 16:15:54 -04:00
Eric Blade c325daf7f6 check_table_no deals with "None" passed to it 2010-09-27 07:34:25 -04:00
Eric Blade df1cd4a15d fix syntactical issue in get_table_no 2010-09-27 07:29:34 -04:00
Eric Blade ca967992b5 fix a comment 2010-09-27 07:11:16 -04:00
Eric Blade b0056be03c further fixes to get stdout working in windows again 2010-09-27 07:10:13 -04:00
Eric Blade baf47d476e fix for call to check_table_no now needing an argument 2010-09-27 05:56:52 -04:00
Eric Blade bfec231b5d slight formatting changes to agree with PEP8 moar closely 2010-09-27 05:08:34 -04:00
Eric Blade 4b3fe3dfa2 fix conflicts between ray's new window move code and my old window move code 
Ray: when you finish implementing yours, please adapt and/or disable Hud::update_table_position
 2010-09-27 04:04:56 -04:00
Eric Blade a98e71ad24 semi-fix stdout for hud_main in windows when running from source 2010-09-27 03:14:10 -04:00
Eric Blade 034a871f27 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2010-09-26 02:21:30 -04:00
Eric Blade e3113ae3a0 Merge branch 'master' of git://git.assembla.com/fpdb.git 2010-09-26 02:21:04 -04:00
Eric Blade 765782c958 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-09-26 02:20:34 -04:00
Eric Blade 033e498284 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-09-21 20:51:30 -04:00
Eric Blade e579d047d6 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-09-20 05:23:18 -04:00
Eric Blade 232903bfe8 Merge branch 'master' of git://git.assembla.com/fpdb.git 2010-09-18 02:36:17 -04:00
Eric Blade 2f585452bd Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-09-18 02:30:01 -04:00
Eric Blade f8394bccb4 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-09-14 19:19:02 -04:00
Eric Blade 80d582c336 Merge branch 'master' of git://repo.or.cz/fpbd-bostik.git 2010-09-13 15:07:17 -04:00
Eric Blade 67326dc974 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 2010-09-13 15:06:50 -04:00
Eric Blade 5277c74213 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-09-13 15:06:26 -04:00
Eric Blade 0b1767f9e4 Merge branch 'master' of git://git.assembla.com/fpdb.git 2010-09-13 15:04:40 -04:00
Eric Blade f4cce53465 Merge branch 'master' of git://git.assembla.com/fpdb.git 2010-09-09 04:31:14 -04:00
Eric Blade 3a2a6709b5 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-09-09 02:56:17 -04:00
Eric Blade 27c6250be9 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-09-06 15:52:43 -04:00
Eric Blade 01cb67da5f Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-09-05 17:46:45 -04:00
Eric Blade d6176ff753 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-09-04 19:19:57 -04:00
Eric Blade b77500cc12 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-09-04 03:17:39 -04:00
Eric Blade 9ed44c0c54 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2010-09-02 01:33:39 -04:00
Eric Blade 2ab01fa9d9 some code and comment cleanups and clarifications, mo betta fasta. 2010-08-31 04:56:28 -04:00
Eric Blade 80b98da6fc Merge branch 'master' of git://repo.or.cz/fpbd-bostik.git 2010-08-31 04:42:32 -04:00
Eric Blade c710499be1 Merge branch 'master' of git://repo.or.cz/fpbd-bostik.git 2010-08-30 17:07:49 -04:00