Commit Graph
100 Commits
Author SHA1 Message Date
Eratosthenes 120d05f9cd Changes for py2exe exe. 2010-02-06 14:55:48 -05:00
Eratosthenes 8a2c24ceff Merge branch 'master' of git://git.assembla.com/fpdboz 2010-02-05 23:21:55 -05:00
Eratosthenes 8aa18b95d8 Changes to make running py2exe exe happy. 2010-02-05 23:19:58 -05:00
Eratosthenes 4df991517e Changes to make the py2exe exe happy. 2010-02-05 23:13:53 -05:00
Eratosthenes 08078cfee4 Configure for python 2.5. Add icon for fpdb.exe. 2010-02-05 23:03:55 -05:00
Eratosthenes 9dfa0967b8 Correct data files. 2010-02-04 13:08:26 -05:00
Eratosthenes d2bc2fb5bf Merge branch 'master' of git://git.assembla.com/fpdboz 2010-02-03 14:53:16 -05:00
Eratosthenes 8c1ce3df7d Merge branch 'master' of git://git.assembla.com/fpdboz 2010-02-03 11:17:10 -05:00
Eratosthenes 5c6d4e4744 Merge branch 'master' of git://git.assembla.com/fpdboz 2010-02-03 10:37:54 -05:00
Eratosthenes 7e5e9ed93a Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-02-03 08:40:16 -05:00
Eratosthenes 7aa67c38b1 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2010-02-03 08:40:02 -05:00
Eratosthenes 8c81761c1b Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-02-01 18:38:23 -05:00
Eratosthenes aea7db22e3 Options for logging level and version. Not connected yet. 2010-02-01 18:37:36 -05:00
Eratosthenes 2a9c00953a Merge branch 'master' of git://git.assembla.com/fpdb-eric 2010-02-01 10:47:49 -05:00
Eratosthenes 03967fc227 Merge branch 'master' of git://git.assembla.com/fpdboz 2010-02-01 10:47:35 -05:00
Eratosthenes f406ba293e Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-02-01 10:47:26 -05:00
Eratosthenes 428d228de8 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-01-31 22:56:01 -05:00
Eratosthenes 3102ff733f Merge branch 'master' of git://git.assembla.com/fpdb-eric 2010-01-31 14:16:39 -05:00
Eratosthenes c7a9942f3a Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-01-31 14:16:21 -05:00
Eratosthenes 64bfa9cd52 Import mucked cards. 2010-01-31 13:37:59 -05:00
Eratosthenes 121d05596d Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-01-30 14:55:31 -05:00
Eratosthenes 6d9cdd9587 Fix problem where Qc is not encoded correctly. 2010-01-30 14:54:46 -05:00
Eratosthenes 1aa68a9075 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2010-01-29 12:06:44 -05:00
Eratosthenes 8fd2f8b82f Merge branch 'master' of git://git.assembla.com/fpdboz 2010-01-29 09:15:24 -05:00
Eratosthenes d11ad8f1ed Merge branch 'master' of git://git.assembla.com/fpdb-eric 2010-01-29 00:02:52 -05:00
Eratosthenes d7dad6f0fc Merge branch 'master' of git://git.assembla.com/fpdboz 2010-01-29 00:02:37 -05:00
Eratosthenes 7570db60f6 Make the StudMucked not crash with newimport. 2010-01-28 14:37:45 -05:00
Eratosthenes 92e20bcd12 Add more chars to player name in prev commit. 2010-01-27 23:16:11 -05:00
Eratosthenes d50e70fdd4 Another fix of FTP playername reg ex. 2010-01-27 20:10:07 -05:00
Eratosthenes 2ad7e430a2 Merge branch 'master' of git://git.assembla.com/fpdboz 2010-01-27 09:49:14 -05:00
Eratosthenes 2adf0158a4 Merge branch 'master' of git://git.assembla.com/fpdb-sql
Conflicts:
	pyfpdb/Database.py
	pyfpdb/PartyPokerToFpdb.py
