Keir
|
77595c8fbc
|
Allow search form to be loaded when no identifier is supplied (error messages are a bit crappy atm I'm aware).
|
2015-12-18 16:20:57 +00:00 |
Keir
|
bd887e1eef
|
Make search box functional.
|
2015-12-18 15:52:20 +00:00 |
Keir
|
2e02b9c8ea
|
Hide WIP rank label.
Fix spelling issue.
|
2015-12-17 17:43:36 +00:00 |
Keir
|
ad9620bb3d
|
Fix formatting.
|
2015-12-16 16:02:45 +00:00 |
Keir
|
3ecb4c7fb8
|
Report handlers are now parsed and displayed correctly.
|
2015-12-16 16:01:19 +00:00 |
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
|
9c7c6fdb37
|
Don't treat these ints as strings (quicker comparison).
|
2015-12-16 13:58:05 +00:00 |
Keir
|
56d606adf0
|
Constants cannot hold arrays.
|
2015-12-16 13:38:48 +00:00 |
Keir
|
b5149d2da7
|
Implemented williams frontend design.
|
2015-12-16 00:22:55 +00:00 |
William Burns
|
958399be59
|
Merge branch 'feature/report' of ssh://184.154.0.242:25565/min/mineplex into feature/report
|
2015-12-15 22:17:15 +00:00 |
William Burns
|
bc88a35cea
|
Add my first design!
|
2015-12-15 22:17:05 +00:00 |
Keir
|
398fcfdcba
|
Update php code to parse new report data.
Main class is now view.php.
|
2015-12-15 22:13:23 +00:00 |
Keir
|
5528c7c885
|
Push iml file.
|
2015-12-15 21:55:42 +00:00 |
Keir
|
1042032836
|
Update the web side to handle to handle the new changes.
|
2015-12-15 21:36:54 +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
|
92b82d786b
|
Don't give Winter Holiday Chests to offline players
|
2015-12-15 13:34:47 -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
|
6a346790f7
|
disable tutorial
|
2015-12-15 12:00:56 +00:00 |
NewGarbo
|
1da04b84b5
|
test push (change version to 0.17d)
|
2015-12-15 11:57:33 +00: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
|
52394c89dd
|
fixed skins beign wrong way around
|
2015-12-14 21:34:27 +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
|
6ec8ec4c01
|
Merge pull request #97 in MIN/mineplex from william-gladiators to master
* commit 'd91e4ab4f756746b31c7ebdd3e7d33c139ea7d30':
Another door bug, and a title fix.
Health looks nicer.
Bug fixes. Title shortened.
|
2015-12-14 03:45:55 -06: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 |