Commit graph

2197 commits

Author SHA1 Message Date
Sigve Kvalsvik
f79b1ff105 Update gui_version 2017-01-23 16:22:33 +01:00
Sigve Kvalsvik
25ac355512 Update gui_version 2017-01-18 16:09:24 +01:00
Vikram Rajkumar
48a02d72fb Merge branch 'bitshares' of github.com:bitshares/bitshares-core into bitshares 2017-01-17 16:42:52 -06:00
Vikram Rajkumar
ef356a15a6 Update submodules 2017-01-17 16:42:33 -06:00
Vikram Rajkumar
0053613b38 Add genesis.json to .gitignore to exclude from git grep 2017-01-16 18:33:39 -06:00
Sigve Kvalsvik
2d168790bb Update gui_version 2017-01-16 15:41:47 +01:00
Vikram Rajkumar
c7e0e27bff Clean up CMake modules 2017-01-13 16:37:50 -06:00
Vikram Rajkumar
f270b65597 Revert "Add a command-line option to witness_node, --disable-permessage-deflate"
This reverts commit c39f97885d.
2017-01-12 17:47:44 -06:00
Eric Frias
4674fc53ab Allow generate_genesis plugin to quietly do nothing when you don't specify the block number on the witness's command line. 2017-01-04 17:19:48 -05:00
Eric Frias
2012fe6e90 Allow generate_genesis plugin to quietly do nothing when you don't specify the block number on the witness's command line. 2017-01-03 16:45:14 -05:00
Eric Frias
1018221812 quiet signed/unsigned warning 2017-01-03 16:44:56 -05:00
Roman Olearski
d9413b8780 enhancing tournaments test 2016-12-05 11:27:19 +01:00
Roman Olearski
21268b92ab correcting conslusion -> conclusion 2016-12-02 22:08:33 +01:00
Roman Olearski
8048d1c35e quality assessment of get_random_bits randomness 2016-12-02 21:43:12 +01:00
Roman Olearski
0f6d312d3e Merge branch 'rock-paper-scissors' of http://syncad.storm.pl:56780/blocktrades/graphene into rock-p
aper-scissors

solving conflict: libraries/chain/game_object.cpp
2016-12-02 12:06:44 +01:00
Roman Olearski
ac73f34045 little correction for #12 Add tournament rules to prevent a game from lasting too long due to ties 2016-12-02 12:01:37 +01:00
Eric Frias
e82ed755b2 [DLN] fix non-insurance case to avoid random reveals 2016-11-30 10:12:45 -05:00
Eric Frias
d28d9e96a1 Remove BTS sharedrop 2016-11-29 15:53:39 -05:00
Roman Olearski
e16b9d0610 fxing #11 Fix operation of "insurance" parameter
implementing	#12 Add tournament rules to prevent a game from lasting too long due to ties
2016-11-29 17:38:37 +01:00
Roman Olearski
787019617f Summary commiting changes made since the last commit
modified:   libraries/app/impacted.cpp
	modified:   libraries/chain/db_init.cpp
	modified:   libraries/chain/db_maint.cpp
	modified:   libraries/chain/game_object.cpp
	modified:   libraries/chain/include/graphene/chain/protocol/operations.hpp
	modified:   libraries/chain/include/graphene/chain/protocol/tournament.hpp
	modified:   libraries/chain/protocol/tournament.cpp
	modified:   libraries/chain/tournament_object.cpp
	modified:   libraries/wallet/wallet.cpp
	modified:   programs/witness_node/main.cpp
	modified:   tests/CMakeLists.txt
	modified:   tests/common/database_fixture.cpp
	new file:   tests/tournament/tournament_tests.cpp