2010-01-27 09:48:31 -05:00
Eratosthenes 080b7f80c9 Compile the " collected" reg ex. 2010-01-27 09:23:12 -05:00
Eratosthenes d75e5e3920 Fixed typos, pylint complaints, and obsolete TODOs. 2010-01-27 01:10:58 -05:00
Eratosthenes 30de5142db Ugly fix to ugly edge case where winner voluntarily showed cards. 2010-01-27 00:57:58 -05:00
Eratosthenes e0d11fe9a3 Fix problem with finding HHs for utf-16 files. 2010-01-27 13:10:50 +08:00
Eratosthenes 1ec6a36ece Merge branch 'master' of git://git.assembla.com/fpdb-sql
Conflicts:
	pyfpdb/Configuration.py
	pyfpdb/Database.py
2010-01-26 20:13:21 -05:00
Eratosthenes 7d7ba94da1 Fix problem with finding HHs for utf-16 files. 2010-01-26 10:56:07 -05:00
Eratosthenes 3630a289ad Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-01-26 10:01:39 -05:00
Eratosthenes 7683590898 Merge branch 'master' of git://git.assembla.com/fpdboz
Conflicts:
	pyfpdb/Configuration.py
2010-01-25 12:06:11 -05:00
Eratosthenes 90ea33c74b Needs to be executable. 2010-01-25 12:04:21 -05:00
Eratosthenes 358de81f3b Merge branch 'master' of git://git.assembla.com/fpdboz
Conflicts:
	pyfpdb/Configuration.py
	pyfpdb/Database.py
2010-01-22 20:55:13 -05:00
Eratosthenes 98e6566fc6 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2010-01-15 11:58:50 -05:00
Eratosthenes 4460f19608 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-01-15 11:58:39 -05:00
Eratosthenes 3f9fce0775 Merge branch 'master' of git://git.assembla.com/fpdboz
Conflicts:
	pyfpdb/PartyPokerToFpdb.py
2010-01-15 11:58:27 -05:00
Eratosthenes a12e9fe1b2 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-12-18 21:41:44 -05:00
Eratosthenes 0592b1c2c0 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-12-13 12:38:17 -05:00
Eratosthenes ea60cda961 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-12-09 20:25:44 -05:00
Eratosthenes e85608ee52 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-12-09 20:25:36 -05:00
Eratosthenes bb9f5553ce Merge branch 'master' of git://git.assembla.com/fpdboz 2009-12-09 20:25:25 -05:00
Eratosthenes c3c36e1e53 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-12-05 19:16:42 -05:00
Eratosthenes b483686019 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-12-05 19:16:36 -05:00
Eratosthenes a1bdf68dc2 Merge branch 'master' of git://github.com/grindi/fpdb-grindi 2009-12-04 12:16:38 -05:00
Eratosthenes 2863edf1df Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-12-04 12:16:26 -05:00
Eratosthenes 193944799d Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-12-04 12:16:17 -05:00
Eratosthenes 6987cf6584 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-12-04 12:16:10 -05:00
Eratosthenes b5e64fd747 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-12-01 10:26:14 -05:00
Eratosthenes f2947ce730 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-12-01 10:26:00 -05:00
Eratosthenes ef6d46b458 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-11-30 10:30:36 -05:00
Eratosthenes 9ced37a859 Merge branch 'master' of git://git.assembla.com/fpdboz
Conflicts:
	pyfpdb/Configuration.py
2009-11-30 10:30:11 -05:00
Eratosthenes 76680e8511 Merge branch 'master' of git://git.assembla.com/fpdboz
Conflicts:
	pyfpdb/Configuration.py
	pyfpdb/HUD_main.py
2009-11-29 19:56:32 -05:00
Eratosthenes c1f599d555 Merge branch 'master' of git://git.assembla.com/fpdboz
Conflicts:
	pyfpdb/Configuration.py
	pyfpdb/HUD_main.py
