Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-07 05:24:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
13291 commits 21 branches 243 tags 33 MiB
Commit graph

1681 commits

Author SHA1 Message Date
Eric House
98cb3b4930 cleanup 2022-04-22 07:59:50 -07:00
Eric House
ab29dfa6ce cleanup 2022-04-21 13:26:26 -07:00
Eric House
05e2d2bdb9 cleanup 2022-04-20 21:00:51 -07:00
Eric House
1c9fe6745c fix crash with 23x23 (linux only); allow 6 blanks 
Portuguese will want six blanks for a 21x21 board, so might as well
not crash in case that becomes a thing.
 2022-04-20 13:17:07 -07:00
Eric House
5d6d8c7499 bring in changes to make larger boards work for linux 
Includes making tile sets vary with board size, calculated from 15x15
unless present in the wordlist. Likely breaks android.
 2022-04-04 10:39:29 +02:00
Eric House
9568e4ab03 move extra counts into header so new dicts backward compatible 2022-04-01 07:51:13 +02:00
Eric House
cdc77eaf68 add board sizes to wordlist format (English only) 
Modify language metadata to have possibly different counts of tiles
for different board sizes. Make the necessary changes for loading such
files. Works on linux version at least. Only English will build for
now thanks to changes in info.txt format.
 2022-04-01 07:51:13 +02:00
Eric House
4b1795cd5b fix crashes when quad-{word,letter} present 2022-04-01 07:51:13 +02:00
Eric House
d0bda214e6 use the right number of bits to store larger scroll vals 2022-04-01 07:51:13 +02:00
Eric House
70d301f210 use the same bonus pattern for all sizes 
Just drop the outer "rings" where size < max
 2022-04-01 07:51:13 +02:00
Eric House
372d722b58 make number of tiles proportional to board size 
Until there's a way to specify specifically for each size, adjusting
from the built-in 15x15 tileset works reasonably well.
 2022-04-01 07:51:13 +02:00
Eric House
b34190d62d make 21x21 work on Android 
Still needs default colors and the bonus square values working for
smaller sizes.
 2022-04-01 07:51:13 +02:00
Eric House
cb2d847e6d add bonus squares for 21x21 board (linux only) 2022-04-01 07:51:13 +02:00
Eric House
1c644d7af0 fix wasm build 2022-03-14 07:42:47 +01:00
Eric House
2175600190 use new webapi to fetch mqttid to replace relayid 
And drop relay once we have it. Makes perfecting RelayService backoff
less an issue.
 2022-02-12 13:27:24 -08:00
Eric House
4bfcf2afb4 deal better with old relay games 
Attempting to stop calling the relay, but to let relay-only games finish
and issue invitations. Big changes are that relay is removed from games
if they have viable mqtt connections, and relay timers fire less often,
then eventually stop getting set if there are no active games. Result is
that a relay-only invitation won't likely be received, but there should
be few or none of those now.
 2022-02-10 08:28:34 -08:00
Eric House
acc17c2ce2 Don't connect to relay for games with mqtt 
I was determining I need to check the relay for messages if I have open
games using it. But they can also use mqtt, and the goal's go stop using
the relay. So only force the connection if the games can only connect
via relay. Once I've confirmed via a study of relevant databases that
all recent relay games are also connecting via mqtt this can ship, and
should stop nearly all relay traffic .
 2022-01-27 08:10:40 -08:00
Eric House
d22ffbec3f handle byod download links 
Download the thing and offer to open it on success.
 2022-01-24 20:48:13 -08:00
Eric House
2d6ce6cfda fix problems with tile picking introduced by 9-tiles 
Not sure if these would show up if you're not picking face-up,
but if so they justify a release.
 2022-01-20 22:14:13 -08:00