2016-11-28 12:36:18 +01:00
Roman Olearski
b9508c6da8 little correction for solution ...issues/#10 avoid generating dividend_payout virtual operations for zero-size payouts 2016-11-28 09:06:29 +01:00
Roman Olearski
eadbae0808 solution ...issues/#10 avoid generating dividend_payout virtual operations for zero-size payouts 2016-11-26 16:03:33 +01:00
Roman Olearski
81c9e98d7b solution ...issues/#7 Allow vesting core tokens to vote and receive dividends 2016-11-25 19:40:25 +01:00
Roman Olearski
f2c0157bb7 avoiding generating tournament payout operation if zero payout
updating tournaments tests
2016-11-25 18:01:32 +01:00
Roman Olearski
278c9b1683 solution proposal for ...issues/#7 Allow vesting core tokens to vote and receive dividends 2016-11-25 11:23:06 +01:00
Roman Olearski
85d7a30f87 improving tournament prize distributing for assets other then core asset 2016-11-24 17:17:59 +01:00
Roman Olearski
bf8e46bf8d Merge branch 'rock-paper-scissors' of http://syncad.storm.pl:56780/blocktrades/graphene into rock-paper-scissors 2016-11-23 11:35:58 +01:00
Roman Olearski
a66af8b072 enhancing tournament_payout operation according issues 8 9 2016-11-23 11:33:24 +01:00
Eric Frias
85914fb3b4 Remove code that was resetting the game timer each time a player made a move 2016-11-22 18:30:34 -05:00
Eric Frias
a00b6cc8a1 Disalbe excessive logging, fix a bug that was preventing a game from ending
even after all reveal moves  moves were made
2016-11-22 17:47:33 -05:00
Roman Olearski
2320be1f55 tournaments tests - correcting max min calculations 2016-11-22 20:30:19 +01:00
Roman Olearski
ac9c301092 tournaments tests - randomizing number of wins 2016-11-21 20:38:49 +01:00
Roman Olearski
cf6f3a15fd generating tournament payout operation 2016-11-21 18:11:31 +01:00
Vikram Rajkumar
653866ba5b Merge commit 'ae4bc619e45efd2010ccaad059ee305d1e8c1f59' into bitshares 2016-11-20 17:28:28 -06:00
Roman Olearski
16e7104c8e adding two assets tournaments test 2016-11-20 18:39:48 +01:00
Fabian Schuh
ae4bc619e4 Merge pull request #666 from Erkan-Yilmaz/patch-1
remove doubled word: as
2016-11-20 13:42:29 +01:00
Vikram Rajkumar
4dc1001a9b Update README 2016-11-18 17:14:37 -06:00
Vikram Rajkumar
7d721a1654 Decrease default p2p log level to avoid filling disk on initial sync 2016-11-18 17:07:19 -06:00
Vikram Rajkumar
a0dbcfc798 Merge commit '80ada64' into bitshares 2016-11-18 16:35:46 -06:00
Vikram Rajkumar
20b4ee7671 Merge commit 'a748d4c' into bitshares 2016-11-18 16:26:01 -06:00
Vikram Rajkumar
04871734c2 Merge commit '5f79b66'; commit '96efc4d'; commit '33fe8e9'; commit 'b21fb0c' into bitshares 2016-11-18 16:24:29 -06:00
Vikram Rajkumar
7eadc1e5da Merge commit '0f4e033'; commit 'a878b35'; commit 'd79f0f2' into bitshares 2016-11-18 16:08:01 -06:00
Vikram Rajkumar
82ea7e0e1d Update docs submodule 2016-11-18 15:55:10 -06:00
Vikram Rajkumar
015f195951 Remove abandoned P2P rewrite 2016-11-18 15:52:32 -06:00
Roman Olearski
740b07404a implementing tournament tests 2016-11-18 19:51:38 +01:00
Vikram Rajkumar
4eaef390a3 Decrease printing frequency during replay 2016-11-17 16:39:31 -06:00
Vikram Rajkumar
64e27bde93 Fix build 2016-11-17 15:56:11 -06:00
Vikram Rajkumar
13569d2d37 Merge commit 'a3cfa1055edb016d8d3b80258657862668f8598f' into bitshares 2016-11-17 15:39:56 -06:00
Vikram Rajkumar
75f238d15f Remove unreachable seed nodes 2016-11-17 15:37:32 -06:00
Vikram Rajkumar
4e4a359fb9 Merge commit '5da213f' into bitshares 2016-11-17 15:17:27 -06:00