Commit graph

2197 commits

Author SHA1 Message Date
Vikram Rajkumar
38e5d91355 Merge commit '7f75be5ced9bbe6c0671b3dadc46bcaecc3c1beb' into bitshares 2016-11-17 15:13:02 -06:00
Roman Olearski
b1a8a3e503 cleaning unnecessary dumps and comments 2016-11-17 19:04:14 +01:00
Roman Olearski
1530f04882 added operation tournament_payout_operation 2016-11-17 18:04:32 +01:00
Vikram Rajkumar
2254fc62d6 Remove "applied epsilon logic" log message 2016-11-16 16:24:12 -06:00
Eric Frias
935dac7ae6 Fix crash in logging when one player fails to reveal their move 2016-11-16 15:57:35 -05:00
Eric Frias
0a6e25507e Fix compile warning 2016-11-16 15:10:10 -05:00
Roman Olearski
39b6bfd85e fixing problem : tournament never ends if "bye" matches present
adding tournaments' prize_pool to total  balances
2016-11-16 15:10:10 -05:00
Eric Frias
4ac87291ec Update fc 2016-11-16 15:08:31 -05:00
Eric Frias
6f164b718e Update timestamp in genesis file for latest testnet 2016-11-15 15:36:47 -05:00
Eric Frias
749ffb8688 Don't make the core asset a bitasset 2016-11-15 10:23:58 -05:00
Roman Olearski
5c3c8d9a8a fixing problem : tournament never ends if "bye" matches present
adding tournaments' prize_pool to total  balances
2016-11-14 20:18:44 +01:00
Erkan Yilmaz
5da213f62e remove doubled word: as
remove doubled word: as
2016-11-11 16:48:38 +01:00
Roman Olearski
b72eae0941 Merge branch 'rock-paper-scissors-ro' into rock-paper-scissors 2016-11-08 16:26:43 +01:00
Roman Olearski
1ae65da12a Added updated genesis.json 2016-11-08 16:07:50 +01:00
Roman Olearski
6abffc0963 Merge branch 'rock-paper-scissors' of http://syncad.storm.pl:56780/blocktrades/graphene into rock-paper-scissors 2016-11-08 15:57:57 +01:00
Roman Olearski
32b53434f9 Implementing propose_dividend_asset_update 2016-11-08 11:34:04 +01:00
Nathan Hourt
d7c51f26e3 Add more missing headers to install 2016-11-07 18:17:51 -06:00
Nathan Hourt
af6eb06a3e Add missing includes 2016-11-07 18:17:51 -06:00
Nathan Hourt
fc094d7114 Fix utilities CMakeLists.txt
Inconsistent capitalization of HEADERS variable, prevented installation from working properly
2016-11-07 18:17:51 -06:00
Nathan Hourt
0e42671a7e Merge pull request #21 from FollowMyVote/fixindex
Fix index.hpp
2016-11-07 17:57:14 -06:00
Nathan Hourt
dc9e0fa025 Fix index.hpp
Bad return type.
2016-11-07 17:44:57 -06:00
Nathan Hourt
c108a78b35 Resove #651: Make add_secondary_index return index
A pointer to the newly created index object is now returned.
2016-11-07 17:44:37 -06:00
Roman Olearski
58f1fdc46d Setting the core asset as test dividend asset inn genesis 2016-11-07 22:27:58 +01:00
Roman Olearski
0d8e3a31d5 Removing redundant line 2016-11-07 11:05:04 +01:00
Roman Olearski
26f47189f0 Creating default dividend asset 2016-11-07 10:18:18 +01:00
Roman Olearski
41f11bd63c Merge branch 'rock-paper-scissors' into rock-paper-scissors-ro 2016-11-02 18:11:59 +01:00
Roman Olearski
322c6472ba Merge remote-tracking branch 'origin/rock-paper-scissors' into rock-paper-scissors-ro 2016-11-02 18:10:00 +01:00
Eric Frias
6860a16115 Updated genesis file using initial balances calculated with market orders and collateral 2016-11-02 11:57:51 -04:00
Eric Frias
0ebcf00ae0 Fix tournament end_time not set bug #20 2016-11-02 10:57:39 -04:00
Roman Olearski
7f36b261bf Merge remote-tracking branch 'origin/dividends' into rock-paper-scissors
Adding new chain parameters
Distribute prize money when a tournament ends
2016-11-02 15:30:18 +01:00
Sigve Kvalsvik
f382c39835 Update gui_version to 2.0.161031 2016-10-31 10:27:13 +01:00
Roman Olearski
a17f2e48ed correcting "then" -> "than" 2016-10-28 20:27:24 +02:00
Roman Olearski
8b0cdacb11 Create new blockchain parameters for peerplays that can be voted on by committee members part 1 2016-10-28 19:35:49 +02:00
Eric Frias
f078fed4fd Properly sequence matches when there are more than two players in the tournament 2016-10-23 13:12:06 -04:00
Eric Frias
30874697cc Rework the API calls for tournaments, add an index for getting tournaments
registered by a given account
2016-10-21 12:14:37 -04:00
Eric Frias
72d48cf3d2 Remove redundant type_of_game field 2016-10-19 18:19:13 -04:00
Eric Frias
c4ad900026 Fix build error in member_enumerator when an operation includes an enum.
Implement the commit/reveal timeouts in RPS games, and generate automatic
("insurance") moves.  Make the CLI wallet watch for new games in
tournaments you're registered for.
2016-10-18 17:36:59 -04:00
Eric Frias
7c30da6b6d Simple two-player tournaments are working if you don't do anything fancy 2016-10-14 19:43:38 -04:00
abitmore
d10492452b Merge branch 'iPerky-patch-2' into bitshares 2016-10-14 00:13:57 +08:00
abitmore
82cf1a10af Merge branch 'patch-2' of https://github.com/iPerky/muse into iPerky-patch-2
Conflicts:
	libraries/app/application.cpp