Eric House
5e028281de fix mis-reporting number of tiles traded 2022-01-17 16:31:19 -08:00
Eric House
d9b1fb4df6 cleanup -- no behavior change 2022-01-10 08:42:41 -08:00
Eric House
8095a0da54 fix uninitialized memory getting treated as a mqtt address 
augmentAddrIntrnl() sets the has-mqtt bit in comms->addr but not the
address data (has none). If that address had been loaded from stream
the address bits will be random, not 0, and so get treated as an
address.
 2022-01-08 18:55:53 -08:00
Eric House
2e5f6128f2 post new msg message from relay2 
This is to have a utility back, but mostly to start playing with being
able to send keepalives to a device that have nothing to do with moves.
 2022-01-06 19:07:08 -08:00
Eric House
a8963c952e use variable length ints to store msgID and len 2022-01-04 11:12:58 -08:00
Eric House
759cf12ecf set bingoMin 2022-01-03 20:23:00 -08:00
Eric House
38c80209c4 fix crashes and failure to connect 
Seems to be back to working now.
 2022-01-03 17:40:23 -08:00
Eric House
a85f5df4e3 another tweak: make version imply format 2021-12-29 07:35:43 -08:00
Eric House
b67ab9e32a refactor, and make msgids variable-length 2021-12-28 20:59:15 -08:00
Eric House
863ef88c22 add varible-length int encoding to streams 
And test code that should be removed from linux client at some point.
 2021-12-28 18:25:05 -08:00
Eric House
140e1210cc cleanup 2021-12-22 13:01:22 -08:00
Eric House
2b7daf067d shrink the comms header 
Sending in 32 bits what can probably fit in 8 -- twice -- is dumb. As is
sending the gameID (as connID) when it's already known. In 2016 I added
a fixed marker, so I can count on all current code sending that. If I
fail to find that, I know the sender is new (current release or better.)
In that case, use 12 bits instead of 32 for two fields, drop the marker
and the connID. Result is that an ACK's size, including MQTT headers,
drops from 28 bytes to 21.
 2021-12-21 16:34:04 -08:00
Eric House
0fa43a7394 remove duplicate code 2021-12-16 08:47:12 -08:00
Eric House
14c879a752 fix so ack format is same for DEBUG and RELEASE builds 
Was appending garbage to ACKs that, somehow, receiver didn't
mind. Fix. And use the new BEEF format for linux too.
 2021-12-15 10:03:09 -08:00
Eric House
79d77410a5 fix failure to send NO_SUCH_GAME over NBS 
Wasn't sending zero-length messages, which this one is. Needs testing,
because there must have been a reason for that test.
 2021-08-31 10:44:39 -07:00
Eric House
ea1c8125f8 use 16 bits to represent selected tiles 
fixes selection of 9th tray tile during trade
 2021-08-25 07:24:38 -07:00
Eric House
80f0e35755 allow trade when 7 tiles left, not 9 2021-08-24 21:24:17 -07:00
Eric House
694953c820 add support for trays with up to 9 tiles 2021-07-16 12:15:46 -07:00
Eric House
8f83a390f1 a bit o' cleanup 2021-06-30 11:47:26 -07:00
Eric House
e667291da5 show invitee name where possible 
When I've invited a Known Player, use that player's name in parens in
scoreboard and games list elem/summary until a remote device connects
(usually in response to an invitation) and provides an actual player
name. Makes it much easier to tell one pending game from another. And
doesn't really work (yet) where there's more than one remote player in
a game.
 2021-05-30 13:31:33 -07:00
Eric House
be698069a4 cleanup of recent changes 2021-05-14 11:34:15 -07:00
Eric House
daf5894d79 call new web api to ack mqtt messages 
This is toward debugging. Not sure it'll be use to add functionality yet.
 2021-04-19 07:04:58 -07:00
