Commit Graph

25677 Commits

Author SHA1 Message Date
jl777
5fde22c3d8 Amulet -> level 26 2019-03-02 00:33:39 -11:00
jl777
a8ef36c29c Test version 2019-03-01 23:53:02 -11:00
jl777
0cf62abcbd MAX_MONEY capped at 63 bits - 1 2019-03-01 23:47:17 -11:00
jl777
fe8f69b08c unmult 2019-03-01 23:42:00 -11:00
jl777
5a39e09331 ASSETCHAINS_SUPPLY 2019-03-01 23:38:27 -11:00
jl777
f9913c7a5a Set max_money 2019-03-01 23:33:41 -11:00
jl777
a5475a30de Change amulet level to 26 2019-03-01 23:18:52 -11:00
jl777
b1c6959c48 Merge branch 'FSM' into jl777 2019-03-01 23:02:17 -11:00
jl777
34e2f97d23 Merge branch 'dev' into FSM
# Conflicts:
#	depends/packages/zeromq.mk
#	src/assetchains.json
2019-03-01 23:01:41 -11:00
jl777
80ebb738d5 Merge remote-tracking branch 'origin/jl777' into jl777 2019-03-01 22:59:42 -11:00
jl777
b652f8d13b Merge branch 'FSM' into jl777 2019-03-01 22:59:36 -11:00
jl777
02426cdbe9 Merge pull request #1300 from Alrighttt/jl777
add libboost-dev as dependency
2019-03-01 22:59:25 -11:00
Alrighttt
c3fcff8b3b add libboost-dev to README as dependency 2019-03-02 10:57:05 +01:00
Alrighttt
84b30e4698 Merge pull request #4 from jl777/jl777
merge latest jl777
2019-03-02 10:54:37 +01:00
jl777
72c2649727 Enforce 63 bit nValue limits 2019-03-01 22:43:16 -11:00
jl777
1db23db8b7 Enforce player data at height 50000 2019-03-01 22:26:30 -11:00
jl777
f09977ecbc Merge pull request #1299 from tonymorony/patch-1
ensuring that rogue update
2019-03-01 21:47:51 -11:00
Anton "TonyL" Lysakov
07b3f1ab54 ensuring that rogue update 2019-03-02 15:40:35 +07:00
jl777
42f52b2ffa -endif 2019-03-01 20:53:24 -11:00
jl777
3d8d0a3e21 Endif 2019-03-01 20:52:46 -11:00
jl777
92510adcf1 Local files 2019-03-01 20:51:03 -11:00
jl777
68eb679ecf Destpubtxid 2019-03-01 19:31:48 -11:00
jl777
3e889f3db0 -print 2019-03-01 08:57:28 -11:00
jl777
448ecdbdd1 +print 2019-03-01 08:51:11 -11:00
jl777
7934163db1 Merge pull request #1298 from jl777/jl777
bigfixes
2019-03-01 05:28:47 -11:00
jl777
c33ea43249 -print 2019-03-01 02:52:21 -11:00
jl777
7a761304c5 -print 2019-03-01 02:47:51 -11:00
jl777
4744a6f6c3 Break out of infinite loops! 2019-03-01 02:40:17 -11:00
jl777
0b23f62737 +print 2019-03-01 02:23:22 -11:00
jl777
1dcc19e22f Finally 2019-03-01 02:09:06 -11:00
jl777
cc42fe2a86 ; 2019-03-01 01:54:13 -11:00
jl777
c02c249c22 newval 2019-03-01 01:53:32 -11:00
jl777
3f64e818b7 cur_money 2019-03-01 01:52:06 -11:00
jl777
1f8591b0e9 Fixes 2019-03-01 01:47:09 -11:00
jl777
50acda6640 +prot 2019-02-28 20:28:06 -11:00
jl777
973124163e Lockflag 2019-02-28 20:14:38 -11:00
jl777
e06dcabe9e +/- prints 2019-02-28 19:56:19 -11:00
jl777
2e04207920 +print 2019-02-28 19:45:45 -11:00
jl777
0cea17dea9 +print 2019-02-28 19:32:56 -11:00
jl777
1adc843ab2 +print 2019-02-28 19:12:57 -11:00
jl777
094a153bea Remove while loop waiting for send 2019-02-28 18:29:57 -11:00
jl777
6bdfbc9fcb Merge branch 'FSM' into jl777 2019-02-28 17:35:54 -11:00
jl777
79c574a316 Merge pull request #1297 from dimxy/tokens-opret-blobs
Tokens opret blobs - support for old-style assets opret blob
2019-02-28 17:35:41 -11:00
dimxy
6b6f4ee29f corr condition to '>=2' in detect old-style data (for 'o' asset cancels) 2019-03-01 00:25:31 +05:00
dimxy
792dab26b6 corr opretid for old-style assets 2019-03-01 00:10:50 +05:00
dimxy
be8befeed5 detect old style opret: assets support, more funcids support 2019-02-28 23:37:47 +05:00
jl777
98b11ee2f6 Merge branch 'FSM' into jl777 2019-02-28 07:10:39 -11:00
jl777
3a4e404569 Merge pull request #1296 from Mixa84/FSM
Fix token vout number for Gateways
2019-02-28 07:10:23 -11:00
Mihailo Milenkovic
2056d59c7e Fix token vout number for Gateways 2019-02-28 19:05:44 +01:00
jl777
b1d6351702 Merge pull request #1295 from blackjok3rtt/dev
Dev
2019-02-28 06:53:54 -11:00