morgan/Grinch-AP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,144 Commits 3 Branches 10 Tags
71dd1da24dfeb85c9806d5146ddd25927faedfd8
Commit Graph

126 Commits

Author SHA1 Message Date
Chris Wilson
db6642f290 Update WebUI to show unique items as a different color, and with a drop-shadow 2021-02-02 22:58:22 -05:00
Fabian Dill
cf49cd5e4b Mark Advancement items in the client 2021-02-03 03:19:25 +01:00
CaitSith2
50888eaa6b Merge branch 'main' into multishop 2021-01-22 05:51:52 -08:00
CaitSith2
ba224535dc Actually count recognized checks for the total. 2021-01-22 05:51:11 -08:00
CaitSith2
e2be997866 Merge branch 'main' into multishop 2021-01-21 17:01:45 -08:00
CaitSith2
d3915ba41f Server side location ids such as cheat console no longer listed as missing. 2021-01-21 16:55:40 -08:00
CaitSith2
aa22653bfc Fix for servers that don't return checked items. 2021-01-21 16:22:15 -08:00
CaitSith2
8754c63d4e client/server changes 
* Server now includes checked locations as a separate list.
* If client connects to a server that sends checked checks, client can now give accurate information on checked locations, and not show "New Check: seed-unknown-location (total/216)" and instead accurately show "New check: 'seed-known-location' (total_checked/seed_total)"
/missing now accurately reports what was previously checked.
* client now attempts to translate "Unknown Location ID: 'ID'" into an actual location, if server is unaware of the location, but the client is.
 2021-01-21 16:21:51 -08:00
Fabian Dill
7ce9278123 Use shutil.move instead of os.replace, for compatibility 2021-01-21 23:58:30 +01:00
CaitSith2
0992959bc8 Fix for servers that don't return checked items. 2021-01-21 00:12:53 -08:00
CaitSith2
dbd99c31ad client/server changes 
* Server now includes checked locations as a separate list.
* If client connects to a server that sends checked checks, client can now give accurate information on checked locations, and not show "New Check: seed-unknown-location (total/216)" and instead accurately show "New check: 'seed-known-location' (total_checked/seed_total)"
/missing now accurately reports what was previously checked.
* client now attempts to translate "Unknown Location ID: 'ID'" into an actual location, if server is unaware of the location, but the client is.
 2021-01-20 20:58:07 -08:00
Fabian Dill
2833d99eda only print new check once in web ui 2021-01-21 05:34:45 +01:00
CaitSith2
dfc64266b9 Fix missed instances of ctx.ui_node.log_info 2021-01-20 00:30:54 -08:00
Fabian Dill
2e32ab152e Merge branch 'main' into multishop 
# Conflicts:
#	MultiClient.py
 2021-01-20 03:17:08 +01:00
Fabian Dill
276d49981e Convert WebUI to logging.Handler subclass 2021-01-19 06:37:35 +01:00
Fabian Dill
f3e686ba9a Move Shop related stuff to a Shops module 2021-01-16 02:23:23 +01:00
CaitSith2
6ab2caf37b Take Any cave locations now known by MultiClient. 2021-01-10 17:42:58 -08:00
CaitSith2
a8475c38b2 Merge branch 'multishop-all' into multishop 2021-01-10 05:38:54 -08:00
pepperpow
4250004f11 Added Shop ID constant and forfeit values 2021-01-10 05:11:45 -06:00
CaitSith2
1848e5e8bc Whoops, need this block to actually send items. 2021-01-09 22:38:30 -08:00
CaitSith2
c4b4ec8fba No longer need the safety checks. 2021-01-09 18:53:09 -08:00
Fabian Dill
e36c6e97c1 Merge remote-tracking branch 'pepper/multishop-all' into multishop 
# Conflicts:
#	EntranceRandomizer.py
#	Rom.py
#	WebHostLib/static/static/playerSettings.json
#	data/basepatch.bmbp
 2021-01-09 16:03:59 +01:00