2009-11-23 19:41:47 -05:00
Eratosthenes ad91c0a526 Changes for logging. 2009-11-23 19:34:40 -05:00
Eratosthenes bdc3248597 Changes for new logging scheme. 2009-11-23 19:32:19 -05:00
Eratosthenes 2da6e44a75 Changes for improved logging. 2009-11-23 19:29:56 -05:00
Eratosthenes e10db69a9c Merge branch 'master' of git://git.assembla.com/fpdboz 2009-11-16 19:49:12 -05:00
Eratosthenes 812998704d Yet another try to fix missing X windows. Using xwininfo. 2009-11-16 15:35:58 -05:00
Eratosthenes 55f1ebedd9 Another possible fix to missing windows. 2009-11-16 13:04:25 -05:00
Eratosthenes 4abfc0093f test print 2009-11-16 11:48:31 -05:00
Eratosthenes d592e85375 Possible fix of not finding windows in X. 2009-11-16 11:20:44 -05:00
Eratosthenes 3ef23852a6 Update Tables_Demo to work with new XTables/TableWindow format. 2009-11-16 10:00:26 -05:00
Eratosthenes 4e78dd8d93 Merge branch 'master' of git://github.com/grindi/fpdb-grindi 2009-11-13 22:02:16 -05:00
Eratosthenes 85f488e9cb Fix pretty print test. 2009-11-11 16:25:31 -05:00
Eratosthenes a5b0de5ed2 Fix problem with .example overiding HUD_config. 2009-11-11 16:20:43 -05:00
Eratosthenes 65393492cf Get logging.conf and matplotlib datafiles. 2009-11-09 22:02:50 -05:00
Eratosthenes 1b980e7cad Fix merge gone wrong. 2009-11-09 19:31:32 -05:00
Eratosthenes 5021cae297 Clean up logging changes. 2009-11-09 19:30:23 -05:00
Eratosthenes b637247871 Fix for logging changes. 2009-11-09 19:24:46 -05:00
Eratosthenes c8b7608bc1 Delete intermediate prints. Small fix to make py2exe happy. 2009-11-08 23:16:56 -05:00
Eratosthenes e6b71d86bb Should be HUD_config.xml.example, not HUD_config.xml 2009-11-08 23:00:15 -05:00
Eratosthenes 0bbbc7222b First go at rationalizing config paths and logging defaults. 2009-11-08 22:53:10 -05:00
Eratosthenes b33fd03754 Added Configuration.py exe and HowTo use. 2009-11-08 22:51:15 -05:00
Eratosthenes efb0768b97 Merge branch 'master' of git://git.assembla.com/fpdboz
Conflicts:
	pyfpdb/SQL.py
2009-11-08 22:50:47 -05:00
Eratosthenes 99e4211e5d Integrate new table handling code. 2009-11-06 17:34:42 -05:00
Eratosthenes 2d890be3c8 Get the tableName right for tournaments. 2009-11-05 11:27:33 -05:00
Eratosthenes 3265766c77 Cleanup of HUD_main prior to integrating newTables code. 2009-11-03 21:52:40 -05:00
Eratosthenes 0a563cad53 Added get_table_info method. 2009-11-03 21:51:10 -05:00
Eratosthenes 27d570818e Merge branch 'master' of git://github.com/grindi/fpdb-grindi 2009-11-01 10:01:52 -05:00
Eratosthenes 39d4ba5220 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-10-31 17:05:14 -04:00
Eratosthenes 1e051e47ec Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-10-31 17:03:51 -04:00
Ray 645be07667 Make DS.py friendlier to stud and draw. 2009-10-28 22:00:05 -04:00
Ray e829ec56ef Merge branch 'master' of git://git.assembla.com/fpdboz 2009-10-27 11:43:55 -04:00
Ray 0ac559a2db Add a comment to a comment. 2009-10-26 16:50:17 -04:00
Ray fd31ecc0bf Minor problem with rogue merge info in HHC.py. 2009-10-26 11:19:44 -04:00
Ray 14115b759e Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-10-26 10:10:05 -04:00
Ray 9d42b46459 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-10-26 10:09:57 -04:00
Ray 971a282383 Merge branch 'master' of git://git.assembla.com/fpt_fpdb 2009-10-03 21:09:21 -04:00
Ray e69cbc30ea Merge branch 'master' of git://git.assembla.com/fpt_fpdb 2009-09-11 10:05:22 -04:00
Ray bd3f73bd58 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-09-11 10:05:08 -04:00
Ray 2b0c59eee9 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-09-11 10:04:57 -04:00
Ray 88d33dd4f4 Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-09-04 18:08:06 -04:00