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

282 commits

Author SHA1 Message Date
Eric House
4c923ead08 add isLocal param to server_getCurrentTurn 
I want to store this information separately in summaries tables so
e.g. games can be displayed sorted by whether it's the local player's
turn.
 2016-08-26 06:58:55 -07:00
Eric House
3b24aab8c3 add new jni call board_containsPt() 
for use debugging layouts/orientation changes later
 2016-08-15 17:26:10 -07:00
Eric House
bf7a38da08 copy more state into board being used for snapshot 2016-08-05 21:19:49 -07:00
Eric House
8b142e4a56 use new board_drawSnapshot() from android 
BoardCanvas wouldn't render anything without an associated dict via
dictChanged()
 2016-08-05 11:51:47 -07:00
Eric House
0c6283ea63 add board_drawSnapshot 
Toward something that should work with android: pass a potentially
unique draw context into new method that creates a new board just for
the draw and makes its scoreboard and tray disappear.
 2016-08-05 10:23:39 -07:00
Eric House
3c0a128266 produce, store and display actual snapshot 
Done in a way that won't work for Android just to try out the gtk
way. Tweaks and reuses the existing draw context and board, which is
precisely what the android version can't easily do.
 2016-08-05 09:42:55 -07:00
Eric House
2ca0fe5ca4 add board_getSelPlayer() 2016-03-06 06:34:49 -08:00
Eric House
86883eb51a handle tap on scoreboard by showing last move summary (as happens for 
long-tap) when option to switch users is disabled.
 2016-02-18 07:46:36 -08:00
Eric House
5084e70843 fix bug: if you're iterating through hints and you drag a tile to the 
left of tray divider (without moving divider) it may still be included
in hinted moves. Fix is to reset engine whenever the set of tiles left
of divider changes.
 2016-02-05 07:29:51 -08:00
Eric House
122335c53c Merge branch 'android_branch' into relay_noconn 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2015-09-17 07:00:04 -07:00
Eric House
cba1293bec make return value void since it's never used 2015-09-15 20:54:01 -07:00
Eric House
47954f82d0 add index of sending player to chat transmission, and on receiving 
side translate that into showing the sender's name in
notification. Not yet done: replacing silly "not me" in chat listing
with same, but now it should be easy.

Conflicts:
	xwords4/android/XWords4/archive/R.java
 2015-08-12 07:43:20 -07:00
Eric House
8f7267b3ec add index of sending player to chat transmission, and on receiving 
side translate that into showing the sender's name in
notification. Not yet done: replacing silly "not me" in chat listing
with same, but now it should be easy.
 2015-08-12 07:36:36 -07:00
Eric House
684c7ff3e3 Merge branch 'android_branch' into relay_noconn 
Conflicts:
	xwords4/android/XWords4/archive/R.java
	xwords4/android/XWords4/res/values/strings.xml
	xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
	xwords4/android/XWords4/res_src/values-ca_PS/strings.xml
	xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSInviteDelegate.java
 2015-07-26 13:22:45 -07:00
Eric House
75cd6c6693 fix logic behind "unable to find move" alert 2015-07-26 13:17:59 -07:00
Eric House
0bb51e8b93 show a toast when hint can't find anything, on the principle that user 
should see some response to every action.

Conflicts:
	xwords4/android/XWords4/archive/R.java
 2015-07-26 12:09:15 -07:00
Eric House
5dc8291981 show a toast when hint can't find anything, on the principle that user 
should see some response to every action.
 2015-07-11 16:24:21 -07:00
Eric House
33d0db93e8 add some consts 2015-07-06 20:23:22 -07:00
Eric House
f0c3c11dc8 invalidate all tiles after committing a turn in order to force redraw 
of the Pts. display in case where fewer than seven tiles remain and
the board isn't being switched.
 2015-06-10 07:31:00 -07:00
Eric House
4eb836ab2b fix to compile -- graft missed a constant defined earlier 2014-10-09 21:21:27 -07:00
Eric House
badc40f90b move dividerLoc into model and use to limit sorting to tiles to its 
right
 2014-10-09 20:09:24 -07:00
Eric House
a485480496 make divider wider 2014-09-22 07:05:45 -07:00
Eric House
b77d529099 fix linux-side compile errors 2014-08-21 07:15:20 -07:00
Eric House
e998fbfcba log less 2014-08-09 17:11:35 -07:00
Eric House
56336f7178 double the max size of a tile, fixing board not using full screen in 
portrait mode on Nexus 10.
 2014-07-24 20:36:37 -07:00
Eric House
a902bdcbad limit width of scoreboard too 2014-07-17 21:31:17 -07:00
Eric House
d51a5e67f0 fix for super-wide screen: tiles are never wider than tall. Next: 
scoreboard.
 2014-07-17 08:01:00 -07:00
Eric House
39983f65b6 remove logging 2014-02-27 21:44:25 -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
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
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
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
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
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