Commit Graph

57 Commits

Author SHA1 Message Date
Cooldude2606
d238fa8825 Merge branch 'WIP' into Testing 2017-04-25 18:23:08 +01:00
Cooldude2606
8bd75b1090 Input acctions blocked (abilty to) 2017-04-25 18:22:30 +01:00
Cooldude2606
2b4de7cf1c 0.15 Ready 2017-04-25 17:42:48 +01:00
Cooldude2606
55ac27054c Fixed Jail 2017-04-09 00:34:17 +01:00
Cooldude2606
b92a4af064 Bug fix 2017-04-08 19:50:49 +01:00
Cooldude2606
75d76dc0ff Added more saveVar() 2017-04-08 19:12:32 +01:00
Cooldude2606
c3428e9a22 More Bug Fixes 2017-04-07 21:59:26 +01:00
Cooldude2606
c2b142d712 Missed One 2017-04-07 20:10:54 +01:00
Cooldude2606
6f99d25e3a Merge branch 'WIP' into Testing 2017-04-07 20:07:08 +01:00
Cooldude2606
89fd43c05c Many Many Bug Fixes Later 2017-04-07 20:07:00 +01:00
Cooldude2606
5f68bf8062 Promote/Demote Testing 2017-04-07 17:35:27 +01:00
Cooldude2606
fcf33b4ff3 Merge branch 'WIP' into Testing 2017-04-07 16:15:45 +01:00
Cooldude2606
3d548641fb Inproved the autoRank 2017-04-07 16:11:30 +01:00
Cooldude2606
2bcc10d544 Tool bar now goes off of the required. 2017-04-07 15:50:21 +01:00
Cooldude2606
8d4a162014 Player List Updated and auto rank system 2017-04-07 14:15:00 +01:00
Cooldude2606
c1cee6256d Start Of Old to New Rank system (0.15 pre) 2017-04-07 13:36:22 +01:00
Cooldude2606
77b8d85602 Merge branch 'WIP' into Testing 2017-04-07 13:12:27 +01:00
Cooldude2606
83736bfeb2 Working Globle Table 2017-04-07 13:06:23 +01:00
Cooldude2606
2d102e4f4b Step 1 Testing 2017-04-07 11:03:40 +01:00
Cooldude2606
8772358aa3 Globle Var step 1 2017-04-07 10:31:49 +01:00
Cooldude2606
a0ab66d70a Admins can see admin panle 2017-04-02 00:32:07 +01:00
Cooldude2606
d2236b61fb Fixed typo 2017-03-28 20:41:18 +01:00
Cooldude2606
08c38a61bc Merge branch 'Testing' 2017-03-27 17:48:24 +01:00
Cooldude2606
900610c1f9 Testing save only to server for players.json 2017-03-27 17:46:25 +01:00
Cooldude2606
5be6ca91f5 Merge branch 'Testing' 2017-03-26 20:47:18 +01:00
Cooldude2606
8166814226 Merge branch 'WIP' into Testing 2017-03-26 20:42:27 +01:00
Cooldude2606
9ef5c65b79 Fixed the look of the new textfileds 2017-03-26 20:42:18 +01:00
Cooldude2606
d0af9ec423 Adding to server infor 2017-03-26 20:24:02 +01:00
Cooldude2606
79faf96d47 Merge branch 'Testing' 2017-03-26 16:04:41 +01:00
Cooldude2606
63bca4ebba Merge branch 'WIP' into Testing 2017-03-26 16:04:37 +01:00
Cooldude2606
44b408d982 Fixing order 2017-03-26 16:04:30 +01:00
Cooldude2606
120324380f Merge branch 'master' into WIP 2017-03-26 15:58:53 +01:00
Cooldude2606
b7b40d63d5 Revert "Merge branch 'Testing' into WIP"
This reverts commit b929f8fb90.
2017-03-26 15:55:27 +01:00
Cooldude2606
ba6bcb717f Merge branch 'Testing' 2017-03-26 15:55:15 +01:00
Cooldude2606
b929f8fb90 Merge branch 'Testing' into WIP 2017-03-26 15:54:57 +01:00
Cooldude2606
287952311b Add rules 2017-03-26 15:54:39 +01:00
Cooldude2606
7f96bf26c5 Merge branch 'Testing' 2017-03-25 21:45:39 +00:00
Cooldude2606
40ec5c3120 Auto message every 15 minutes 2017-03-25 21:45:25 +00:00
Cooldude2606
533e975a5e Merge branch 'Testing' 2017-03-25 20:39:02 +00:00
Cooldude2606
8a22dde149 forgot to minify 2017-03-25 20:38:50 +00:00
Cooldude2606
876f12458b Merge branch 'Testing' 2017-03-25 20:36:14 +00:00
Cooldude2606
87a6f9d0b3 Fixed a testing error 2017-03-25 20:36:00 +00:00
Cooldude2606
e9f69fde54 Merge branch 'Testing' 2017-03-25 11:12:44 +00:00
Cooldude2606
f732e9382d Used same compression on tick to hour/minute 2017-03-25 11:04:18 +00:00
Cooldude2606
de5213d601 Merge branch 'WIP' into Testing 2017-03-25 10:59:53 +00:00
Cooldude2606
d971d7e5e8 inprovements to auto message 2017-03-25 10:55:05 +00:00
Cooldude2606
39f5ba20c5 Merge branch 'Testing' 2017-03-24 20:45:58 +00:00
Cooldude2606
3b08a64172 Merge branch 'WIP' into Testing 2017-03-24 20:32:08 +00:00
Cooldude2606
aed031e095 Fix a big error in the player list 2017-03-24 20:31:44 +00:00
Cooldude2606
b80b6677a8 Merge pull request #2 from badgamernl/Testing
Test to master
2017-03-22 21:28:46 +00:00