2016-10-14 00:13:23 +08:00
abitmore
5d6da532ca Merge pull request #19 from roelandp/patch-1
Added my public seed node for bitshares2
2016-10-13 18:04:20 +02:00
iHashFury
4d0d3fb313 Update application.cpp
remove old seed node
2016-10-10 20:14:27 +02:00
roelandp
4251d40ab8 Added my public seed node for bitshares2
Type: Dedicated
Processor: Intel Xeon D-1521
Ram: 32 GB DDR4
HDD: 2 x 2 TB
Connection: 1 Gbit/s
Location: Canada

Next to my Steem Witness, I thought it would be nice to strenghten the BTS network. At first with a public seed, later with a witness application I think. See https://steemit.com/witness-category/@roelandp/witness-roelandp if you want to learn more about me and my witness.
2016-10-10 16:51:32 +02:00
Roman Olearski
5616fda018 Improving genesis block for PeerPlays
according http://syncad.storm.pl:56780/blocktrades/graphene/
        parameterizing csv log file name
2016-10-10 11:06:48 +02:00
Roman Olearski
2e3cd4a75c Improving genesis block for PeerPlays
according http://syncad.storm.pl:56780/blocktrades/graphene/
	improving, refactoring code - resigning from unsafe static_cast, implementing constructor copiny from base class
2016-10-08 22:25:18 +02:00
Roman Olearski
227c89a453 Improving genesis block for PeerPlays
according http://syncad.storm.pl:56780/blocktrades/graphene/issu
                part 2 adding csv log
            added column name
            added columns: initial balance, sahredrop
	    reseting sharedrops at the tail of the log
2016-10-07 21:05:42 +02:00
Roman Olearski
1a76276edc Improving genesis block for PeerPlays
according http://syncad.storm.pl:56780/blocktrades/graphene/issues/1
            part 2 adding csv log
        added column name
        added columns: initial balance, sahredrop
2016-10-07 16:09:10 +02:00
Roman Olearski
6bbb1a9e05 Merge branch 'rock-paper-scissors-ro' of http://syncad.storm.pl:56780/blocktrades/graphene into rock-paper-scissors-ro
Conflicts:
	libraries/plugins/generate_genesis/generate_genesis.cpp
2016-10-07 12:57:12 +02:00
Roman Olearski
3d1bb9cce4 Improving genesis block for PeerPlays
according http://syncad.storm.pl:56780/blocktrades/graphene/issues/1
        part 2 adding csv log
	added column name
2016-10-07 12:51:06 +02:00
Roman Olearski
e87563e6d6 Improving genesis block for PeerPlays
according http://syncad.storm.pl:56780/blocktrades/graphene/issues/1
        part 2 adding csv log
2016-10-07 12:11:28 +02:00