about summary refs log tree commit diff homepage
path: root/merge.c (unfollow)
Commit message (Collapse)Author
2018-08-22Implement rJune McEnroe
2018-08-22Add F-keys to set shiftJune McEnroe
2018-08-22Add C-a and C-xJune McEnroe
2018-08-22Implement ` ~ and xJune McEnroe
2018-08-22Fix black-on-black once againJune McEnroe
2018-08-21Track cell{X,Y} client-side and implement swapsJune McEnroe
2018-08-21Maintain a tile client-side and support cursorsJune McEnroe
2018-08-21Replace client with rudimentary CP437 supportJune McEnroe
2018-08-21Use alignas rather than attributesJune McEnroe
2018-08-21Shrink the torus and rearrange struct TileJune McEnroe
2018-08-21Remove spawnsJune McEnroe
This reverts 66761cd30ee1da5b820c89c38fac6caf42fbe715 and commits after it.
2018-08-21Clean up MakefileJune McEnroe
Having .o files depend on .h files works correctly everywhere, it seems.
2018-08-05Fix color pairs once and for allJune McEnroe
8/16 color setup adapted from chat/ui.c. termcap patch hack no longer required. Black on black and bright black now work. Nothing will appear bold anymore on 256-color terminals. The keys for black have definitely always been in the help. You just didn't notice.
2018-08-05Add chat to index.htmlJune McEnroe
2018-07-25Set client sockets SNDBUF to twice tile sizeJune McEnroe
On Darwin and FreeBSD, this is already the default buffer size, but on (32-bit?) NetBSD, it's only 4K.
2018-07-24Revert "Do not set non-blocking on client sockets"June McEnroe
This reverts commit 44bec9d4ec5d3240b1c518ff11bfd3d8a19d2354. There actually are adverse effects.
2018-07-24Print time_t with %jd in metaJune McEnroe
On 32-bit NetBSD, time_t is 'long long int' rather than 'long int'. This works everywhere.
2018-07-24Do not set non-blocking on client socketsJune McEnroe
On NetBSD, the send buffer seems to only be 4096 bytes, so sending SERVER_TILE would get cut short. Just not setting non-blocking allows messages to properly get through and *seems* to have no adverse effect.
2018-07-24Use EV_SETJune McEnroe
NetBSD kevent.udata is uintptr_t rather than void * and the macro does the cast.
2018-07-24Link with -lcursesJune McEnroe
NetBSD has its own curses implementation and doesn't ship ncurses.
2018-07-23Fix NaNs in serverMapJune McEnroe
When there are very few touched tiles, even if they are recent, they will appear blue, because timeMin is also recent. I should figure out how to fix that.
2018-07-22Add libm.so to chroot.tarJune McEnroe
2018-07-22Link with -lmJune McEnroe
Darwin's lack of separation strikes again.
2018-07-22Add map to clientJune McEnroe
2018-07-21Refactor readInput for each modeJune McEnroe
2018-07-19Add ARRAY_LEN macroJune McEnroe
2018-07-17Add server map generationJune McEnroe
2018-07-17Tabify sourceJune McEnroe
And other style changes.
2018-05-13Fix ncurses color pair numberingJune McEnroe
This was dumb. Of course all the color pairs fit in 64, but I was shifting too much because my own representation includes the bright bit.
2018-04-09Use anonymous unionJune McEnroe
2018-04-09Replace #define with enum or const where possibleJune McEnroe
2018-03-31Link against ncursesJune McEnroe
2018-03-05Miscellaneous code cleanupJune McEnroe
2018-03-05Pass message structs by valueJune McEnroe
2018-03-05Use stdio in merge and metaJune McEnroe
2018-03-05Clean up spawn constantsJune McEnroe
2018-03-05Rename Tile timestamps {create,modify,access}TimeJune McEnroe
2018-03-05Pack message type enumsJune McEnroe
2018-03-05Undef COLOR_ constants in torus.hJune McEnroe
2018-03-05Generate tagsJune McEnroe
2017-10-03Simplify Makefile with pattern ruleJune McEnroe
Insert rant about how GNU make handles the .c rule with extra dependencies. Also I don't care that everything links curses now.
2017-09-27Remove leading blank linesJune McEnroe
2017-09-27Add merge.c to READMEJune McEnroe
2017-09-03Assert client coords are valid after movementJune McEnroe
2017-09-03Relicense AGPLJune McEnroe
I know it's already published under a permissive license in what is probably its final form, but I want to license it AGPL anyway on principle following some conversations I had about open source, corporations and copyleft.
2017-09-01Revert "Add client readOnly mode"June McEnroe
This reverts commit 34f25ae40a3db9369e9d98b3814f2b93bbc21451.
2017-09-01Remove clientRemove call from clientCastJune McEnroe
If an error occurs on a client socket during a broadcast, that client will show up in the kqueue loop with EV_EOF and get removed that way. Tested by sending SIGKILL to a client and watching its cursor disappear.
2017-09-01Add client readOnly modeJune McEnroe
2017-08-31Clean up merge toolJune McEnroe
Choose the version with the most recent access if the modify times are the same.
2017-08-31Choose B for tiles with equal modify timesJune McEnroe
This way newer access counts and times will be preserved.