Eric House
92200779ac log connType in nli 2021-04-07 21:40:20 -07:00
Eric House
d74161958e cleanup: remove dead and use new code 2021-03-28 20:27:24 -07:00
Eric House
2a20caa6d7 fix breakage caused by merge 2021-03-27 11:00:06 -07:00
Eric House
64ff2e5f69 Merge branch 'android_branch' into wasm 2021-03-27 10:27:14 -07:00
Eric House
7a7a2db6ce enable chat (without history) 2021-03-24 15:58:25 -07:00
Eric House
561c5c9eb1 cleanup 2021-03-22 10:43:34 -07:00
Eric House
e3ba122ca0 fix to compile with XWFEATURE_RELAY undefined 
Didn't change the stream format. That will wait!
 2021-03-19 18:51:34 -07:00
Eric House
b1532f19a4 move getDict from dutil to util 
It's in the context of a game, and we might want info about the game
when notifying the user. For wasm, though, I just download after failure
to open. User has to try again to open the game. Good enough for now
since missing a wordlist shouldn't happen if you're not me changing
where they're stored.
 2021-03-19 17:27:17 -07:00
Eric House
87621c3b51 fix compile 2021-03-19 17:26:48 -07:00
Eric House
e86626d7be don't crash if remote doesn't support chat 2021-03-19 14:30:17 -07:00
Eric House
1aa3ddcde0 cleanup and tweaks 2021-03-19 14:30:17 -07:00
Eric House
585f55c040 use notifications and other tweaks 2021-03-19 14:29:49 -07:00
Eric House
bf88c000b7 fix mempool tracking bug 2021-03-19 14:29:49 -07:00
Eric House
f3b76da8e1 add more info to game "buttons" 
Toward a games-list substitute. New game_summarize method will get
fleshed out and eventually replace what's in jni?
 2021-03-19 14:29:48 -07:00
Eric House
b0cc6dd744 clear name on delete; remove logging 2021-03-19 14:29:48 -07:00
Eric House
829242c9bb fix to deal with failed downloads 2021-03-19 14:29:48 -07:00
Eric House
52b1300d90 cleanup; remove dead code 2021-03-19 14:29:48 -07:00
Eric House
970c2f6f9a make android compile/run with wasm changes 2021-03-19 14:29:20 -07:00
Eric House
34aee3d7d0 add remaining langs to code-to-lang table 2021-03-19 14:29:20 -07:00
Eric House
f0d8a71deb split dict faces using js so utf8 chars are ok 
As with java, the platform knows utf-8 better than vanilla C, so use a
JS inlined function to split a binary stream into its "face" components.
 2021-03-19 14:29:20 -07:00
Eric House
567c3dbf9e show mempool stats (DEBUG builds) 2021-03-19 14:27:04 -07:00
Eric House
4937d13273 use indexeddb for storage 2021-03-19 14:27:04 -07:00
Eric House
2a6931fdcf add and start using indexeddb via emscripten APIs 
Replace a couple of load/store actions with new APIs that do so
asynchronously (using indexeddb underneath, via emscripten APIs.)
Required restructuring how app starts. More changes to come. The idea is
to replace wordlist storage: this'll keep 'em smaller and not require
conversion to string.
 2021-03-19 14:27:04 -07:00
Eric House
d5e7dc4c97 game from a downloaded wordlist works!!!! 2021-03-19 14:27:04 -07:00
Eric House
afc3ff156e make game ask for dicts when needed 
It's awkward for platform code to create a dictionary prior to opening a
game whose data contains the information about what dict to open. So add
a dutil method to fetch a dict, and call it from inside game opening
code. Makes linux code better at least.
 2021-03-19 14:27:04 -07:00
Eric House
7924c046d6 fix linux compile 2021-03-19 14:27:04 -07:00
Eric House
06b530c443 add notion of index to storage 
I'm heading toward being able to know what all the games are by how
they're stored in a xplatform way. This is a start. Adding a second key
to storage, and looking at grouping everything where one key or the
other matches.
 2021-03-19 14:27:04 -07:00
