Commit Graph

23574 Commits

Author SHA1 Message Date
jl777
26adb60f2a Missing funds 2019-02-10 02:29:25 -11:00
jl777
366ade08a0 Merge nonfungible 2019-02-10 02:28:14 -11:00
jl777
0a87322d84 Merge branch 'FSM' into jl777
# Conflicts:
#	src/cc/CCinclude.h
#	src/cc/CCtokens.cpp
#	src/cc/CCtx.cpp
#	src/wallet/rpcwallet.cpp
2019-02-10 02:24:24 -11:00
jl777
bcdae3fbb8 Merge pull request #1233 from dimxy/non-fungible-tokens-sq
Non fungible tokens support
2019-02-10 02:20:55 -11:00
jl777
fdd1d04b10 dapp loading player data 2019-02-10 02:17:59 -11:00
dimxy
a42b9198df logging param changed to "cctokens" "ccassets" 2019-02-10 17:48:24 +05:00
jl777
a98a2413e8 Ismine and datastr 2019-02-10 01:24:51 -11:00
jl777
9919b39bce Remove gametxid.vout[1] usage 2019-02-10 01:15:06 -11:00
dimxy
14f1da959c non-fungible tokens support (three-eval token vouts) added in CCtokens (additional opret data)
non-fungible tokens support added in assets
logging changed in CCtokens.cpp for bitcon LogPrintStr with -debug=<category> support
2019-02-10 17:04:55 +05:00
jl777
5e6c99ebec Test 2019-02-10 00:32:33 -11:00
jl777
144b37028a Fix 2019-02-10 00:31:31 -11:00
jl777
666935b936 Add normal input to use playerdata 2019-02-10 00:28:01 -11:00
jl777
2e9f18d3dc vout.size() 2019-02-10 00:25:30 -11:00
jl777
3bf01610b9 Registered state 2019-02-10 00:23:10 -11:00
jl777
b3fb937beb Not pending if all slots filled 2019-02-10 00:13:42 -11:00
jl777
071e83e28b Remove second vout for new game 2019-02-09 23:26:31 -11:00
jl777
de6477bd52 Playertxid 2019-02-09 23:18:21 -11:00
jl777
b94b392d05 Test 2019-02-09 23:14:31 -11:00
jl777
e34d070c29 Double print 2019-02-09 23:11:49 -11:00
jl777
5e21713f8f :: 2019-02-09 23:08:31 -11:00
jl777
3c5c8f3599 oi_know 2019-02-09 23:06:57 -11:00
jl777
3cc3c3abed Details print 2019-02-09 22:48:41 -11:00
jl777
612cabbfea 'Q' 'y' 2019-02-09 22:38:02 -11:00
jl777
ddf8f6a0dd Syntax 2019-02-09 22:34:43 -11:00
jl777
f16510e7c2 Rogue iterate 2019-02-09 22:32:55 -11:00
jl777
564a7aece8 Make sure item strings are there 2019-02-09 22:25:09 -11:00
jl777
d5db98b42c mypk = pubkey2pk(Mypubkey()); 2019-02-09 22:14:53 -11:00
jl777
5cda0241b4 +print 2019-02-09 22:07:32 -11:00
jl777
cb5f7eaaa1 Auto broadcast rogue rpc tx 2019-02-09 21:55:50 -11:00
jl777
dbb7d7f6e7 syntax 2019-02-09 21:38:43 -11:00
jl777
6584d3c477 - ; 2019-02-09 21:36:24 -11:00
jl777
7c68ae4363 Char 2019-02-09 21:35:43 -11:00
jl777
defb298184 Players rpc call 2019-02-09 21:34:30 -11:00
jl777
1f5b5b7394 Player data extraction 2019-02-09 20:25:52 -11:00
jl777
a68d3a00a2 Move to chainparams.cpp 2019-02-09 04:01:39 -11:00
jl777
eae8207fe8 mainParams.consensus. 2019-02-09 03:56:03 -11:00
jl777
d103970fed mainParams 2019-02-09 03:51:36 -11:00
jl777
cec11785df consensusParams 2019-02-09 03:50:42 -11:00
jl777
be6279d62d ASSETCHAINS_BLOCKTIME 2019-02-09 03:44:03 -11:00
jl777
0a0d0ffa18 Merge branch 'FSM' into jl777 2019-02-08 16:14:54 -11:00
jl777
411df1eb9f test 2019-02-08 02:35:00 -11:00
jl777
edd1b42590 Test 2019-02-08 02:29:46 -11:00
jl777
c71dc476b5 - 2019-02-08 02:26:41 -11:00
jl777
97bc919d2f Test 2019-02-08 02:26:11 -11:00
jl777
4fa5d89659 Test 2019-02-08 02:23:39 -11:00
jl777
652f1dc199 Skip rev 2019-02-08 02:09:22 -11:00
jl777
54c02fe3ab +print 2019-02-08 01:59:53 -11:00
jl777
35daec70b1 ReacceptWalletTransactions don't remove from wallet if initial block download 2019-02-08 01:20:00 -11:00
jl777
e5198d57b2 -print 2019-02-07 07:31:00 -11:00
jl777
f40a353e08 >> keystrokes.log 2019-02-07 07:27:00 -11:00