Keir
|
db5327d2e4
|
Online reports can now be updated without re-sending all the data (ie we don't want to update all the chat messages when a member of staff handles a report).
Misc. changes and fixes.
|
2015-12-16 15:51:01 +00:00 |
|
Keir
|
cd18d2a94f
|
ReportServer fixes and improvements.
|
2015-12-16 15:05:00 +00:00 |
|
Keir
|
6f82f8349d
|
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
# Conflicts:
# Plugins/.idea/modules.xml
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
|
2015-12-16 14:07:56 +00:00 |
|
Keir
|
b5149d2da7
|
Implemented williams frontend design.
|
2015-12-16 00:22:55 +00:00 |
|
Keir
|
6d9bcb8e66
|
Reworked serialization and store more data in json files for later parsing.
Internally store UUIDs for reports and convert them as needed for display to user.
Many other misc. changes and refactorings.
|
2015-12-15 21:30:45 +00:00 |
Shaun Bennett
|
211e440e67
|
Merge remote-tracking branch 'remotes/origin/master' into develop
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
|
2015-12-15 15:00:14 -05:00 |
|
Shaun Bennett
|
aef704d972
|
Slight winter reward rarity changes
|
2015-12-15 14:58:09 -05:00 |
|
Shaun Bennett
|
5f14d6675f
|
Fix shard values
|
2015-12-15 14:56:19 -05:00 |
|
Shaun Bennett
|
07f610d4bd
|
More Fixes
|
2015-12-15 14:45:12 -05:00 |
|
Shaun Bennett
|
607c164753
|
Merge remote-tracking branch 'remotes/origin/clans/alpha' into develop
|
2015-12-15 13:55:01 -05:00 |
|
Shaun Bennett
|
b9a688c4e7
|
Update monthly bonuses
|
2015-12-15 13:07:49 -05:00 |
|
Shaun Bennett
|
e3e757da8a
|
Fix mounts owned count
|
2015-12-15 13:06:11 -05:00 |
|
Shaun Bennett
|
3edba0fac6
|
Fix Grinch Hat
|
2015-12-15 12:28:06 -05:00 |
|
Shaun Bennett
|
f2107b7b79
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-12-15 12:07:40 -05:00 |
|
Shaun Bennett
|
2216fdc52c
|
Dont disable new gadgets in games
|
2015-12-15 12:07:34 -05:00 |
NewGarbo
|
c63bac6433
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-12-15 11:42:16 +00:00 |
libraryaddict
|
47ad563596
|
Spawn nametags far far away from players
|
2015-12-15 22:46:30 +13:00 |
Cheese
|
871c97f7af
|
changed chest %'s
|
2015-12-15 09:25:44 +11:00 |
|
NewGarbo
|
9137fcfe40
|
loads of changes (pvp timer, unsafe stuff)
|
2015-12-14 12:39:00 +00:00 |
|
Cheese
|
0f38c7b287
|
increased minimum coal
|
2015-12-14 22:12:50 +11:00 |
|
Cheese
|
951cd65903
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-12-14 22:05:22 +11:00 |
|
Cheese
|
045bc760c2
|
increassed cooldown, people getting trapped perm
|
2015-12-14 22:05:08 +11:00 |
|
Cheese
|
809ff649be
|
lowered rarities a bit
|
2015-12-14 22:03:09 +11:00 |
|
Shaun Bennett
|
7181a26e58
|
Remove pointless equals()
|
2015-12-14 05:56:39 -05:00 |
|
Cheese
|
9e72e5adf1
|
nicer text
|
2015-12-14 21:43:11 +11:00 |
|
Cheese
|
daa9f165b1
|
removed coins from gadgets
|
2015-12-14 21:41:47 +11:00 |
|
Cheese
|
0ecd5a05f5
|
fixed hat ownership
reduced coal cost
|
2015-12-14 21:32:06 +11:00 |
|
Cheese
|
00de6880ba
|
fixed wrong types
|
2015-12-14 21:25:30 +11:00 |
|
Cheese
|
342e9f2345
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-12-14 20:53:49 +11:00 |
|
Cheese
|
1189535748
|
icon fixes
|
2015-12-14 20:53:34 +11:00 |
|
Shaun Bennett
|
816c057eb3
|
Notify server about opening chest
|
2015-12-14 04:49:44 -05:00 |
|
Shaun Bennett
|
daf1d29ce0
|
Fix Carl
|
2015-12-14 04:44:11 -05:00 |
|
Shaun Bennett
|
50bf97ae4a
|
Fancy treasure changes
|
2015-12-14 04:19:15 -05:00 |
|
Cheese
|
670eaa1954
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-12-14 19:16:03 +11:00 |
|
Shaun Bennett
|
e4fd97467f
|
More treasure changes
|
2015-12-14 03:14:52 -05:00 |
|
Cheese
|
288c20fc74
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-12-14 19:13:05 +11:00 |
|
Cheese
|
9e35399d1d
|
rarities tweaked + shards
|
2015-12-14 19:09:55 +11:00 |
|
Shaun Bennett
|
db9db558a0
|
Update GUI slots
|
2015-12-14 02:56:07 -05:00 |
|
Shaun Bennett
|
4afca01ad0
|
Treasures!
|
2015-12-14 02:49:51 -05:00 |
|
Cheese
|
c508b5ea96
|
chest visuals
|
2015-12-14 18:13:19 +11:00 |
|
Shaun Bennett
|
063c87c4fe
|
Merge remote-tracking branch 'origin/master'
|
2015-12-14 00:29:11 -05:00 |
|
Shaun Bennett
|
cdbcae7e3e
|
Cosmetic Menu Update
|
2015-12-14 00:28:28 -05:00 |
|
Cheese
|
048a9a81b8
|
gadget ammo should no logner be purchasable
|
2015-12-14 16:20:39 +11:00 |
|
Cheese
|
7f9e5c4ec9
|
more coal
|
2015-12-14 16:06:49 +11:00 |
|
Cheese
|
f6f04fe256
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-12-14 16:04:05 +11:00 |
|
Cheese
|
55fffdad59
|
fixed some colors
|
2015-12-14 16:03:51 +11:00 |
|
Shaun Bennett
|
e8b0e5dd8e
|
Fix IntellIJ Files
|
2015-12-13 23:51:47 -05:00 |
|
Cheese
|
bccade55bc
|
reduced coal fumes size
|
2015-12-14 15:43:45 +11:00 |
|
Shaun Bennett
|
5be91de006
|
Merge master
|
2015-12-13 23:40:18 -05:00 |
|
Shaun Bennett
|
fe3431ba04
|
Cosmetic Menu Update
|
2015-12-13 23:31:21 -05:00 |