Eric House
61be81cf1a invite known players 2021-03-19 14:27:04 -07:00
Eric House
534e245048 change load-from-storage to not require free() 2021-03-19 14:27:04 -07:00
Eric House
41cd3d8f39 open game to receive message 2021-03-19 14:27:04 -07:00
Eric House
23cb7bb85d unsigned->signed to fix drawing garbage in empty tiles 2021-03-19 14:27:04 -07:00
Eric House
74109ce172 fix to send after connect 2021-03-19 14:27:04 -07:00
Eric House
7dc949fb38 choose font sizes to fit 
Make on demand rather than guessing. Only wind up with six or so, so the
linear search is probably ok.
 2021-03-19 14:27:04 -07:00
Eric House
96829b5478 fix so release build builds 
without MEMDEBUG defined that is
 2021-03-19 14:27:04 -07:00
Eric House
880bff747d use js runtime for timers too 2021-03-19 14:26:18 -07:00
Eric House
c57471364f get URL-encoded invitation receipt working 2021-03-19 14:26:18 -07:00
Eric House
4612ca70c7 snapshot: message exchange mostly works 2021-03-19 14:26:18 -07:00
Eric House
e3814bf0eb snapshot: sends message to inviter 2021-03-19 14:26:18 -07:00
Eric House
9bc72d0745 move stream storage into super 2021-03-19 14:26:18 -07:00
Eric House
ec9570ab81 improve drawCell() 2021-03-19 14:26:18 -07:00
Eric House
d620461574 fix so all compile 2021-03-19 14:26:18 -07:00
Eric House
633896292a snapshot: drawing empty board 2021-03-19 14:26:18 -07:00
Eric House
b62ab69799 add missing file 2021-03-19 14:26:18 -07:00
Eric House
d5546b484d cleanup (mostly non-DBG compile errors) 2021-03-19 13:03:39 -07:00
Eric House
3f6f16c2f4 add script to print comms msg exchange details 2021-03-19 12:50:32 -07:00
Eric House
f335ea7ad9 remove or tweak logging 2021-03-19 12:50:28 -07:00
Eric House
5fa44e54fa remove unneeded .h file 2021-03-19 12:50:23 -07:00
Eric House
f9e1deabfc don't include dict tiles/values in initial server msg 
There's code on all platforms to force user to have dict prior to
opening a game or responding to an invitation. "Empty" dict play hasn't
made sense in a long time.
 2021-03-19 12:50:19 -07:00
Eric House
ca88d9c0bf backout ack change for now 2021-03-12 07:16:28 -08:00
Eric House
f947382f4c in comms, send ack on receipt of duplicate msg 2021-03-11 21:43:26 -08:00
Eric House
6c50fcb818 cleanup; make original tiles-values choice the default 
We've decided that on upgrade users shouldn't be surprised by a busy
board and unaware of how to fix it. So keep it the way it's been and let
the curious discover the new ability. Also, simplify code.
 2021-02-17 15:47:55 -08:00
Eric House
be0a6f83f3 drive letters/values from a three-value enum 
There are three choices now. The button pops up a menu on android and
moves through the choices on linux.
 2021-02-11 14:11:02 -08:00
Eric House
64f1d83b5d show-values mode now means show along with face 
not instead of. It now feels as if it should be a global setting, not a
per-game thing to toggle. We'll see what folks think.
 2021-02-10 20:43:11 -08:00
Eric House
d3cf74920e remove unused method 2021-02-10 19:37:19 -08:00
Eric House
0ea9b42db8 clear high-bit when generating gameIDs 
postgres DB, at least on ARM, doesn't like it.
 2021-01-25 07:58:49 -08:00
Eric House
ceec6e7468 fix crash verifying first tray can yield a move 
Had never needed an engine for a remote player before. So create one on
demand and nuke after use.
 2021-01-18 16:55:20 -08:00
Eric House
d41d5c700f don't let first player have unplayable rack 2021-01-09 20:39:33 -08:00
Eric House
64a470185c display known player timestamp when known (debug only) 
For some reason it's getting cleared sometimes. Will fix.
 2021-01-04 08:12:05 -08:00
Eric House
35bdd2282e limit pattern parse by max length of tiles 2020-12-27 11:53:36 -08:00