xwords

mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-09 05:24:44 +01:00

Author	SHA1	Message	Date
Eric House	39983f65b6	remove logging	2014-02-27 21:44:25 -08:00
Eric House	025bcb885b	don't move state forward when should be moving back	2014-02-09 19:35:17 -08:00
Eric House	0b132661ca	change struct name from r to rr for easier searching; no code change	2014-02-07 21:12:45 -08:00
Eric House	ca8a901bbb	add assertion aimed at confirming theory about race-condition based Android crash	2014-02-07 07:41:50 -08:00
Eric House	e34cc9007d	fix problems with opening and using wordlists on 64-bit linux by making XP_U32 32 rather than 64 bits. Duh. Do same on Android jni just in case.	2014-01-07 06:58:20 -08:00
Eric House	b43855a313	fix curses build for 64bit compile and to use common layout (meaning tray is now under the board unstead of to the right). Works on 64-bit system at least for non-networked games.	2014-01-05 13:04:59 -08:00
Eric House	3f67afaefb	replace tabs with spaces; no code change	2014-01-05 12:57:46 -08:00
Eric House	f46f8ed560	cleanup	2013-12-30 07:08:42 -08:00
Eric House	b2b4c2a1f5	fix android compile errors	2013-12-27 19:32:56 -08:00
Eric House	762945857e	fix to work for standalone games too	2013-12-19 07:59:00 -08:00
Eric House	2a47c91a91	add gi_setNPlayers()	2013-12-17 21:54:02 -08:00
Eric House	de41802f54	rename variable so I don't trip up again	2013-12-17 21:08:27 -08:00
Eric House	f1f13c65a2	don't overwrite gameID	2013-12-16 08:05:56 -08:00
Eric House	4420049bd0	remove duplicate lines (added by merge?)	2013-12-16 08:05:35 -08:00
Eric House	b5d6c513a6	add canUndo to GameStateInfo and use to hide the undo menu	2013-12-03 07:06:48 -08:00
Eric House	94216a5fb9	add canTrade to GameStateInfo, pass through to java world, and use to determine whether to show trade menuitem	2013-12-01 21:53:41 -08:00
Eric House	9fa9ba643f	fix linux crash when timers enabled: clear timer while taking down board	2013-12-01 18:50:18 -08:00
Eric House	fc6d6ec707	use local variable	2013-12-01 18:37:21 -08:00
Eric House	6875eaa10a	don't draw timer if it has an empty rect	2013-12-01 18:32:51 -08:00
Eric House	9f22386bf6	another assert	2013-11-29 10:15:22 -08:00
Eric House	0cc45ad865	add new field canHideRack to GameStateInfo and use it to disable menu.	2013-11-17 13:54:21 -08:00
Eric House	14c7b7370a	fix layout bug where board overlapped tray	2013-11-16 18:31:14 -08:00
Eric House	088dd1bd75	center board when it must be narrower than screen	2013-11-15 20:46:22 -08:00
Eric House	7d1a1228f0	fix bug where scrolling used when shrinking would suffice	2013-11-14 06:56:11 -08:00
Eric House	c9ba7b2fe1	When timer fires for pen held on board, don't do anything if we're in trade mode.	2013-11-10 07:08:49 -08:00
Eric House	dfdbd9a8a2	pass scoreWidth separately into formatting code so space can be left for network status icon.	2013-11-09 05:34:23 -08:00
Eric House	38613a85d3	make active rect for empty board 3x3 for a bit more context	2013-11-08 06:34:41 -08:00
Eric House	a26dced506	drawing tray tiles can fail, e.g. when font info not yet available, so only clear bits when successful. Fixes problem where tray didn't get drawn until tiles were somehow invalidated.	2013-11-07 07:29:54 -08:00
Eric House	bb80cdfb08	Merge branch 'android_branch' into android_thumbnail Conflicts: xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardCanvas.java xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java	2013-11-07 05:25:51 -08:00
Eric House	499e07d84b	follow convention: width usually comes before height	2013-11-05 06:38:48 -08:00
Eric House	9c9a04025a	Merge branch 'android_branch' into android_thumbnail Conflicts: xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java	2013-11-04 06:20:53 -08:00
Eric House	9f1b0c5121	Specify relative height of scoreboard and tray in board_figureLayout, and allow those to be 0.	2013-11-04 06:19:33 -08:00
Eric House	5a65bca12a	add board functions to figure layout (position and size of board, tray, etc.), removing need for each client to do it itself.	2013-11-03 12:12:25 -08:00
Eric House	b9d0469cfe	fix OFFSET_OF ptr size to quiet compiler	2013-11-01 19:09:05 -07:00
Eric House	d7a1f53157	Merge branch 'android_branch' into android_thumbnail Conflicts: xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java	2013-10-31 08:13:39 -07:00
Eric House	182ea7f862	make it possible to set DrawCtxt after opening/creating game	2013-10-31 08:06:44 -07:00
Eric House	88af10552e	don't try to draw with null dctx	2013-10-31 06:35:00 -07:00
Eric House	26f5a0b269	add two out params giving number of cols and rows	2013-10-29 07:50:12 -07:00
Eric House	88b380503e	add function, not compiled by default, to return bounding rect of all non-empty tiles. As a test, add menu that uses it to grey out that region.	2013-10-27 21:51:30 -07:00
Eric House	53e6db5683	remove return from middle of function	2013-10-27 21:47:49 -07:00
Eric House	8fa5e3e4bd	drop duplicate packet rather than asserting	2013-09-11 07:30:12 -07:00
Eric House	a25d664eb5	Merge branch 'from_android_beta_65' into android_branch Conflicts: xwords4/android/XWords4/res/raw/changes xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java	2013-09-09 08:01:28 -07:00
Eric House	94b2eddda6	fix crash by adding byte protocol expects	2013-09-09 07:42:00 -07:00
Eric House	da3f62729b	Merge tag 'android_beta_64' into android_branch beta 64	2013-08-07 06:18:15 -07:00
Eric House	a38fd0e96c	fix too-short tray on 10" tablet by making height a 16-bit value, not 8-.	2013-08-06 21:56:10 -07:00
Eric House	1f877c7567	remove logging	2013-07-29 07:29:01 -07:00
Eric House	a191c6fc2a	don't add chats to queue at len 64 rather than 128	2013-07-22 06:12:06 -07:00
Eric House	573a87993e	Don't propogate chat when queue too full. This should only impact tests since users won't keep chatting at a non-responsive friend.	2013-07-20 08:01:56 -07:00
Eric House	27d9f3de45	Don't enable chat when more than 128 messages are in queue to prevent an extremely unlikely cause of stalls -- and make tests trip over full queues less often.	2013-07-18 07:37:45 -07:00
Eric House	62dacb83d8	fix to compile when DEBUG not defined	2013-07-16 08:17:46 -07:00
Eric House	ab1ae7c9ad	remove logging	2013-07-12 08:19:53 -07:00
Eric House	9e358ad413	don't insert a new message in queue if it's identical to the one currently at the end. This mostly happens when devices are making several initial client connection attempts before succeeding.	2013-07-12 07:34:12 -07:00
Eric House	a522266ce4	add message checksumming for android too by making it part of util (compiled out by default)	2013-07-10 08:05:47 -07:00
Eric House	5462a05692	Merge branch 'gtk_multigame' into android_branch	2013-07-09 19:35:26 -07:00
Eric House	bf1cdf225c	print queue less frequently	2013-07-09 19:32:49 -07:00
Eric House	79f07e8751	cleanup	2013-07-09 07:19:20 -07:00
Eric House	d50c808f96	Merge branch 'android_branch' into gtk_multigame Conflicts: xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java xwords4/common/comms.c xwords4/linux/cursesmain.c xwords4/linux/cursesmain.h xwords4/linux/gtkmain.c xwords4/linux/gtkmain.h xwords4/linux/linuxmain.c xwords4/linux/main.h xwords4/linux/scripts/discon_ok2.sh xwords4/relay/xwrelay.cpp (Note: The curses app crashes on exit with mempool assertions, but that's a problem before the merge.)	2013-07-09 07:18:00 -07:00
Eric House	a3de759d9e	fix to compile on Android when DEBUG set	2013-07-07 19:40:07 -07:00
Eric House	923d41e0ee	fix to compile when DEBUG not set	2013-07-07 13:17:26 -07:00
Eric House	bbac923f68	assert queueLen at the point where it'll be easier track why it's overgrowing	2013-07-05 21:32:41 -07:00
Eric House	e6248210a5	when formatting final scores, print all players with top score as Winner (fixing bug that occurred in case of a tie)	2013-07-04 12:37:10 -07:00
Eric House	7229535be7	insist on non-0 channel ID net of mask; don't send acks when we don't have a connID yet, as this confuses the server. This fixes assertions in testing that were pretty common when chat was enabled; it may also fix the reported problem on Android that games get hosed when people are using chat, as the server's response (without the assert) was to add a new channel.	2013-07-03 07:39:05 -07:00
Eric House	3364dcbf46	remove unused enum	2013-07-03 07:26:23 -07:00
Eric House	858d00332a	when an initial message from a client arrives with channel already set, drop it (after asserting in debug code.) I'm not yet sure why this happens, but giving it a new channel is not the right move.	2013-07-02 18:49:48 -07:00
Eric House	1f63745e34	add more logging in search of channelNo bug	2013-07-01 07:54:38 -07:00
Eric House	c77021231c	print checksums of sent and received messages	2013-06-30 08:33:29 -07:00
Eric House	b31858ee5e	log rather than assert when hostid changes -- though I'm not seeing this now that the relay doesn't send packets to the wrong device	2013-06-26 00:42:55 -07:00
Eric House	6d22c3ab86	tweak logging	2013-06-22 05:51:29 -07:00
Eric House	d41c1a4ca8	add new param so pending text can be drawn differently when it's not the player's turn.	2013-05-30 07:17:13 -07:00
Eric House	8e8b4755b3	bring in changes from gtk_multigame to remove assertion fail when connname gets changed by relay due to failure to ack it (which happens when a large number of games is being run in a test.)	2013-05-30 06:48:29 -07:00
Eric House	31c443e4b1	Merge branch 'android_branch' into gtk_multigame Conflicts: xwords4/android/XWords4/src/org/eehouse/android/xw4/GCMIntentService.java xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java	2013-05-22 07:01:08 -07:00
Eric House	b58fe30ecc	add synonyms to tile counts/values summary	2013-05-14 22:00:22 -07:00
Eric House	7d8cddb31f	Merge branch 'android_branch' into gtk_multigame Conflicts: xwords4/linux/gtkmain.c xwords4/linux/linuxmain.c xwords4/relay/xwrelay.cpp	2013-05-08 07:37:55 -07:00
Eric House	5a026ffda3	merge android_wordlists (local branch)	2013-05-01 06:39:31 -07:00
Eric House	541fc546ab	remove that bit from flags -- since we already do the right thing for it.	2013-04-20 19:46:35 -07:00
Eric House	07cfdad699	fix to support synonyms within specials too -- for linux only so far. Seems to work, though the dawg2dict.pl script is broken.	2013-04-09 07:43:04 -07:00
Eric House	3a628f4375	load new-format dict into linux client, display default faces correctly, and search using alternate as well as default faces. Next: support for alternate specials.	2013-04-06 11:43:57 -07:00
Eric House	567cd2913a	Merge remote-tracking branch 'origin/android_branch' into android_branch	2013-04-06 05:32:10 -07:00
Eric House	bd1a909321	assert, in debug-only code, that saved moves alternate between players and are ordered. I've seen games in the wild with three moves in a row by the same player and want to catch this in testing.	2013-03-01 07:49:26 -08:00
Eric House	2bfda1b56d	function to print StackMoveType	2013-02-22 21:34:53 -08:00
Eric House	d78a4979da	HACK: if gi's notion of gameID is out of sync, force it in (logging the fact). I'm not sure why but this is required sometimes on Android.	2013-01-28 07:01:49 -08:00
Eric House	3e723c72c5	call comms_stop() before closing (removing from memory) a game.	2013-01-28 06:52:32 -08:00
Eric House	3be45a67f7	fix erroneous asserts: it's uncommon but ok for a device to get assigne a second connname. (Cause: failure of relay to receive the device's ACK.)	2013-01-26 18:56:53 -08:00
Eric House	c839db4a25	disconnect from relay no matter what the state	2013-01-22 06:12:55 -08:00
Eric House	f6e7ece578	add comms_stop() and an assert to make sure it's called. Explicit stop and a message to the relay when using a UDP socket makes up for there being no notification of connection closing.	2013-01-16 06:31:09 -08:00
Eric House	565b742971	snapshot -- connects to relay but doesn't play yet.	2013-01-07 08:00:47 -08:00
Eric House	e0dc83ed70	rest of what I just meant to commit.	2013-01-05 16:08:47 -08:00
Eric House	4af30c534c	snapshot. New game button works and game gets saved in DB. Next: display and open from DB.	2013-01-05 16:08:19 -08:00
Eric House	78670e9650	fix bug: include wordlist name in bad word info passed into util function	2012-12-29 07:48:31 -08:00
Eric House	83b1d4c364	fix compiler warnings	2012-12-08 06:40:21 -08:00
Eric House	5463535265	don't increase backoff if there wasn't actually anything to send.	2012-11-14 05:42:47 -08:00
Eric House	c4df31892e	Fix occasional infinite loop of devices sending and receiving the same message over and over when getting updated by GCM. The problem occurred when one device had an un-ACKable initial message still in its queue. I call resendAll a lot, which caused that message to get resent to the other game which then replied without being able to ACK it so it remained to be sent again. This would continue until users moved forward in the game. The fix is to add a backoff timer to resendAll() so that it can't loop. The timer is reset when an ackable and new message is received, meaning there's been a change in what's available to resend. And since users calling resendAll manually expect it to do something, add a force param that ignores the backoff. seems to fix the problem (but needs a lot of testing.)	2012-11-13 21:25:03 -08:00
Eric House	cf8d30ce5d	tweak logging; fix uninitialized debug-only variable	2012-11-13 21:18:52 -08:00
Eric House	57ea768aaf	refuse to send 0-length messages. That may happen only when the stupid curses client calls server_initClientConnection over and over, but reduces unnecessary messaging in that case at least.	2012-11-13 07:22:48 -08:00
Eric House	43b1e219f3	add a bit more logging to comms	2012-11-13 06:14:36 -08:00
Eric House	1316ae4b67	Fix relay devid protocol to deal with case where client submits a ID_TYPE_RELAY id that's not in the devices table (as has happened when a device switches relay URLs during testing, but might also happen if I have to delete an entry from the devices table.) In that case, return ID_TYPE_NONE to the client, which will be its clue to delete its ID_TYPE_RELAY id and submit the platform-specific id again. Note: android won't compile this revision thanks to util.h change	2012-11-10 15:05:44 -08:00
Eric House	f1ee77882b	Send devid with RECONN as well as CONN so games present when device upgrades can also use GCM. Tested on relay but not device.	2012-11-09 06:54:12 -08:00
Eric House	9ad28908bb	assert enum within range	2012-11-06 07:07:14 -08:00
Eric House	03108f311a	Merge branch 'android_branch' into android_gcm	2012-11-05 06:14:21 -08:00
Eric House	59937b8514	modify how devids are handled on the relay and the protocol through which they're communicated to the device. Device is expected to have a platform-specific notion of ID which the relay stores in a new devices table and indexes with a 32-bit number which is returned to the device -- which is encouraged but not required to use it in lieu of the longer ID in future communications. Modify linux client and test script to use the relay-supplied id. Some of this is commented out for now.	2012-11-03 10:58:01 -07:00
Eric House	e66ddc3765	make stream_catString work with null ptr	2012-11-01 21:08:58 -07:00
Eric House	7135e30fe9	add missing ifdef	2012-11-01 07:58:36 -07:00
Eric House	3469975d2a	add, still disabled by compile-time flags, code to transmit device ID (e.g. ID Android devices get via GCM) to relay and to associate it there with messages that need to be delivered.	2012-10-30 07:01:47 -07:00
Eric House	e7d5be06e9	fix crash when old client connects to new host by making host use the right version test in deciding what to send.	2012-10-27 08:52:54 -07:00
Eric House	b097e0825e	fix linux crash do to casting problem	2012-10-26 06:49:15 -07:00
Eric House	aec03fc572	When a game's consumated and guest discovers it isn't using the same dict, give chance to switch, and to download if required. Because of the way the JNI thread works, and JNI's requirement in general that env instances match up (e.g. dicts must be destroyed in the same thread that creates them), substituting into a live game is too hard. So the game's saved with its new dict and then reloaded.	2012-10-24 07:17:21 -07:00
Eric House	13c74cfbd5	protect changeDict feature with compile-time flags (since it can't be used on Android)	2012-10-24 06:46:54 -07:00
Eric House	c69dbda36f	add new game_changeDict() and enough gtk code to test it.	2012-10-23 19:06:00 -07:00
Eric House	528c061156	report host-chosen dict name a bit later	2012-10-15 06:21:08 -07:00
Eric House	e90c5ee94f	pass index of resigning player into util_notifyGameOver. Not yet passed into java.	2012-10-09 05:31:12 -07:00
Eric House	3221fb237a	Make state disallow hints when game over	2012-10-08 07:21:36 -07:00
Eric House	e64ecfb78d	implement resign on top of existing endGame logic, adding "quitter" as new param passed to remote and changing final score formatting and menu items to match. Still need to show old menu on android in case where game has already ended.	2012-10-07 12:47:06 -07:00
Eric House	4e0c7923d9	fix bug with clean target introduced when BUILD_DIR was introduced	2012-10-07 12:14:47 -07:00
Eric House	968340f665	Fix release-build warnings that new compiler flags.	2012-10-07 11:43:50 -07:00
Eric House	fd9b9f85e2	make util_hiliteCell conditional, and remove from android where it wasn't used anyway.	2012-10-05 18:51:32 -07:00
Eric House	2c89f13383	add turn as param to util_turnChanged, and call from server rather than board.	2012-09-27 07:04:57 -07:00
Eric House	94103a4212	track time of most recent turn start, and include it in summary table.	2012-09-27 06:55:46 -07:00
Eric House	6ddd4a61c1	fix compile errors (mostly unused variables) found by gcc on latest Ubuntu (12.04).	2012-09-25 07:28:02 -07:00
Eric House	140c982d41	merge from android_branch	2012-09-24 07:39:44 -07:00
Eric House	4fa5c61e14	add option to build in a separate directory, for e.g. case where source files are on ro filesystem.	2012-09-17 06:48:53 -07:00
Eric House	ad67f31573	saveToken can be 0 when only gi is being saved	2012-09-15 15:19:23 -07:00
Eric House	4f18f01cb8	don't malloc(0)	2012-09-11 19:17:10 -07:00
Eric House	5c683f173a	add mem_stream_make_sized, meant to make saving games more efficient	2012-09-11 19:06:27 -07:00
Eric House	0ccc2331b5	address bug where message was getting ACK'd by a device that failed to save what it had ACK'd leaving the game permanently broken. Do that by adding a new method game_saveSucceeded() called after the client claims to have committed bytes returned by game_writeToStream() to disk. In that method comms updates the value it'll use in subseqent ACKs.	2012-09-10 07:31:45 -07:00
Eric House	95a7b14a3a	transmit dict's md5sum along with name in initial message from host to guest. On guest, pass that sum into client code along with names so the appropriate tests can be done and corrections taken.	2012-09-08 20:23:48 -07:00
Eric House	9a72f252ed	Merge branch 'android_branch' into android_dictname	2012-09-08 13:20:59 -07:00
Eric House	7d51ee99d9	add dict_getMd5Sum	2012-09-08 10:09:31 -07:00
Eric House	5fa9b60846	add md5Sum field to dict struct, and on linux load it if present, otherwise calculate it. In DEBUG builds always calculate and assert they match.	2012-09-07 20:34:06 -07:00
Eric House	07e6239699	transmit name of failing dict	2012-09-06 08:01:11 -07:00
Eric House	509c832f2f	more progress: copy dict name into badwordinfo and free it successfully	2012-09-06 07:49:05 -07:00
Eric House	2f8b6cceb5	pass additional param into callback -- unused so far.	2012-09-06 07:19:12 -07:00
Eric House	4325d4e709	Merge branch 'android_branch' into android_dictname	2012-09-05 19:30:50 -07:00
Eric House	1ec03e48bb	plug leak: don't alloc stream when it won't be used	2012-09-05 19:09:01 -07:00
Eric House	71c1fc527a	add counter to mpool tracking so easier to find source of leaks	2012-09-05 19:08:22 -07:00
Eric House	270a19f3aa	Revert "first of a set of changes to communicate to clients dictionary being" This reverts commit `b7a0f1489b`, which I didn't mean to check in on this branch.	2012-09-03 21:34:51 -07:00
Eric House	ea4d805d5f	first of a set of changes to communicate to clients dictionary being used by server. Clients need to care if e.g. the server's disallowing phonies based on its dict. Can only be sent if client is of latest version. In that case, common code calls into new util function. In future changes, BoardActivity's implemention of the callback will need to check if the server's choice of dict is available, and if not offer to download it. Once it's available, will want to install it.	2012-09-03 21:33:46 -07:00
Eric House	b7a0f1489b	first of a set of changes to communicate to clients dictionary being used by server. Clients need to care if e.g. the server's disallowing phonies based on its dict. Can only be sent if client is of latest version. In that case, common code calls into new util function. In future changes, BoardActivity's implemention of the callback will need to check if the server's choice of dict is available, and if not offer to download it. Once it's available, will want to install it.	2012-09-03 21:29:21 -07:00
Eric House	4cb848582e	fix edge cases in prefix matching	2012-08-28 07:35:11 -07:00
Eric House	145317426d	Fix prefix matching to accept letters constituting the first part of a digraph tile when at the end of a prefix so that e.g. GORIL in Catalan will list GORIL·LA (rather than nothing since GORIL, ending with the L tile, is not a prefix.)	2012-08-27 21:50:09 -07:00
Eric House	fddd2c4ed5	fix bug in dict_tilesToString that occurred only when a language had two tiles starting with the same letter: use recursive search to try both paths in such cases.	2012-08-27 07:10:40 -07:00
Eric House	9d174601b9	add field, and getter, for new dict header description string, and load it in linux client.	2012-08-26 20:58:28 -07:00
Eric House	67ddbf140b	remove comment unintentionally committed	2012-08-23 06:38:45 -07:00
Eric House	c13971e3d8	convert a few more variable names from single- to double-letter	2012-08-23 06:38:29 -07:00
Eric House	32e1530d3f	i => ii; no other change	2012-08-22 07:44:21 -07:00
Eric House	de87b32bb8	fix bug the right way this time: it's ok for a word not to be in the current player's wordlist when the most recent move's being reported, but not to ignore word legality altogether.	2012-08-15 18:11:16 -07:00
Eric House	de9a408b15	Revert "Fix bug where if word being scored for long-touch-on-scoreboard wasn't" This reverts commit `07912bdcdb`. Problem is it breaks WARN-PHONIES	2012-08-15 18:01:36 -07:00
Eric House	25e65d3e6f	cleanup: don't return from middle of function	2012-08-12 19:45:54 -07:00
Eric House	07912bdcdb	Fix bug where if word being scored for long-touch-on-scoreboard wasn't in current player's dictionary it'd show up empty: word, once played, needn't be legal to be displayed.	2012-08-12 19:25:16 -07:00
Eric House	eb8401bb7a	fix bug when turn lost for phonies in networked game: what's sent must match what's expected.	2012-08-12 11:52:20 -07:00
Eric House	464696566d	get rid of NODE_CAN_4. Not change to post-compiled code	2012-08-01 20:29:15 -07:00
Eric House	8f04bfadaf	modify engine score ranking to include estimate of bonus to be earned if all tiles are used (ending the game and triggering penalties for other players.) Changes are protected by compile-time flags currently not turned on.	2012-07-29 08:35:08 -07:00
Eric House	9b0436d1ee	Make rem string measure function return boolean to indicate rect will be invisible rather than setting width and height to 0. No real change beyond simplifying/speeding platform code.	2012-07-15 09:30:27 -07:00
Eric House	b02855b00c	sort tray after an undo adds tiles	2012-07-12 06:48:09 -07:00
Eric House	bfc68656cb	move arrow to where removed tile was, and set its direction based on whether removed tile and the next tile are in the same column or row.	2012-07-10 18:00:23 -07:00
Eric House	bd70a1dd7d	improve text in remaining tiles dialog, and always show the tiles for all trays rather than excluding those in current player's tray.	2012-07-09 21:44:29 -07:00
Eric House	09a81a2639	add some consts	2012-07-09 21:36:17 -07:00
Eric House	6da3f10855	cleanup -- no code change	2012-07-09 06:15:02 -07:00
Eric House	318cc52f5a	we need the base64 stuff even when don't have SMS -- for serialization.	2012-07-07 11:05:45 -07:00
Eric House	c272491db6	add compile-time option to have tap on empty tray space return one tile instead of all of them.	2012-06-29 06:50:46 -07:00
Eric House	c8cd2d500a	fix to compile and save player score rect info for non-keyboard-nav case	2012-06-27 07:04:36 -07:00
Eric House	2fc2a60842	create alternate scoreboard draw flow, disabled by compile-time flag, that does layout and draw in a single pass and with more information so platform has more responsibilty for dealing with space constraints and can, I hope, do a better job. There's no change until the flag is turned on. Works for GTK with flag on, but is stubbed out for ncurses.	2012-06-26 07:20:09 -07:00
Eric House	d8e4b6481c	make rectContainsRect public so can be used in assert	2012-06-26 07:15:26 -07:00
Eric House	405cb23023	fix bug where current player's scoreboard would disappear if other players' names were too long by giving all a the same proportion of what they request and passing in the percent given in case draw implementation wants to use it as a cue to truncate.	2012-06-15 06:26:40 -07:00
Eric House	60a4f123a2	include trayVisState in GameStateInfo	2012-06-05 22:13:26 -07:00
Eric House	821add6df5	fix to compile when HASH_STREAM not defined	2012-05-29 07:19:19 -07:00
Eric House	adadc9c90c	use new hash algorithm for new stream version, old for previous versions. Tested upgrade scenario from b44: works.	2012-05-28 11:07:59 -07:00
Eric House	0b1a9a67fe	add param to server_handleUndo to prevent it from undoing all moves in robot-vs-robot game, which is the wrong thing to do during a test simulating play.	2012-05-24 22:25:30 -07:00
Eric House	0cb217496e	cleanup	2012-05-24 22:22:00 -07:00
Eric House	9354e0e0cd	fix off-by-one error in stream_copyBits that seems to have been responsible for HASH_STREAM not working.	2012-05-24 22:16:22 -07:00
Eric House	60e1d50f43	add stream_copyBits, and use it to hash the move stack -- commented out via conditional compile as it still doesn't work in all cases.	2012-05-22 19:24:54 -07:00
Eric House	2564a660ad	remove logging	2012-05-18 21:23:12 -07:00
Eric House	3a54aa0ebc	add util_informUndo() that gets called, and puts up a dialog, after remote device has performed an undo on a committed turn.	2012-05-14 07:01:02 -07:00
Eric House	d846f96ec5	post-code-review cleanup: no significant change	2012-05-09 06:51:06 -07:00
Eric House	155df55b5c	break hash finishing stuff out to be called only once	2012-05-07 20:48:00 -07:00
Eric House	08f03af2cc	don't write gameID as 32 bits when it's bound for old-version client, and assert based only on the lower 16 bits in case came from old-version client. Fixes crashes testing mid-game upgrade from beta 43.	2012-05-07 07:02:43 -07:00
Eric House	3b3439371f	Merge branch 'android_branch' into android_bt	2012-05-05 17:33:21 -07:00
Eric House	5104ca6bc5	always sort tiles prior to including in hash -- as a fix for the case where a game is opened that was created by an earlier version that didn't save assigned tiles in sorted order.	2012-05-05 17:33:07 -07:00
Eric House	64199c4e64	Merge branch 'android_branch' into android_bt	2012-05-05 11:08:03 -07:00
Eric House	058cbc4e1b	first attempt, commented out, to hash the stream directly rather than its exploded contents. Does't work once there's been some undo activity as I don't have a way to get the length of the stack below the undo/redo line. Looks promising though.	2012-05-05 10:47:28 -07:00
Eric House	eb2f5ff6eb	sort assigned tiles before putting them in the move stack. Fixes hash comparison failure when devices are using sort-tiles option.	2012-05-05 09:47:57 -07:00
Eric House	d59b19514b	Merge branch 'android_branch' into android_bt	2012-05-03 21:44:35 -07:00
Eric House	de3107271d	changes to make hashing work -- make sure unused space in structs is 0 -- and to detect when an incoming move doesn't make sense. These latter changes may not be necessary now that hash code is checked first thing, but can't hurt, and there will be devices without hash codes for a while.	2012-05-03 19:02:42 -07:00
Eric House	47dde6cf3c	init bitfield to 0 in case I want to hash stream directly	2012-05-03 19:00:43 -07:00
Eric House	652fe6dd64	fix test: unsigned can't drop below 0	2012-05-02 20:42:45 -07:00
Eric House	26913c5a37	get rid of excessive logging	2012-05-02 20:41:46 -07:00
Eric House	09f9038cff	add option to have robot choose to trade tiles a configurable percent of the time. Meant to increase automated test coverage of trades.	2012-05-02 20:14:42 -07:00
Eric House	c52db8a8f0	toward better recovery from out-of-sync move and undo: include a hash of the move stack with every turn (version permitting), and drop incoming moves created against a move stack different from ours.	2012-05-01 07:58:11 -07:00
Eric House	0e07fab731	add stack_getHash() -- returning hash of current move stack (excluding any pending redos)	2012-05-01 07:56:45 -07:00
Eric House	89ca45357a	add pool_containsTiles()	2012-05-01 07:49:41 -07:00
Eric House	c15b56199c	use marker enum to test for size. no code change	2012-04-22 17:55:53 -07:00
Eric House	033a69be8d	to make it easier to tell games apart, print the number[s] of the remote device[s] as part of summary view and in game config screen (read-only). Use same field in summaries table for remote phone numbers and bt addresses.	2012-04-18 23:23:36 -07:00
Eric House	416a1054a7	Merge branch 'android_ack' into android_bt Conflicts: xwords4/common/comms.c xwords4/common/comtypes.h	2012-04-13 20:57:35 -07:00
Eric House	f22d9530b1	track what's been ack'd, and add method to ack what hasn't been.	2012-04-13 20:21:59 -07:00
Eric House	404265565b	tighten definition of connected BT or SMS game	2012-04-12 22:14:13 -07:00
Eric House	ac06d730f8	fix so chat works on SMS (and BT, though untested)	2012-03-24 12:04:07 -07:00
Eric House	fe614e9efc	delegate phone number comparison to platform code which in Android case has a method for it. strcmp is not enough.	2012-03-19 07:36:18 -07:00
Eric House	9caeff4a5e	recover a bit better from messages not meant for me, as is happening when a devices sends to self via SMS and client winds up getting a registration message it just sent. Not perfect yet (and may require a change in the comms protocol -- that's not versioned :-(.	2012-03-19 07:35:20 -07:00
Eric House	cd8889f90e	Merge branch 'android_branch' into android_bt Conflicts: xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java xwords4/linux/Makefile	2012-03-12 07:04:06 -07:00
Eric House	3b5dcdc2e0	add const param decls; remove redundant method call	2012-03-12 06:59:08 -07:00
Eric House	f51c0b39e6	use const where possible for game_writeToStream and others it calls. No other code changes.	2012-03-11 18:28:14 -07:00
Eric House	07fba2c71b	Fix problem with writing server to stream changing its internal state so that snapshotting made score strings disappear. Also rename stream_copyFromStream to stream_getFromStream to make it clearer that the src is modified. And swap params in stream_setPos().	2012-03-11 14:57:28 -07:00
Eric House	5c11f1b284	add XP_LOGSTREAM	2012-03-11 14:46:03 -07:00
Eric House	a2493ffa97	Merge branch 'android_branch' into android_bt	2012-03-06 07:47:05 -08:00
Eric House	24ac205917	cleanup -- no behavior change	2012-03-06 06:23:04 -08:00
Eric House	eec1cb00a1	wrap UUID in #ifdef XWFEATURE_BLUETOOTH	2012-02-27 20:30:48 -08:00
Eric House	9a2b488183	Merge branch 'android_branch' into android_bt	2012-02-14 16:56:20 -08:00
Eric House	914fa857be	return COMMS_CONN_NONE as address type of null comms rather than asserting.	2012-02-14 16:54:19 -08:00
Eric House	1ed1bce7d1	call informMissing after loading game -- before that it'll never be 0.	2012-02-12 22:27:58 -08:00
Eric House	0755a9e781	add new util function that gets called when a game is opened to inform it if any players are missing. Idea's to allow for non-relay devices the invitation opportunity that comes when a game connects to the relay and learns that no other games have joined its room.	2012-02-09 05:19:03 -08:00
Eric House	7214b7e12a	turn off the palmos-era bt wrapper stuff I was trying to use to know when to reset the stack. It breaks Android when I turn on XWFEATURE_BLUETOOTH and adds no value I can see.	2012-02-07 17:38:24 -08:00
Eric House	47c3bd3090	track a BT game's set (singleton for two-device game) of remote devices in summary DB so, e.g., we can quickly determine what games care when a devices becomes available via BT. First use of this is notifying when a remote game's deleted -- least that's the plan. This commit just adds to the DB and scans the DB to build a map of device->gameIDs array.	2012-02-06 19:02:19 -08:00
Eric House	606e733b19	add _ to typedef to reduce number of etags hits on name. No code change.	2012-02-06 06:27:53 -08:00
Eric House	6326e45892	make btAddr a string rather than array of bytes.	2012-01-31 18:43:26 -08:00
Eric House	6bfd6e74e6	Merge branch 'android_branch' into android_bt	2012-01-26 06:24:18 -08:00
Eric House	866aeb2387	change relay connect message format to include client version (meaning of which is TBD). When a new-version client connects, store the value it's passed. At first this will let me track how quickly people upgrade. Later I can use it to let different clients have different formats to their messages e.g. to proxy.	2012-01-26 05:43:54 -08:00
Eric House	0934f83106	add gameID to params passed to comms' sendproc, including passing through to java layer.	2012-01-25 18:27:37 -08:00
Eric House	a34921155f	make gameID consistently 32 bits in C code. It's been stored as 16, so stream version must change. Plan's to use it to address incoming BT packets so a game needn't be open to receive.	2012-01-19 18:47:53 -08:00
Eric House	5f77ef6e13	get uuid from C code so can ensure linux version has same.	2012-01-19 18:28:27 -08:00
Eric House	814e4dd088	cut some logging	2012-01-03 18:53:58 -08:00
Andy2	2a34cd1e05	remove second param from server_do() -- it doesn't work anyway.	2011-12-21 18:45:05 -08:00
Eric House	b04604595f	change assertion to log -- fails very infrequently which is probably to be expected.	2011-12-15 18:37:20 -08:00
Andy2	17edc79aaf	Merge branch 'android_branch' into send_in_background Conflicts: xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java	2011-12-06 19:56:10 -08:00
Andy2	b0470d5276	add new preference that when set prevents calculation and drawing of crosshairs.	2011-12-06 18:17:55 -08:00
eehouse@eehouse.org	e1e8516e1b	Merge branch 'android_branch' into send_in_background	2011-12-02 19:04:12 -08:00
Andy2	52d02f04dd	pass tile value into drawCell(). Java code doesn't use it yet, but I want to play with drawing cells tray-tile-style when they're big enough.	2011-12-02 18:58:52 -08:00
Andy2	08063d9444	Merge branch 'android_branch' into send_in_background Conflicts: xwords4/android/XWords4/src/org/eehouse/android/xw4/NetUtils.java xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java	2011-12-01 21:18:37 -08:00
Andy2	3e21b7845a	comment	2011-12-01 21:04:31 -08:00
Eric House	cbd455148d	comment only. I tracked down the most recent network proto change from before which devices probably can't upgrade mid-game once the MAX_COLS=32 change is enabled and wanted to record it.	2011-12-01 20:23:58 -08:00
Eric House	4a32942e57	two fixes that seem to allow old- and new-proto devices to play games with 15x15 and 17x17 (and presumably larger) with the old games being upgraded mid-game: when server's new and wants to use a larger board but not all clients are capable, shrink the board; and, when new server is opening state saved by pre-upgrade code, assume a non-0 proto version for clients that registered earlier (as old code didn't save the client's proto version.)	2011-12-01 20:22:16 -08:00
Eric House	1e48a8d615	Merge remote branch 'origin/android_branch' into android_branch Conflicts: xwords4/common/model.c	2011-12-01 20:12:27 -08:00
Eric House	c1e420f726	Merge branch 'android_branch' into send_in_background Conflicts: xwords4/relay/rq.c	2011-11-29 06:45:32 -08:00
Eric House	adb9b3853d	fix bugs around new variable-length tiles array changes, and otherwise improve storage of col/row data so that test runs succeed with MAX_COLS of 16 or 32. Still to do: test mid-game upgrade.	2011-11-28 18:46:08 -08:00
Eric House	42d1d2f7bd	define variable before it's first used.	2011-11-28 18:21:46 -08:00
Eric House	2bfe120014	do away with need to accept out-of-bounds values in getTileRaw().	2011-11-23 18:25:12 -08:00
eehouse@eehouse.org	93a7d15a5e	Merge remote branch 'origin/send_in_background' into send_in_background	2011-11-23 17:57:54 -08:00
Andy2	d37424ad7f	Merge branch 'android_branch' into send_in_background Conflicts: xwords4/linux/linuxutl.h	2011-11-21 22:18:52 -08:00
Andy2	d856b9a8ce	Don't behave badly in presence of empty dict: word count should be 0 and sanity test should pass.	2011-11-21 18:06:46 -08:00
Eric House	eec83fe5b6	don't fail when RELAY_ALLHERE comes without a connection, as that will happen when messages come in background. I'm not sure what the test I'm removing was there to catch so need to test thoroughly.	2011-11-21 17:38:50 -08:00
Andy2	872ebe68f4	make array one large to hold word whose len is == max	2011-11-18 21:14:24 -08:00
Andy2	21330af568	make tiles array variable sizes. 32322 is too many bytes to use when the typical board at 15*15 requires less than 1/4 of that.	2011-11-18 18:59:59 -08:00
Andy2	cc0105e14c	add param to dict_countWords in which it accumulates counts per word length. Shouldn't hurt speed too much if null passed.	2011-11-18 08:15:21 -08:00
Andy2	598be8b404	MAX_COLS -> MAX_COLS_DICT for dict-related stuff (since dicts are staying with fewer words for now.)	2011-11-18 07:56:02 -08:00
Andy2	2eac8e70e0	adding missing ifdef	2011-11-18 07:43:37 -08:00
Andy2	37e81fd062	use number of bits based on stream version not current build -- required in case new code is talking with old in networked game.	2011-11-18 07:43:10 -08:00
Andy2	f9c3a95603	move stream version definitions	2011-11-18 07:41:57 -08:00
Andy2	4760ceda5a	Merge branch 'android_branch' into android_browsedict Conflicts: xwords4/android/XWords4/jni/anddict.c	2011-11-17 20:55:02 -08:00
Andy2	210c59ef9b	move bonus square values into model: add API to set an array, and API to query model for values. Now everybody else queries new model API rather than client via util_getSquareBonus(), model uses its internal values if present otherwise falls back to util_getSquareBonus(), and internalizes the array as part of the game. Now it should be easier to have different bonus patterns and to have them exchanged as part of network game init.	2011-11-16 19:01:11 -08:00
Andy2	fab39a5f87	Trying to deal with old- and new-proto devices interacting. Fix clients to append their stream version to their inital connect message. (The format can't change, so detecting additional length was the only option. comm.c on existing clients won't allow more than one connect message per channel, so adding a new to be used in addition didn't work.) New servers detect this; old will ignore. Track the version (implicit or not) of all clients, and use the lowest any supports, so that new server and all new clients will use newer proto.	2011-11-16 06:47:55 -08:00
Andy2	bdb8e6f03c	fix several crashers that prevented network games from working when MAX_COLS was larger than 16. In order that old-style messages on relay be readable by new-style code on device, modified server.c's protocol to include stream version. But: unless I come up with a better way of doing this all devices will have to be upgraded at the same time: old won't be able to read the new format as it's done here.	2011-11-15 06:13:25 -08:00
Andy2	86d5778ec3	remove 16x16 limitation on board size, replacing with 32x32. Change is enabled by a compile-time flag so Android needn't follow yet.	2011-11-14 18:21:41 -08:00
Andy2	2492e7cfc5	Merge branch 'android_branch' into send_in_background Conflicts: xwords4/linux/cursesmain.c	2011-11-13 17:10:46 -08:00
Andy2	dddec50f1d	Merge branch 'android_branch' into android_browsedict Conflicts: xwords4/android/XWords4/jni/Android.mk xwords4/linux/Makefile xwords4/linux/linuxmain.c	2011-11-10 19:22:57 -08:00
Eric House	619c25ee49	add a bit of logging to help deciphering test app problems.	2011-11-10 18:28:11 -08:00
Eric House	cee738942e	back out earlier change using redo: it was broken. Add assert to catch problem with passing ptr to tiles as src of tiles.	2011-11-10 18:26:32 -08:00
Eric House	6d98631640	sanity check: make sure tiles are within range.	2011-11-10 18:24:45 -08:00
eehouse@eehouse.org	9f22b11f81	Merge remote branch 'origin/android_branch' into android_branch	2011-11-10 06:54:42 -08:00
Andy2	43a79a0b47	use undo/redo rather than copying stack to figure past move score. This may have been contributing to crashes, but the new code's more effecient anyway.	2011-11-10 06:52:33 -08:00
Andy2	645695e358	improve logging, and fix mistyped variable found by inspection rather because of a problem.	2011-11-10 06:41:07 -08:00
Andy2	b9a7574925	fix emacs header comments; no code change	2011-11-10 06:39:36 -08:00
Andy2	af5c8a096f	don't pass a pointer to a tray inside the model to model code that will modify that tray! Fixes nasty random crash/assertion failure.	2011-11-10 06:35:05 -08:00
Eric House	268f018140	add dict sanity check that will, I hope, catch corrupt dicts.	2011-11-09 06:51:12 -08:00
Andy2	3707e7aaca	tweak to get performance to same level as before length-filtering was added, mostly by using local variables instead of ptr-accessed in struct and macro magic to support that. Passes every test I can think of on Linux but fast-scrolling broken on Android.	2011-11-05 06:14:35 -07:00
Andy2	da02e994b7	protext min,max with compile-time flag	2011-11-04 06:16:44 -07:00
Eric House	a2319a8073	experimental additions, mostly compile-time disable-able, so prune dict by wordlen.	2011-11-03 21:25:51 -07:00
Andy2	627410250f	reuse existing code in dict_countWords()	2011-11-03 06:18:53 -07:00
Andy2	5c995af38c	stop changing formats between internal and external structs (iterators); use internal format all the time for speed. Update linux test code for new API.	2011-11-02 18:32:00 -07:00
Andy2	38867b2875	fix bug in debug free following debug realloc to smaller size	2011-11-02 04:38:39 -07:00
Andy2	eb2b139e48	add some consts and better test for null index data	2011-11-01 18:47:20 -07:00
Andy2	fc4a5c31f4	silence picky compiler	2011-10-31 21:11:52 -07:00
Andy2	0d4404d43b	add dict_getStartsWith(), and code to test it. Lots of cleanup and bugfixing of dictiter code as well.	2011-10-31 21:05:34 -07:00
Andy2	88f556356c	dict_tileForString -> dict_tilesForString	2011-10-31 20:56:48 -07:00
Andy2	69b1b4da27	break dict iteration stuff out into new files. No code change otherwise.	2011-10-31 18:30:55 -07:00
Andy2	1d34c26ebc	remove unneeded parama	2011-10-31 06:37:53 -07:00
Andy2	dc58d123d5	combine params into single struct	2011-10-31 06:34:21 -07:00
Andy2	8d228ae190	turn on face-up tile picking for Android (though there's no prefs UI to enable it for a game yet). In common code, break pick tile utils method in two, one for blank and the other for tray tiles. In java, implement dialog for picking the tiles. Works, though is a bit clumsy to have the dialog come and go after every pick. Better would be a dialog that stays up and accumulates picks -- but it'd have to know to reduce the set of tile choices as letters are chosen. This'll do for now.	2011-10-28 22:15:56 -07:00
Eric House	f6ff3e85c6	Merge remote branch 'origin/android_branch' into android_branch Conflicts: xwords4/common/dictnry.c xwords4/common/dictnry.h xwords4/linux/linuxmain.c	2011-10-28 20:54:55 -07:00
Eric House	71450b02b3	use indexing (and add binary search) to double speed of getNthWord	2011-10-28 20:27:16 -07:00
Eric House	42d1a48a1d	don't include indices for prefixes that don't exist.	2011-10-26 22:25:21 -07:00
Eric House	412a58f6b9	make dict_makeIndex work for depth > 1.	2011-10-26 22:20:21 -07:00
Eric House	f2c4e39cd4	add dict_makeIndex(). Works, but only for depth==1 so far (A, not AA or AAA).	2011-10-26 07:10:50 -07:00
Andy2	fc973079dc	add first cut at dict_getNthWord. Works. Is slow.	2011-10-25 06:48:16 -07:00
Andy2	ac214236c4	add code to walk dict backwards as well, and test code that succesfully walks huge dicts in both directions turning out the same list of words either way. Still compile-time disabled.	2011-10-24 18:27:16 -07:00
Andy2	7c7cd82e0a	add code to iterate over words in a dict. Works on Linux (iterating forward only) but disabled at compile time. Idea's to have a dict browser. There was some simple refactoring in common code Android uses, and that tests fine.	2011-10-21 18:51:33 -07:00
Andy2	4eee7f8aa7	Pass selected tiles into new util function, and from there into java world, so confirming query can include them.	2011-10-19 18:34:26 -07:00
Andy2	f41d3c27e6	Merge branch 'android_branch' into send_in_background Conflicts: xwords4/common/server.c	2011-10-19 06:23:16 -07:00
Andy2	c2a7a5c347	fix crash: don't destroy stream if for some reason it's null. Not sure how that happens, but it does.	2011-10-18 21:29:40 -07:00
Andy2	652b7e703a	Remove difference between debug- and non-debug stream format.	2011-10-18 21:27:28 -07:00
Andy2	b31e829414	Remove file-format differences between debug and non-debug versions. Fix curses to compile non-debug.	2011-10-18 18:52:37 -07:00
eehouse@eehouse.org	b8adbd94c1	Merge branch 'android_branch' into send_in_background	2011-10-18 06:47:38 -07:00
Andy2	235259ef45	a bit more tuning of model_listWordsThrough()...	2011-10-17 18:26:04 -07:00
Andy2	3b7532aba8	improve stack_redo() to return the redone move, and use that to avoid making a copy of the move stack in model_listWordsThrough()	2011-10-17 18:16:19 -07:00
Andy2	9109396ae9	in model_listWordsThrough, only undo as much as needed to find the move tile that places a tile on the cell we're interested in.	2011-10-17 06:48:59 -07:00
Andy2	8062a027e7	cleanup: NULL's a legal value now.	2011-10-17 06:48:13 -07:00
eehouse@eehouse.org	5afb0ae145	Merge branch 'android_branch' into send_in_background	2011-10-14 22:34:29 -07:00
Andy2	6793742f0f	remove option to list all words played in a single lookup dialog, and supporting code in the jni/common C.	2011-10-14 22:32:30 -07:00
Andy2	0e6b4d749f	When pen held on committed tile on board, cons up list of all words played that include that tile and pass to new util_cellSquareHeld() method. In java implementation of that method, use existing lookup activity code to display list of words. Enabled on the C side by a compile-time flag in case it has problems. Right now the time spent saving a game before launching the lookup activity, and reloading it after, is pretty apparent, but that's in emulator which is slow.	2011-10-13 19:14:08 -07:00
Andy2	7449923328	log tiles left in pool -- makes progress of automated/test games easier to follow.	2011-10-13 19:10:13 -07:00
Eric House	861a24dfeb	Merge branch 'android_branch' into send_in_background	2011-10-10 22:42:28 -07:00
Eric House	f86b0dfcc5	fix to compile on x86 (with newer compiler that doesn't like unused variables)	2011-10-10 22:42:02 -07:00
Eric House	eb60bfade7	fix to compile on x86 (with newer compiler that doesn't like unused variables)	2011-10-10 22:40:05 -07:00
Andy2	4bb61401bd	fix crash: src and dest stream params were reversed.	2011-10-10 22:24:44 -07:00
eehouse@eehouse.org	99707e4029	Merge branch 'android_branch' into send_in_background	2011-10-10 18:31:30 -07:00
Andy2	d5ca5bbd0d	remove misplaced assert: in network games illegal words may well arrive.	2011-10-10 06:48:07 -07:00
eehouse@eehouse.org	471a9d988d	Merge branch 'android_branch' into send_in_background	2011-10-05 07:10:52 -07:00
Andy2	90f11abc37	add to game state passed into java world whether it's the cur selected player's turn, and use that to enable/disable Pass/Turn done button.	2011-10-05 06:36:01 -07:00
Andy2	dc20b04a4c	remove unused param (on the C/jni side)	2011-10-04 18:54:53 -07:00
Andy2	3ec97d5c07	Turn "Turn done" into "Pass" when the pending score is 0. To do that I had to pass the score into draw_trayBegin since draw_drawPendingScore() isn't called until the first tile's placed. Note: as long as I'm messinng with this menuitem it should be disabled when it's not the player's turn.	2011-10-04 18:48:33 -07:00
eehouse@eehouse.org	82615f409b	Merge branch 'android_branch' into send_in_background	2011-10-04 06:49:19 -07:00
Andy2	c04f981442	fix new word-list reporting to work for networked games too: create and save a second stream parallel to the existing one reporting the move scoring. Requires bump in stream version.	2011-10-04 06:44:29 -07:00
Andy2	3cf1d07df3	optimization: set up word-tracking invariants on init rather than each time used	2011-10-04 06:21:02 -07:00
Andy2	77b9fa11a5	improving lookup words experience: replace util_userQuery(QUERY_ROBOT_MOVE) with new util_informMove(), into which the number of words formed and the words themselves are passed. The process of consing up the score explanation was already passing over the model, so storing the words is very little effort, and will save a call back into the model where the user actually wants to do the lookup.	2011-10-02 16:21:09 -07:00
Andy2	8650c997e0	nuke noisy logging -- that stuff works now.	2011-09-30 18:34:31 -07:00
eehouse@eehouse.org	554e497593	Merge branch 'send_in_background' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into send_in_background	2011-09-30 06:39:23 -07:00
Andy2	c952ebd8e6	cleanup	2011-09-30 06:29:14 -07:00
Andy2	8e0e8d911e	fix compile errors	2011-09-26 18:12:16 -07:00
Eric House	26ba812aff	cleanup	2011-09-22 17:31:57 -07:00
Eric House	f0c3e2c5f0	Merge branch 'android_branch' into send_in_background	2011-09-22 17:22:01 -07:00
Andy2	35a0a3a291	passing pool into word-listing code a mistake as it put tiles back when undoing and so the pool grew each time. Fix, and remove server API as it's unneeded.	2011-09-22 06:41:48 -07:00
Andy2	d000c430b9	thought there was an internal problem with pool and wrote debug-only code to check. There wasn't, and it's unused, but no point writing it again.	2011-09-22 06:40:44 -07:00
Andy2	92614370ce	Merge branch 'android_branch' into send_in_background Conflicts: xwords4/common/comms.c	2011-09-20 06:21:54 -07:00
Andy2	43e8bd7879	formatting only	2011-09-18 19:05:29 -07:00
Andy2	26ce5a119a	in model_getWordsPlayed, make '\n' a separator rather than a terminator. Makes it easier to split in the Java world without getting an extra empty word.	2011-09-18 19:05:00 -07:00
Andy2	9eacdb3856	add server_listWordsPlayed, and implement via function in model.c that uses existing stack and undo features to run a WordNotifierInfo over some number of scoring passes to gather the words seen. Seems to work as tested from gtk version. Now need to try from android....	2011-09-18 17:20:01 -07:00
Andy2	63893b8a0d	add stream_getPtr() and use to remove a couple of allocs, including one per message sent.	2011-09-18 16:54:36 -07:00
eehouse@eehouse.org	98c2617613	Merge branch 'android_branch' into send_in_background	2011-09-14 06:47:12 -07:00
Andy2	f8f06a7768	raise same error when try to commit exchange out-of-turn is raised for out-of-turn move attempt -- and don't exit exchange mode.	2011-09-12 18:33:33 -07:00
Andy2	e709ea730c	only exit exchange mode if user confirms trade	2011-09-09 21:30:40 -07:00
Andy2	c9c498786e	add to game state whether any tiles selected. Use that to disable 'commit exchange' button when there's nothing to commit, and get rid of error message used when committing nothing since it's now impossible (on Android).	2011-09-09 19:04:25 -07:00
Andy2	66fb5f87fb	don't exit trade mode if no tiles selected; fix warning string to match.	2011-09-09 18:40:19 -07:00
Andy2	201db9415c	sort tiles after trade too	2011-09-09 18:32:04 -07:00
Eric House	84931f34ff	Merge branch 'android_branch' into send_in_background	2011-09-07 21:44:36 -07:00
Andy2	e4b952222a	unify two ways of saving words encountered during scoring, removing one and changing the site that used it to use the other. Not visible outside of common, but should make it easier to harvest a list of all words for one move or the entire game.	2011-09-02 19:11:04 -07:00
Andy2	2d2f3e23fd	change signature of util_playerScoreHeld(): pass player num rather than formatted text. Client code can use new model_getPlayersLastScore() or whatever else it wants to build text to show the user.	2011-09-02 18:36:03 -07:00
Andy2	b6a4621617	trivial optimization	2011-09-02 18:34:07 -07:00
Andy2	99679357a8	Exit trade mode on "commit" even if no tiles selected (in keeping with error message on Android); don't block trade if pending tiles are on board; instead undo them. There's redo now so there's no need to confirm, no data loss.	2011-09-02 06:48:06 -07:00
Andy2	e94524958f	get rid of util_setInTrade(); fix passing of selBits when trading (broken with prev checkin.)	2011-09-01 19:51:26 -07:00
Andy2	8e45dcd720	exit trade mode only in the case where we're asking user to confirm, and do it before server can call callback that changes selPlayer so it'll actually work.	2011-09-01 18:50:09 -07:00
eehouse@eehouse.org	b6e5327b1a	Merge branch 'android_branch' into send_in_background	2011-08-31 06:46:42 -07:00
Andy2	9c60a5c05b	make sure util_setInTrade() gets called every time internal state changes, including on creation/load from stream.	2011-08-31 06:33:36 -07:00
Eric House	c01981bc8f	Make miniwindow stuff compile-time optional. The goal's to use native features where they look better or are easier to manage, e.g. Toasts and dialogs on Android.	2011-08-29 20:36:01 -07:00
eehouse@eehouse.org	3cdd4c1c9b	Merge branch 'android_branch' into send_in_background	2011-08-21 15:04:25 -07:00
Andy2	9612b28b1f	use goto to avoid having multiple returns. No behavior change.	2011-08-21 14:20:59 -07:00
Andy2	eb00984563	Merge branch 'android_branch' into send_in_background Conflicts: xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java	2011-08-20 12:44:17 -07:00
Andy2	7a1346e530	add assert to catch bad dict earlier	2011-08-18 07:49:40 -07:00
Andy2	b9be2b45f4	sendMsg needs to report success if no-conn send works.	2011-08-17 18:41:45 -07:00
Andy2	7ab8c6eca4	re-factor sending code so essentially same message (without cookieID that implies a connection) is sent and received by no-conn code. Use flags to determine if comms can support no-conn sending without making up the message only to have it fail to send.	2011-08-16 19:36:23 -07:00
Andy2	dfab747504	make server_do() take a new param to allow caller to call it until there's nothing more to do (without the assumption it's driven from an event queue.)	2011-08-16 19:28:59 -07:00
Andy2	e88af19e0a	toward the ability to send replies to messages received in background without user having to open the game, which will e.g. allow a host to assign tiles, or a robot to move, without the phone's owner noticing there's a message. This is on a branch because it may never work.	2011-08-10 18:28:34 -07:00
Andy2	35f059e14c	remove logging	2011-08-08 20:21:55 -07:00
Eric House	cbfdf992bd	add compile-time option to allow passing game seed from commandline. This should allow testing relay changes to deal better with duplicate seeds.	2011-07-31 22:23:46 -07:00
Andy2	de16ee93d7	get rid of some logging	2011-07-20 18:46:55 -07:00
Andy2	ecaca66a96	move turn-in-range assert to where it won't fail	2011-07-19 06:17:50 -07:00
Andy2	5deb68486c	add a ton of asserts (no code change otherwise)	2011-07-18 06:44:17 -07:00
Eric House	febb640049	add name of remote player to notification that remote player moved. And remove a few dead strings.	2011-07-15 18:13:55 -07:00
Andy2	f4a11d2be5	ignore commit turn request when player has 0 tiles. This catches, awkwardly, the case in a networked game where a player runs out of tiles in his turn but the server hasn't responded yet to kill the game. It remains the player's turn and he can make lots of 0-point moves while waiting. (Making it the next player's turn would be the right thing to do if that player were always on a different device.)	2011-07-12 07:13:21 -07:00
Andy2	42e7a113b9	tweak logging	2011-07-12 07:09:40 -07:00
Andy2	f3ab40519d	add new error message to DEBUG-only printing code.	2011-07-06 06:47:56 -07:00
Andy2	4b75174170	save stateAfterShow as part of serialized game state. Fixes problem where games with more than two devices would hang because server.c code was dropping messages that comms.c code thought were good and so ACK'd preventing them from being sent again. They were being dropped because the game was in the wrong state after displaying a move-made dialog because the state it was to move to after doing that display had not been saved.	2011-07-04 12:51:00 -07:00
Andy2	0eec455119	change one return type; improve logging	2011-07-04 12:46:48 -07:00
Andy2	8904f37e1a	force XW_STATE to be 1 byte.	2011-07-04 12:45:51 -07:00
Andy2	a96dfb57f6	drop-packet test got an assert because we assumed the effects of a dropped packet. Instead, now treat the connection as broken and restart.	2011-06-27 18:30:52 -07:00
Andy2	e886a1aefe	lots more changes -- another snapshot, this, rather than stuff carefully polished and reviewed. Shows progress, though, in getting through tests.	2011-06-23 07:12:50 -07:00
eehouse@eehouse.org	484bb295d0	Merge branch 'android_branch' into android_invite	2011-06-06 22:08:49 -07:00
Andy2	1bc70f2c8f	google reports a crash in warnIllegalWord that only makes sense if I'm passing a 0-length array of bad words. That in turn suggests a screwup where a move's rejected for some reason other that a word not being in the dictionary. This is all supposition, and all stuff that'd be caught by asserts in a debug build, but: when there are no bad words don't report them -- even if the move's rejected.	2011-06-06 20:33:10 -07:00
Andy2	a29f08616e	what I meant to check in.	2011-05-19 22:53:58 -07:00
Andy2	89911ecaa4	add server_getMissingPlayers to return a bitvector indicating players not yet received on device. Meant to be included in summary. I'm not happy with how much code it took to figure this. I don't know server.c all that well any more.	2011-05-19 22:48:21 -07:00
Andy2	4c5c435fb5	add new parameter so client always gets notified on connection including how many players are still missing.	2011-05-19 05:51:00 -07:00
Andy2	3b3a822dcc	a gmae may have several dictionaries in several places, but all should share the same language. So pick one to send to draw_dictChanged rather than sending all (some of which may be null.)	2011-04-28 18:40:44 -07:00
Andy2	af08b2e5b0	add a couple of asserts	2011-04-25 20:17:54 -07:00
Andy2	4e7570020f	remove mistaken (I think) assert	2011-04-20 22:13:44 -07:00
eehouse@eehouse.org	5a21aea2e5	Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch	2011-04-13 06:58:58 -07:00
Eric House	3cc105da0b	add ability to dump board (model) as text, protected by ifdef that will likely only get set on Linux. Uses lower-case to designate blanks. For that and maybe string size assumptions is very broken for non-ascii languages, including Spanish.	2011-04-13 06:45:22 -07:00
Eric House	92ac25ed3f	don't require MAX_NUM_PLAYERS==4	2011-04-12 22:17:45 -07:00
Andy2	002bb40a09	report counts/values using language rather than dictionary name. To support that, pass lang name from java into jni.	2011-04-11 18:55:42 -07:00
Andy2	96254ad8b5	when opening saved game, notify draw of per-player dicts as well as of a single game-wide one.	2011-04-11 06:39:31 -07:00
Eric House	c77d3039cc	add XP_FREEP. Should be no change in behavior.	2011-04-07 18:07:45 -07:00
Andy2	3b7b4802a9	add ability to specify, track and use separate dictionaries for each player. Works for gtk client. Compiles for Android but there's no UI yet to specify more than one dict. Management of dupicate dicts without duplicating memory -- refcounting -- will be up to the platforms.	2011-04-01 19:57:10 -07:00
Eric House	67a3349919	Don't move arrow on pen-up if pen-down was in a different cell.	2011-03-29 18:13:38 -07:00
Eric House	f4ea54c30b	cleanup; no behavior change	2011-03-29 18:12:55 -07:00
Andy2	d9bb5197d4	Add two new menus to be available only when in trade mode. Hide and show them and another group depending on whether trading at the time. To make that work, replace the individual calls made to dis/enable toolbar buttons with a single jin call that takes a struct full of booleans and make that struct available in BoardActivity where menus are hidden/shown. Remove the individual calls from the jin interface.	2011-03-10 18:13:56 -08:00
Andy2	aa88503cfb	have board_canHint() return false when trade in progress.	2011-03-08 07:40:38 -08:00
Andy2	828bd9aa4c	fire user error rather than committing turn when trade attempted without any tiles selected.	2011-03-07 06:28:43 -08:00
Andy2	d2fda267e5	fix assertion failure that happened when I changed whether remote scores were shown mid-game. If the value's not as expected just don't show the score.	2011-02-18 17:43:01 -08:00
Eric House	984227955b	make two versions the same since there's been no release since first was added.	2011-02-09 22:17:18 -08:00
Andy2	c56f0b5cea	Save cached prev move explanation as part of stream so can be shown to user when game is opened later. Fixes problem displaying empty explanation on first open of game that was updated in the background.	2011-02-09 06:30:51 -08:00
Andy2	8a7029435c	fix some comments	2011-02-01 18:55:48 -08:00
Andy2	4b8e462b8b	check for null ptrs to allow creating loading games that won't draw or communicate with users.	2011-01-23 21:45:41 -08:00
Andy2	d98a3fe232	when peeking is disabled (the default on android), don't allow swapping to view of the current player's board if the current player is remote -- because then won't be able to swap back to own view until it's your turn. Fixes annoyance in multi-device game on Android.	2011-01-21 21:32:52 -08:00
Andy2	7d6e136ca3	fix comment	2011-01-19 06:21:31 -08:00
Andy2	cd5dedfa67	add compile-time flag to disable selection of tiles in tray (other than as part of an exchange) and to remove feature where tapping empty cell moves selected tile there. This is to address user confusion on Android, and I'll ask for testing before putting this in the main branch. This leaves only place-arrow-then-tap as an alternative to drag-and-drop, and may annoy people. Worth trying: disable only the automatic selection of another tile after the selected one is dropped.	2011-01-12 19:00:48 -08:00
Andy2	6ccf0c167c	fix next-hint which I just broke: need to track whether working on behalf of robot after all, though it's not needed in the API, to distinguish case where moves must be cached (for next-hint feature).	2011-01-11 18:10:48 -08:00
Eric House	2b502a39c6	fix mod-by-zero error when iq == 2	2011-01-10 18:19:10 -08:00
Andy2	efb54c7b05	fix compile errors the stricter android compiler found.	2011-01-10 06:56:11 -08:00
Andy2	f111b78714	switch from tracking robot intelligence as a per-game boolean implemented (when not smart) as trying to match the human's score to a per-robot value between 1 and 100 that gives the percentage of best moves to store before picking randomly from among them. So a 1 means save only the best move and always pick it; 100 means save all the best moves (how many are saved is compile-time configurable) and pick one of them. Because it's settable per-robot a smarter robot can be played against a dumber one (though I may choose not to make it settable per-robot on shipping versions.)	2011-01-10 06:44:28 -08:00
eehouse@eehouse.org	64bcb8bb2b	Revert "replace call to rand() with android_only function that reads two bytes" This reverts commit `1653b9f6e9`.	2010-12-08 05:38:41 -08:00
Andy2	4a12f7a96f	Revert "in attempt to work around non-random rand() in jni world, call back" This reverts commit `99c92e779d`. Conflicts: xwords4/android/XWords4/jni/utilwrapper.c	2010-12-07 18:43:53 -08:00
Andy2	e4999acc98	add dict_getWordCount()	2010-12-06 18:24:31 -08:00
Eric House	c4cdc24b78	initial changes to add a header to xwd format so that stuff like number of words can be included. Changed to build dicts and linux to open them. Android still needs to learn. Also, some of the tools in dawg/ need to be fixed to read old-format (pre-utf8) .xwd files.	2010-12-05 19:33:10 -08:00
Andy2	99c92e779d	in attempt to work around non-random rand() in jni world, call back into the java world by making it a util_ctxt function. Do same on linux to test. We'll see how it is -- and can back this commit out if there's no improvement.	2010-12-02 19:02:36 -08:00
Andy2	1653b9f6e9	replace call to rand() with android_only function that reads two bytes from /dev/urandom. rand() has been returning pretty crappy numbers resulting in lots of clustering of tiles in trays. Let's see if this is any better.	2010-11-29 17:12:12 -08:00
Andy2	3ee3af8881	init crosshairs correctly so 0th column and row aren't drawn short.	2010-11-22 07:04:51 -08:00
Andy2	92940e6638	add model_getNPlayers()	2010-11-19 18:22:39 -08:00
Eric House	7a2d279308	add logging so script can better track what state relay game is in	2010-11-18 22:27:06 -08:00
Andy2	b0a4790ce0	respond to new game-gone message by passing to utils.	2010-11-11 06:41:24 -08:00
eehouse@eehouse.org	048eff92b8	Merge branch 'relay_proxy' of /home/andy2/dev/git/LOCAL_ORIGIN into relay_proxy	2010-11-10 07:17:39 -08:00
Eric House	2a2f4d4395	been a while since cvs...	2010-11-09 05:53:49 -08:00
Andy2	22f7a42c1d	make comms_getChannelSeed non-static so jni can call it	2010-11-08 17:22:38 -08:00
Andy2	cfd4345287	remove too-frequent logging	2010-11-07 13:31:43 -08:00
Andy2	99a557a604	fix blanks-first option to assign one blank per tray rather than all to first. Makes for more realistic test.	2010-11-07 12:20:39 -08:00
Andy2	dd3bd1f661	don't show hint buttons until there are tiles assigned	2010-11-06 21:31:53 -07:00
Andy2	9e05e6c2b3	add lastMsgRcd to status printout	2010-11-03 18:28:54 -07:00
Andy2	3d70da5a8d	cleanup	2010-11-01 06:57:54 -07:00
Andy2	804070efc7	base comms_canChat() on whether connID's been assigned. It's possible to send a message from a client immediately after its initial message but init-message dupe-detection in comms will drop that because only one channel-0 message is expected -- the initial connection message. So don't encourage platform code to enable the feature before common code can deliver the message.	2010-11-01 06:57:41 -07:00
Andy2	8c7043d42c	fix crash using undo/redo after a turn has overwritten pending tiles: when redoing need to check that cell is still empty.	2010-10-29 20:07:09 -07:00
Andy2	5b33df4e25	modify model_getTile to take NULL for out parms where the result is often ignored, then pass NULL instead of the address of variables called 'ignore'. Should be no behavior change.	2010-10-29 19:52:15 -07:00
Andy2	0d7f2c4f23	add devOrder (= hostID) to params passed on connect. Should make for better explanatory message.	2010-10-29 06:31:33 -07:00
Andy2	4cd15a9c6a	Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy Conflicts: xwords4/common/comms.c	2010-10-29 05:27:07 -07:00
Andy2	41fc05106b	add room name to callback used when device connects	2010-10-28 18:45:55 -07:00
Eric House	eba5b77494	add comms_isConnected; public room variables default to false	2010-10-27 20:50:11 -07:00
Eric House	b878599f7b	remove comment	2010-10-26 20:57:27 -07:00
Eric House	fd85bd35da	set dictLang to 0 (unknown) when reading old-version stream	2010-10-26 20:56:41 -07:00
Andy2	e909e4b343	remove redundant message; advance state to ALLCONNECTED on receipt of RECONN or CONN that lists the game as full. This means we get the all-green icon (or the A in the gtk case) when in a consummated game rather than only when all devices are actually connected.	2010-10-23 20:29:24 -07:00
Eric House	85d29cf560	if can't send allcond to a device because it's not connected queue the message to be sent next time it does. And since the cookieID will change and should be there already anyway, remove it. (Should remove the hostID too for the same reason.)	2010-10-22 19:02:52 -07:00
Andy2	99dbbb443c	add comms_canChat, which knows better than java code what state a connected game is in, and call it to determine whether to show the chat icon.	2010-10-21 19:14:10 -07:00
Andy2	b9e3ca212b	turn off glib-dependant checksuming for non-linux builds	2010-10-18 22:08:04 -07:00
Eric House	3648c22bd4	fix long-standing bug where initial messages were not getting deleted and multiplying; log md5 sums of messages in debug build.	2010-10-18 20:17:44 -07:00
Eric House	f246178b8f	Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy	2010-10-12 19:18:21 -07:00
Eric House	0cf94dda8b	fix frequent assertion failure that dates from when no messages passed outside of ALLCOND state. With this fix the test script is running all games to completion if given enough time.	2010-10-12 19:16:46 -07:00
Andy2	e637a64d96	Change param signage to fix compiler warning	2010-10-11 06:20:30 -07:00
Eric House	61b228f189	implement simple chat on top of current server-level protocol -- meaning it'll work on any tranport but relay doesn't know about it. (If relay knew about it I could send a "shutting down for a minute" message to every connected device, which would be cool. But this is easier.) Written, BTW, enroute from Seattle with help from beer from Chris in first class. :-)	2010-10-03 18:11:51 -07:00
Eric House	4a5de0a24c	cleanup	2010-10-03 18:09:15 -07:00
Eric House	a89520a377	use __func__	2010-09-28 18:04:31 -07:00
Eric House	047f41b516	send cookieid as part of [RE]CONNECT_RESPONSE in addition to ALL_COND (where it's now redundant).	2010-09-20 22:06:35 -07:00
Andy2	6d6ad96cde	don't clear seed when changing roles from guest to host.	2010-09-20 04:56:19 -07:00
Andy2	821e4d9c39	add ACK to protocol, returned by device after gets connName on initial connection. Space is held for device on assumption ack will come back, then given up if it fails.	2010-09-14 13:54:52 -07:00
eehouse@eehouse.org	0b46455044	Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy	2010-09-12 02:34:20 -07:00
Andy2	bd71a15ddc	turn off heartbeats on client side	2010-09-11 01:23:13 -07:00
Eric House	54611df679	nuke unused variable	2010-09-10 05:55:59 -07:00
Andy2	2ee9031fdc	langcode belongs in connect, not reconnect, message	2010-09-10 01:56:58 -07:00
Andy2	20312144dd	tons of changes, still rough, snapshoted here: a gtk device vs device game works to completion with both signing up as guests (no -s) with one local and one remote player (identical commandlines.) Not yet tested: if any signs up as a host, reconnecting rather than connecting, etc. This is just a snapshot.	2010-09-10 01:30:40 -07:00
Andy2	01fe388f85	remove logging accidentally checked in	2010-09-03 06:40:17 -07:00
Andy2	b742c7dbb7	add new booleans to relay address record around public rooms	2010-09-03 06:38:46 -07:00
Andy2	0b91e9634e	save/restore new dictLang field; up stream version	2010-09-01 06:51:44 -07:00
eehouse@eehouse.org	ecd0280353	Merge branch 'android_branch' into relay_proxy	2010-08-26 18:36:55 -07:00
Andy2	d1f6057987	fix stupid typo that meant crosshairs started on top row was only three cols wide at first.	2010-08-26 18:20:24 -07:00
Andy2	4208c33ecf	make lang code support non-conditional	2010-08-25 06:31:38 -07:00
Andy2	3dba8ba13b	Fix bug reported by user: if robot finishes a search but fails to find a move it's still done with its turn and must trade or pass.	2010-08-24 18:38:12 -07:00
Andy2	a34ccb424f	device now passes list of "relayID"s, consisting of connName plus device id, to relay, one for each stored game that's communicating via the relay. Relay parses out each relayID. Next relay can use these to look up whether messages are available and reply with that, and device can put up a notification.	2010-08-22 12:16:57 -07:00
Andy2	09bc83429e	add and set new flags for crosshairs so platforms can do better than fill cells as is done for focus.	2010-08-11 18:50:16 -07:00
Andy2	205723e03b	add missing event to logging	2010-07-30 17:44:20 -07:00
Andy2	d67e421541	get rid of excess logging	2010-07-27 21:36:14 -07:00
Andy2	5b3e41f4e9	fix bug: allow switch to player whose turn it is even if allowPeek is off (typically because it was turned off after game was loaded and while non-turn player's tiles are visible)	2010-07-17 07:11:46 -07:00
Andy2	639feb8965	nuke extra line -- change I forgot to save	2010-07-17 06:23:14 -07:00
Andy2	5b8cf716b3	add pref controlling whether can switch to look at tray of user whose turn it isn't	2010-07-17 06:21:24 -07:00
Andy2	dbed23e240	change definition of movement during drag to include not just drag of a tile but motion on the board which will include crosshairs. This prevents miniwindow from coming up and stopping crosshairs movement when it happened to start on a bonus square.	2010-07-16 18:57:08 -07:00
Andy2	a99e8142b0	Merge branch 'android_branch' into toolbar Conflicts: xwords4/android/XWords4/jni/Android.mk xwords4/android/XWords4/jni/xwjni.c xwords4/android/XWords4/res/values/strings.xml xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java	2010-07-16 06:32:32 -07:00
Andy2	a76cdac0c5	don't put up mini window when have penned-down on a draggable tile.	2010-07-13 06:26:55 -07:00
Andy2	21d705c6e7	make wrap code for popping tile up above cursor hotspot (or finger) conditionally compiled. I probably want it off on Android now that I have crosshairs.	2010-07-12 19:11:24 -07:00
Andy2	0957c95c8e	write and read dummy values to/from stream when KEYBOARD_NAV isn't defined so that the versions are compatible. This will let existing saved games be read if I turn this off on Android.	2010-07-12 18:49:36 -07:00
Andy2	de32e514ab	cherry-pick three revisions from toolbar branch (`d1c7d4097c`, `f848473c1a` and `6484a2fb9b`) and manually fix conflicts.	2010-07-12 18:48:03 -07:00
Andy2	fd9464b909	first cut at crosshairs: drawing in focus color the entire column and row that's currently being touched/dragged through. Meant to aid users of capacitive touch screens in figuring out what cell they're on.	2010-07-12 06:39:46 -07:00
Andy2	8172e38cef	write and read dummy values to/from stream when KEYBOARD_NAV isn't defined so that the versions are compatible. This will let existing saved games be read if I turn this off on Android.	2010-07-09 18:21:05 -07:00
Andy2	6b9b97231a	fix to compile with KEYBOARD_NAV undefined	2010-07-09 06:49:32 -07:00
Andy2	40323b03d2	board_canFlip -> board_visTileCount	2010-07-08 06:38:51 -07:00
Andy2	ac6dc400ce	add board_canHint	2010-07-07 18:47:02 -07:00
Andy2	c98451c62a	remove excess logging	2010-07-07 06:50:47 -07:00
Andy2	a7c77785f6	return false if no move found -- to really fix the crash	2010-07-07 06:40:34 -07:00
Andy2	5725f36db8	detect when no moves found that meet criteria to fix (I think) crash when iterating from highest to lowest move using prevMove.	2010-07-07 06:33:01 -07:00
Andy2	992f45e1bf	new feature: previous move. Modify engine to traverse the set of all possible moves in either order both within a cached subset and when building cached subsets. Still a bit buggy (shows the same move twice when moving backwards and reaches the top-scoring move) and not well tested.	2010-07-07 05:27:57 -07:00
Andy2	5f92491ca3	add and implement board_canTogglePending	2010-07-03 11:38:37 -07:00
Andy2	d44b9907cf	save redoable pending tiles -- and up stream version since format's changed	2010-07-03 11:25:01 -07:00
Andy2	57e246da3b	handle blanks as well in redo of undone pending tiles	2010-07-02 22:44:50 -07:00
Andy2	f77cf0e23d	add board_redoReplacedTiles and model_redoPendingTiles. The latter works as long as no blanks are involved. And new state isn't being saved so will be lost unless format changed.	2010-07-02 18:52:55 -07:00
Andy2	491cfe7616	add board_canShuffle and implement	2010-07-01 18:55:49 -07:00
Andy2	43c34aa466	add board_canFlip and model_canFlip -- which seem to work though there's no test that when a single tile is on the board it's not in the middle. Sue me.	2010-06-30 20:25:34 -07:00
Andy2	953b2bcc55	cleanup; allow setting NUM_SAVED_ENGINE_MOVES per-platform	2010-06-28 21:08:13 -07:00
Andy2	0c852981e7	make zoomBy param passed to board_zoom give distance rather than just direction.	2010-06-27 13:12:30 -07:00
Andy2	80aa22b2d1	add common prefs field sortNewTiles and way to set on linux cmdline	2010-06-17 18:10:32 -07:00
Andy2	e0dd3701a0	Add model_sortTiles(); use it; fix some comments and const decls. Sorting always happens now when tiles added; needs to be based on a preference.	2010-06-17 06:43:16 -07:00
Eric House	34ecac303a	make optional and then turn off feature whereby tap in empty part of tray undoes current move. It's too easy to hit this on a capacitive display.	2010-06-06 13:32:12 -07:00
eehouse	f514717428	Change board_zoom to indicate direction only of zoom, not number of cols. When figuring internal dimensions zoom out as needed to meet maxSize value. This fixes problem where rotating a zoomed portrait board to landscape leaves cells bigger than they can be made by zooming, but then the desired zoom has been changed and stored and so on return to portrait cells are smaller/less zoomed. Need to see if I can live with that.	2010-06-05 03:40:23 +00:00
eehouse	ea6166f8c7	add comms_resetSame that resets relay with existing params.	2010-06-05 03:39:16 +00:00
eehouse	a80d874e9d	change api for board_zoom and change callers. No effect on java and no behavior change.	2010-06-05 03:39:06 +00:00
eehouse	9af9df884b	use same logic to decide to zoom and to report whether can zoom next time. Fixes bug preventing + button from greying out when fully zoomed in.	2010-06-05 03:38:49 +00:00
eehouse	1f246d20a3	oops. Fix assertion by not stopping dragging unless it's been started.	2010-06-04 03:47:56 +00:00
eehouse	57013a9267	stop dragging before putting up miniwindow. This allows to drag finger off of bonus hint just displayed without scrolling the screen.	2010-06-04 03:47:46 +00:00
eehouse	628f8d9cf3	don't zoom in if doing so will make cells larger than the limit passed in.	2010-06-03 04:57:11 +00:00
eehouse	4f16eee1b6	pass maxCellSize into board_setPos, and use it as limit in calculating whether any further zooming is possible.	2010-06-02 04:58:32 +00:00
eehouse	f5ac51ae73	fix crash using older dict by using current stream version rather than one from before gameSeconds was being preserved in the stream by write_gi code. I fixed this on a branch a week ago as well, so look for a merge glitch. Need now to confirm that I'm sending char lists in initial connect message in the right (null-separated utf8) format.	2010-05-28 02:31:13 +00:00
eehouse	4ce0a30b2d	save gameSeconds even if timer not enabled. Means stream version change.	2010-05-14 12:42:53 +00:00
eehouse	c79b3e2395	make draw_scoreBegin return a boolean like the other two draw_*Begin methods	2010-05-12 11:51:14 +00:00
ehouse	71110a195d	for some reason on wince coords are passed to coordToCell() that are above/left of the board firing an assertion. return false to indicate not on board but don't assert.	2010-04-24 03:51:39 +00:00
eehouse	166c1ac779	make coordToCell() more inclusive to match pointOnSomething(), otherwise the latter says a point is on the board and the former can't assign it a row.	2010-04-23 09:35:15 +00:00
eehouse	a07cdd8513	limit depth of zoom further	2010-04-17 04:16:17 +00:00
eehouse	da2cfa5934	changes (commited earlier but now somehow missing) putting scroll-related fields into a struct so vertical and horizontal can be handled by the same code; add to board_zoom out params indicating whether further zooming is possible.	2010-04-15 02:15:50 +00:00
eehouse	339fc5a9e6	don't zoom down below two cells so we can still drag-scroll	2010-04-08 04:15:33 +00:00
eehouse	41b29c9ba3	distribute extra pixels evenly, with extras one each at the beginning of the arrays.	2010-04-08 04:15:25 +00:00
eehouse	d01a30d1be	adjust yOffset same as x so we zoom in toward center; reduce xOffset when zoom out makes it too big.	2010-04-08 04:15:16 +00:00
eehouse	a87ecf5638	pass vScale and hScale into draw_boardBegin so platform can use same size font for all cells regardless of size; fix scrolling to pass actual sum of the disappearing rows' heights.	2010-04-08 04:14:55 +00:00
eehouse	5922d8c96a	fix coordToCell to return false when cell off board -- to fix bug where blank tiles were drawn on top of tray area when scrolled down there.	2010-04-08 04:14:42 +00:00

... 8 9 10 11 12 ...

1548 commits