50e4daaf0c
Use ComparisonChain here.
...
Does anyone know if these colorization names can indeed be null?
Otherwise we can remove the null-safe comparator.
It was previously calling ObjectUtil.compareTo() which leads
me to think it needed null-safety.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@939 c613c5cb-e716-0410-b11b-feb51c14d237
2010-07-14 21:02:21 +00:00
0a0a658c94
Prefer guava over samskivert.
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@938 c613c5cb-e716-0410-b11b-feb51c14d237
2010-07-14 20:43:13 +00:00
dc789fc46d
In with the new logging
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@937 c613c5cb-e716-0410-b11b-feb51c14d237
2010-07-09 23:33:56 +00:00
b7f8279245
Match the related nenya change to MisoScenePanel
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@936 c613c5cb-e716-0410-b11b-feb51c14d237
2010-07-09 23:28:36 +00:00
7272ec222a
As part of the second pass on AS recoloring, setup recoloring scenes appropriately.
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@935 c613c5cb-e716-0410-b11b-feb51c14d237
2010-07-07 18:05:54 +00:00
338f292e6f
a) Why didn't ack find this for me?
...
b) How do we have this much fucking code?
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@934 c613c5cb-e716-0410-b11b-feb51c14d237
2010-06-28 20:09:54 +00:00
bd132e83b0
Let's not explicitly require an IntSet here either.
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@933 c613c5cb-e716-0410-b11b-feb51c14d237
2010-06-22 16:17:19 +00:00
3536e0225a
That should be private.
...
If it's public, we try to shadow it in a subclass & wind up still
getting THIS one.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@932 c613c5cb-e716-0410-b11b-feb51c14d237
2010-06-18 23:40:19 +00:00
4f6a3767fd
Like getPendingModel, cope if there's no _pendingData
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@931 c613c5cb-e716-0410-b11b-feb51c14d237
2010-06-18 23:40:18 +00:00
b9a8ea6454
Use the modified nenya Miso bits.
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@930 c613c5cb-e716-0410-b11b-feb51c14d237
2010-06-16 22:57:16 +00:00
aeecc32e38
Slay some cyclopian variables.
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@929 c613c5cb-e716-0410-b11b-feb51c14d237
2010-06-15 17:27:37 +00:00
e686402a46
Whitespace
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@928 c613c5cb-e716-0410-b11b-feb51c14d237
2010-06-15 17:27:35 +00:00
f6cbcc2642
Fix syntax
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@927 c613c5cb-e716-0410-b11b-feb51c14d237
2010-06-11 22:57:29 +00:00
1f9cf2beca
Don't NPE when we have a missing color class in the list, instead, return -1 to emulate the old IntIntMap behavior.
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@926 c613c5cb-e716-0410-b11b-feb51c14d237
2010-06-11 18:00:09 +00:00
2e3d310f7f
Switch to compiling against the aspirin library.
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@925 c613c5cb-e716-0410-b11b-feb51c14d237
2010-06-09 20:51:54 +00:00
6d2213c010
A little more of stage lib into actionscript.
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@924 c613c5cb-e716-0410-b11b-feb51c14d237
2010-06-08 17:43:39 +00:00
94a021008e
Initial port of stage data (and some stub client bits) from java to actionscript.
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@923 c613c5cb-e716-0410-b11b-feb51c14d237
2010-06-08 01:53:34 +00:00
4f739b8bfe
Incorporate the fixes from the java side to make actionscript handle the not-yet-cached scene case correctly.
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@922 c613c5cb-e716-0410-b11b-feb51c14d237
2010-06-08 01:52:35 +00:00
2c680a0c40
Make vilya's preptools target work like narya's.
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@921 c613c5cb-e716-0410-b11b-feb51c14d237
2010-06-08 01:49:40 +00:00
9e9ac7f2d3
Change a StreamableIntIntMap into a more standard StreamableHashMap
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@920 c613c5cb-e716-0410-b11b-feb51c14d237
2010-06-08 01:42:12 +00:00
5959f4e2d9
Split up some of the calls involved in resolving peered zones to make them easier to override.
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@919 c613c5cb-e716-0410-b11b-feb51c14d237
2010-06-01 23:49:38 +00:00
04780afe31
Let's make this work like SceneMoveHandler: if for some reason the client
...
has a *newer* version of the scene than the server, we assume it's an error
and make them redownload the full scene.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@918 c613c5cb-e716-0410-b11b-feb51c14d237
2010-05-31 02:37:17 +00:00
e320f8fca2
That worked great for those of us with some version of the scene
...
already cached, but what about those poor new folks?
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@917 c613c5cb-e716-0410-b11b-feb51c14d237
2010-05-28 01:19:42 +00:00
fb3c4d73fb
Okay fine, it wants ObjectInfo still, and we don't have it in actionscript. So, let's take that away once again.
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@916 c613c5cb-e716-0410-b11b-feb51c14d237
2010-05-27 23:29:40 +00:00
b206917ee7
Restoring the only part of r911 that it turns out I actually wanted in the first place. And even that I'm not using yet.
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@915 c613c5cb-e716-0410-b11b-feb51c14d237
2010-05-27 21:07:38 +00:00
87d851a6f9
Those override things
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@914 c613c5cb-e716-0410-b11b-feb51c14d237
2010-05-27 20:37:17 +00:00
adeb3054d4
Make the zone handling appropriately peer-aware. It's worth noting that due to adding moveRequiresServerSwitch() to ZoneService, this will break some things which use this.
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@913 c613c5cb-e716-0410-b11b-feb51c14d237
2010-05-27 20:30:53 +00:00
c01ff63cd6
- Rolled back r911 since it broke the build, I'm not sure if mike noticed it was busted, but
...
he's gone for today, and I need ooo-libs building
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@912 c613c5cb-e716-0410-b11b-feb51c14d237
2010-05-26 01:29:30 +00:00
a0add19c9d
Enable vilya building as versions of its services from genservice, and check in the ones that hadn't previously been committed.
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@911 c613c5cb-e716-0410-b11b-feb51c14d237
2010-05-25 20:51:13 +00:00
a996cf60c8
Add Zone handling to vilya's actionscript side to go with scene handling. Also, handle SceneDirector's forcedMove in the same way the java side does in the face of already pending moves.
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@910 c613c5cb-e716-0410-b11b-feb51c14d237
2010-05-25 20:46:23 +00:00
42fd385710
Include jar for JSR-250
...
The @Generated annotation showed up in JSR-250 and then was bundled into
Java 1.6. For those of us stuck in a 1.5 world, there's fortunately a
nice tiny little jar with the necessary classes, so slurp that in.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@909 c613c5cb-e716-0410-b11b-feb51c14d237
2010-04-08 21:24:37 +00:00
9c8a3dda8d
Remove trailing whitespace/unused imports
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@908 c613c5cb-e716-0410-b11b-feb51c14d237
2010-04-07 20:32:04 +00:00
ec4b19e7c9
Run generators
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@907 c613c5cb-e716-0410-b11b-feb51c14d237
2010-04-07 20:32:02 +00:00
83b1dabc36
Redundant super interface
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@906 c613c5cb-e716-0410-b11b-feb51c14d237
2010-04-01 23:06:59 +00:00
ec69dd15f7
ant genrecord.
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@905 c613c5cb-e716-0410-b11b-feb51c14d237
2010-03-24 20:12:01 +00:00
dad43e916c
If a player gets yanked out of a game during the period where everyone's arriving, we weren't noticing that they were gone and were still playing along, sending them events, etc. So, if we're in pre-game, and someone disappears, let's note that.
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@904 c613c5cb-e716-0410-b11b-feb51c14d237
2010-03-18 00:30:47 +00:00
39b21ef6d6
Should be no harm in compiling against Guava instead of GC as they have the
...
exact same API. So if you ship with GC instead of Guava, nothing will break.
Eventually we'll want to ship with Guava instead of GC so that we can use
Guava-specific methods, but projects can make that switch at their leisure.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@903 c613c5cb-e716-0410-b11b-feb51c14d237
2010-03-16 23:53:10 +00:00
28e24afd73
When we undo/redo in the editor, we need to ensure that our model switch gets propagated to the scene being held by the frame and info panel.
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@902 c613c5cb-e716-0410-b11b-feb51c14d237
2010-03-16 16:53:11 +00:00
e4e5990361
Not sure it really matters in the editor-specific code, but this IS safer if a bit more verbose...
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@901 c613c5cb-e716-0410-b11b-feb51c14d237
2010-03-11 01:27:51 +00:00
b8b1a414be
Add Undo/Redo to the Scene Editor - Rollback visibility is limited to 20 steps since it's ocpying the entire model at each step.
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@900 c613c5cb-e716-0410-b11b-feb51c14d237
2010-03-11 00:54:14 +00:00
c2500248db
Make event/board seeding actually do it RIGHT
...
Requesting N bits on certain types of events was enough to tickle timing
issues with events between client & server so I got those cleared up,
and in a roundabout way made piece prediction harder, BUT it wasn't
actually doing what I'd really intended. I'd originally done things this
way (call something on the RNG N times) and then in a brief moment of
brilliant stupidity went "gee, next() does different stuff based on the
number of bits you asked for, so clearly it'll mix things up"
Man, this hairshirt is itchy.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@899 c613c5cb-e716-0410-b11b-feb51c14d237
2010-02-17 04:40:34 +00:00
09dbd1c95a
@Override gets the point across
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@898 c613c5cb-e716-0410-b11b-feb51c14d237
2010-02-10 20:32:49 +00:00
bee3ff77f3
Whitespace
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@897 c613c5cb-e716-0410-b11b-feb51c14d237
2010-02-10 20:32:45 +00:00
038604d1d2
Make piece prediction harder.
...
Since the client & server share RNGs, many puzzles (e.g. yohoho's
swordfighting) wind up lending themselves to easy piece prediction; the
board is set up with a seed, and the RNG is only ever used to generate
pieces. Someone snooping that could (and people have) pre-generate all
the pieces in order, letting you snoop ahead.
Now, Board implementations can choose to use certain events to pull bits
from the RNG so that the actual ACTIONS taken perturb things, making
things branch to the point that prediction is prohibitively hard.
A while back, I'd wanted to do this across the board for all actions,
but unfortunately in yohoho we have various non-board-altering events
that come in and are executed in different orders on client and server,
so things fell out of sync pretty quickly. The thought rattled around in
my head again, so I'm doing it again. This time, Boards have to
explicitly opt in on each event, so they can be sure to restrict it to
those that are safe to use.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@896 c613c5cb-e716-0410-b11b-feb51c14d237
2010-02-09 04:11:36 +00:00
fcd8a9d901
Whitespace
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@895 c613c5cb-e716-0410-b11b-feb51c14d237
2010-02-09 04:11:34 +00:00
1dac539f6d
Pngcrush
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@894 c613c5cb-e716-0410-b11b-feb51c14d237
2010-02-09 04:11:32 +00:00
15c3a1996d
Regenerated: DSets just clone() now.
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@893 c613c5cb-e716-0410-b11b-feb51c14d237
2010-02-04 21:49:40 +00:00
d950cd6a51
Nix redundant cast.
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@892 c613c5cb-e716-0410-b11b-feb51c14d237
2010-01-13 19:11:56 +00:00
fa3d68369f
Now-spurious casts
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@891 c613c5cb-e716-0410-b11b-feb51c14d237
2010-01-13 18:52:38 +00:00
c94d387815
Reconcile the differences between SparseMisoSceneModel.clone & AuxModel.clone
...
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@890 c613c5cb-e716-0410-b11b-feb51c14d237
2010-01-13 18:52:23 +00:00
Ray Greenwell