Fabian Dill
6c8d30bbe0 Allow Multiclient to log name of not yet known connection errors 2020-12-29 19:22:42 +01:00
pepperpow
ffe5b4b1a1 Fixes to clients/servers for shop checks 2020-12-15 02:34:22 -06:00
Fabian Dill
c31e38debe restore fxpak special handling, as it is apparently still needed. 
Also slightly improve it.

This reverts commit ee933698
 2020-12-01 22:23:37 +01:00
Fabian Dill
ce7aaf5c8c warn when data could not be sent to snes 2020-12-01 21:57:18 +01:00
Fabian Dill
5128657349 allow setting remaining_mode from server options 2020-11-30 21:07:02 +01:00
Fabian Dill
be02136a1b revert QUSB2SNES port change (seems it sometimes doesn't host on this port and then things break) 2020-11-11 12:53:53 +01:00
Fabian Dill
dc8a7133a3 Allow qusb2snes to configure itself (now that it has a menu on first run) and bind to port 23070 2020-11-11 12:36:02 +01:00
Fabian Dill
ee9336983c Remove SD2SNES special handling 
Requires QUSB2SNES 0.7.19
 2020-11-11 12:21:37 +01:00
CaitSith2
b1fe3d3e7b Insert key drop locations in alphabetical order. 2020-10-28 01:49:38 -07:00
CaitSith2
7e3e2134e0 Add option to client for actually forcing item sending safety off. 2020-10-27 16:27:39 -07:00
CaitSith2
66894dbd86 Add further safeties to sending of location checks. 
This safety is able to be turned off, but has to be done so on EVERY connection explicitly.
 2020-10-27 16:24:21 -07:00
CaitSith2
5c403086d9 Get server side missing list on connect. 
This initial missing list does NOT report all of its missing locations into the console.  It is however used for a couple of things.
* Client now uses this to determine if it should send the location check to the server. No point in doing so if the server isn't going to register it anyways.
* Allows an easy view of previously visited locations in the case of a save wipe.
 2020-10-27 12:08:35 -07:00
CaitSith2
83db79815a Make multiclient/multiserver/tracker keydropshuffle aware 2020-10-27 00:53:32 -07:00
Fabian Dill
70752d332f Delay consecutive reconnects 2020-09-01 21:45:01 +02:00
Fabian Dill
d92c461ad3 open webui only after asking for repatching in text console, as it can otherwise be easily missed. 2020-08-11 21:59:43 +02:00
Fabian Dill
9445527249 Multiclient: use new romname for persistent storage 2020-07-17 15:50:00 +02:00
Fabian Dill
d9e7248ebc fix multiclient trying to webhost on the same port it determined as web_ui socket 2020-07-15 23:10:08 +02:00
Fabian Dill
2338d25b39 expand rom auto_start to be customizable 2020-07-15 17:19:16 +02:00
Fabian Dill
c5ece240c4 MultiClient: fix authenticating against older server 2020-07-14 16:19:04 +02:00
Fabian Dill
ea9e103cb0 update rom name handling 2020-07-14 04:48:56 +02:00
Fabian Dill
38fe292acb allow aliases in tracker and prevent them from causing html/js/database "stuff" 
Though technically they can still do unicode "stuff"
 2020-06-24 13:29:40 +02:00
caitsith2
f6a7acad19 Send game finished state on connect 2020-06-23 06:03:21 -07:00
Fabian Dill
7353b489ce add available hint points to UI 2020-06-15 06:30:51 +02:00
Chris
e11f33b589 Update WebUI to display server, check, and hint info. CURRENT HINT POINTS DO NOT WORK YET 2020-06-14 18:04:03 -04:00
Fabian Dill
9d067b6f00 improve gui 2020-06-10 19:57:01 +02:00
Fabian Dill
8a0bae0252 Merge pull request #103 from Berserker66/patch_changes 
Allow patch.py to mass adjust roms. (It asks on first slot, and if yes is said, applies to ALL patches.)
Allow patch.py store target server address for patch.
 2020-06-08 18:22:53 +02:00
Fabian Dill
9612e27531 correct webuidata log to debug level 2020-06-08 18:21:04 +02:00
Fabian Dill
f9a29d3140 fix disable web ui 2020-06-07 23:14:07 +02:00