Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-28 09:58:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
8012 commits 20 branches 240 tags 30 MiB
Commit graph

255 commits

Author SHA1 Message Date
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
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
e90c5ee94f pass index of resigning player into util_notifyGameOver. Not yet 
passed into java.
 2012-10-09 05:31:12 -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
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
2f8b6cceb5 pass additional param into callback -- unused so far. 2012-09-06 07:19:12 -07:00
Eric House
32e1530d3f i => ii; no other change 2012-08-22 07:44:21 -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
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
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
2564a660ad remove logging 2012-05-18 21:23:12 -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
Andy2
b0470d5276 add new preference that when set prevents calculation and drawing of 
crosshairs.
 2011-12-06 18:17:55 -08:00
Andy2
3e21b7845a comment 2011-12-01 21:04:31 -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
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
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
88f556356c dict_tileForString -> dict_tilesForString 2011-10-31 20:56:48 -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
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
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
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
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
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