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

8962 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eric House
dd242c3ff5 make undo ratio operate on 1/1000 scale -- and even with this it's 
overwhelming when more than 40 clients are running.
 2015-12-30 21:23:29 -08:00
Eric House
c9264eecac add debug-only code to assert that the hash on the move stack remains 
unchanged across a push and pop. Was used to verify memstream.c change
just committed.
 2015-12-30 06:31:02 -08:00
Eric House
0a91f852cc add commented-out flag 2015-12-30 05:59:52 -08:00
Eric House
a2ca381890 remove assert when hashes don't match. As currently implemented, this 
can happen when somebody does an undo, since the ordering of undos and
moves is not assured. The result is a temporary (I think) stall, where
a move is rejected because the hash doesn't match, but that will be
accepted later when the undo's been processed and the hash will now
match.
 2015-12-30 05:59:06 -08:00
Eric House
89138edae1 when dumping stream, preserve the subset of bits in the last word 
that's real data. This fixes assertions that after popping a move off
the move stack the hash is the same as before it was pushed. It may or
may not be sufficient to fix reported stalls, but it's certainly
necessary.
 2015-12-30 05:56:01 -08:00
Eric House
6ce1fbe465 add red Dbg to the middle of variant's icon 2015-12-30 05:53:37 -08:00
Eric House
4ed843a529 start UDP at 100% by default since all clients will be that way now 2015-12-29 19:01:15 -08:00
Eric House
c96861b329 wrap hash-related logging in ifdefs so can be easily turned on 2015-12-29 19:00:30 -08:00
Eric House
e3d6cb74fc for some reason log files are now considered binary by grep, so -a option's needed 2015-12-29 18:59:52 -08:00
Eric House
5e3f7d0731 remove logging 2015-12-29 18:58:28 -08:00
Eric House
2f5ae51d3f experimental change toward fixing networking stalls: when the cache 
thinks the network isn't up, check anyway. Probably needs to be done
on a backoff timer so we aren't checking every few milliseconds....
 2015-12-29 07:14:27 -08:00
Eric House
299b8ddc70 assert when hashes don't match. This may be legit, but I need to 
understand when it can happen because I think it's the cause of games
failing to communicate in the field
 2015-12-29 07:11:05 -08:00
Eric House
78d435c8cc fix what are errors with new compiler 2015-12-29 07:09:50 -08:00
Eric House
ec9f233fdd fix assertion, and up version code since I already uploaded a beta to 
google
 2015-12-27 20:48:41 -08:00
Eric House
b4d919b3a1 remove logging 2015-12-22 11:46:19 -08:00
Eric House
285dedb75f fix NPE -- by inspection after a logged crash: can't reproduce 2015-12-21 22:31:27 -08:00
Eric House
49caf6505a up strings and changelog for new release 2015-12-21 18:50:04 -08:00
Eric House
7878fd8fcc fix test to hide menu when it'll otherwise cause an array 
out-of-bounds exception. Thanks Aidan.
 2015-12-21 18:23:41 -08:00
Eric House
3635abb17d changes in players matter for local games too 2015-12-21 18:22:04 -08:00
Eric House
ea4e437e94 fix, by inspection, NPE reported through the Play Store. 2015-12-21 18:21:59 -08:00
Eric House
c48580b4ba generated changes 2015-12-21 18:04:35 -08:00
Eric House
3da798f437 required by prev commit: follow api change to work around marshmallow 
address change.
 2015-12-21 18:00:41 -08:00
Eric House
f78cd0f656 fix another source of bad/marshmallow addresses, and add asserts to 
catch any others.
 2015-12-21 18:00:25 -08:00
Eric House
162ab11f12 fix, at least for most cases, Marshmallow change that doesn't let an 
app know the BT/Mac addr of its own interface. The new bogus addr is
transmitted in common/ structs, and so sending code need to look up by
name when told to use that address.
 2015-12-21 18:00:06 -08:00
Eric House
b3a2e28647 copy over from android_translate branch 2015-09-17 19:38:00 -07:00
Eric House
6f3b80cc68 catch up with recent changes 2015-09-17 07:11:39 -07:00
Eric House
db1f569430 in chat window, don't show send menu item unless text is non-empty 2015-09-17 06:59:02 -07:00
Eric House
b8822f72bc Change return types to match recent signature change. Apparently the 
NDK's compiler is configured to be stricter than Ubuntu's.
 2015-09-17 06:51:15 -07:00
Eric House
34ecd92ff5 script to copy translation data from android_translate branch 2015-09-16 07:01:09 -07:00
Eric House
6eb2e8e174 pull in latest French translation 2015-09-16 06:49:52 -07:00
Eric House
5d59bcd011 Revert to old proto since the version that's out there now won't work 
with the new. Can switch once this version's distributed.
 2015-09-16 06:42:01 -07:00
Eric House
f3d8f0b8ee pass V=1 to ndk build script to make cc calls verbose 2015-09-15 20:57:39 -07:00
Eric House
cba1293bec make return value void since it's never used 2015-09-15 20:54:01 -07:00
Eric House
05d0974823 Merge remote-tracking branch 'origin/android_branch' into android_branch 
# 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-15 20:46:35 -07:00
Eric House
c8fcc32c2c When two moves are identical (i.e. a one-letter word that forms two 
words words) drop one when looking for hints
 2015-09-14 08:49:52 -07:00
Eric House
759cd36162 Merge branch 'android_branch' of ssh://git.code.sf.net/p/xwords/git into android_branch 
Conflicts:
	xwords4/android/XWords4-dbg/AndroidManifest.xml
	xwords4/android/scripts/mkvariant.sh
 2015-09-10 18:34:28 -07:00
Eric House
1a258be2f4 merge in latest from android_translate branch 2015-08-27 21:57:19 -07:00
Eric House
53025f8a99 clean up plurals, adding quantity="one" elements in a few places where 
they make sense, collapsing a plurals to a string where that made
sense (there will probably never be a one-word wordlist), and removing
an unused plurals.
 2015-08-27 07:42:16 -07:00
Eric House
8e17e43d9a fix to not stop removing after removing the first elem 2015-08-27 06:41:47 -07:00
Eric House
a4e25576ad bring over changes from android_translate branch (via brute-force copy) 2015-08-26 07:00:54 -07:00
Eric House
83d3163f0e rename variable 2015-08-25 22:19:00 -07:00
Eric House
9a75ef29f2 fix misspelling 2015-08-25 06:46:03 -07:00
Eric House
26114f83a6 fix chat view not being opened if move had arrived after chat by 
removing unneeded variable whose presence was clearing flags.
 2015-08-25 06:38:14 -07:00
Eric House
2aa9740814 up strings and changelog for new release 2015-08-25 05:24:58 -07:00
Eric House
a073ad68ae add missing image 2015-08-24 07:42:36 -07:00
Eric House
c35acdd773 ignore case where no files exist (so that /* doesn't expand) 2015-08-24 07:35:00 -07:00
Eric House
daaa346bb5 generate local.properties if running for first time 2015-08-24 07:24:28 -07:00
Eric House
5fd477be75 use existing string -- Copy to clipboard 2015-08-23 21:52:07 -07:00
Eric House
98bd41bc14 experimental option that puts invite url text into clipboard so user 
can invite using app of her choice.

Conflicts:
	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/DlgDelegate.java
 2015-08-23 21:44:45 -07:00
Sylvie
ec3af948e3 Translated using Weblate (Dutch) 
Currently translated at 100.0% (691 of 691 strings)
 2015-08-23 21:17:16 -07:00