 James Osborne
|
cab3de3ff4
|
upstream-master-20260614
CMake / build (macos-latest) (push) Has been cancelled
CMake / build (ubuntu-latest) (push) Has been cancelled
upstream master 20260614
|
2026-06-14 19:12:29 -04:00 |
|
 Your Name
|
9150e85442
|
Merge remote-tracking branch 'upstream/master' into feature/upstream-master-20260614
# Conflicts:
# src/Client.cc
# src/IPStackSimulator.cc
# src/ReceiveCommands.cc
# src/ReceiveSubcommands.cc
# src/SendCommands.cc
# src/ServerState.cc
# src/ServerState.hh
|
2026-06-14 18:30:38 -04:00 |
|
 Martin Michelsen
|
3cdb5e91a8
|
name Root structures appropriately
|
2026-06-14 10:03:55 -07:00 |
|
|
Martin Michelsen
|
629e2bb4cd
|
make replay tests run in parallel and share immutable data
|
2026-06-14 09:27:55 -07:00 |
|
|
James Osborne
|
ce39dfc66a
|
Update README.md
|
2026-06-14 12:14:22 -04:00 |
|
|
James Osborne
|
448d212aea
|
Update README.md
|
2026-06-14 12:13:31 -04:00 |
|
|
James Osborne
|
0208bf26d9
|
Send account lock session-end on logout
Send account lock session-end on logout
|
2026-06-14 03:40:52 -04:00 |
|
|
Your Name
|
1951506dd6
|
Send account lock session-end on logout
|
2026-06-14 03:32:25 -04:00 |
|
|
James Osborne
|
d5e429b86a
|
Gate BB login lock before character select
Gate BB login lock before character select
|
2026-06-14 00:24:33 -04:00 |
|
|
Your Name
|
6dacf2c152
|
Gate BB login lock before character select
|
2026-06-14 00:15:23 -04:00 |
|
|
Martin Michelsen
|
1737d8abc8
|
add more options in IntegralExpression
|
2026-06-13 20:07:23 -07:00 |
|
|
Martin Michelsen
|
554fc5d208
|
make check-quests parallel
|
2026-06-13 17:16:04 -07:00 |
|
|
Martin Michelsen
|
0dbb34b9f9
|
don't share iconv_t objects between threads
|
2026-06-13 17:16:04 -07:00 |
|
|
Your Name
|
4219eb84c7
|
Revert "Ignore local source artifacts"
This reverts commit 46c365fda0.
|
2026-06-13 19:59:01 -04:00 |
|
|
Your Name
|
46c365fda0
|
Ignore local source artifacts
|
2026-06-13 19:57:53 -04:00 |
|
|
Martin Michelsen
|
5739f99912
|
port 60 FPS code to all GC versions
|
2026-06-13 15:55:02 -07:00 |
|
|
Martin Michelsen
|
9647fe4d63
|
make $item command use game item ID space
|
2026-06-13 10:25:25 -07:00 |
|
|
Martin Michelsen
|
7c007d1b1e
|
fix payment item handling in 6xDA
|
2026-06-13 10:25:25 -07:00 |
|
|
Martin Michelsen
|
45b33a3c3a
|
add timing in check-quests
|
2026-06-13 10:25:25 -07:00 |
|
|
James Osborne
|
a611462655
|
team sync team chat relay fix
team sync team chat relay fix
|
2026-06-12 22:06:32 -04:00 |
|
|
Your Name
|
4e8253c38f
|
Log TeamSync chat exchange flow
|
2026-06-12 21:50:54 -04:00 |
|
|
Your Name
|
15266e0ef9
|
Log TeamSync team chat relay attempts
|
2026-06-12 21:36:16 -04:00 |
|
|
Your Name
|
133041f09b
|
Relay TeamSync team chat events
|
2026-06-12 20:40:15 -04:00 |
|
|
James Osborne
|
989eabe3a0
|
Merge pull request #36 from incentivebeats/feature/team-sync-phase3-team-management
Add TeamSync team management events
|
2026-06-12 18:02:28 -04:00 |
|
|
Your Name
|
f883367eaa
|
Add TeamSync team management events
|
2026-06-12 16:39:46 -04:00 |
|
|
James Osborne
|
91c4711c48
|
Merge pull request #35 from incentivebeats/feature/team-sync-phase2-points-names
Add TeamSync member name and points updates
|
2026-06-12 16:08:22 -04:00 |
|
|
Your Name
|
f4af1a73f1
|
Add TeamSync member name and points updates
|
2026-06-12 15:46:36 -04:00 |
|
|
James Osborne
|
b450a04be4
|
team sync chat relay
Feature/team sync chat relay
|
2026-06-12 15:32:48 -04:00 |
|
|
Your Name
|
23015614ed
|
Harden TeamSync canonical state application
|
2026-06-12 14:39:07 -04:00 |
|
|
Your Name
|
cf380e93d2
|
Guard unsupported TeamSync team mutations
|
2026-06-12 13:02:06 -04:00 |
|
 incentive
|
21bceac1e3
|
Route TeamSync member mutations through coordinator
|
2026-06-12 01:26:18 -04:00 |
|
|
incentive
|
b578c1cbbe
|
Apply TeamSync team membership to account records
|
2026-06-12 01:23:59 -04:00 |
|
|
incentive
|
44650179f0
|
Route TeamSync team creation through coordinator
|
2026-06-12 01:07:12 -04:00 |
|
|
incentive
|
7526176bb3
|
Add TeamSync outbound team create queue
|
2026-06-12 01:02:13 -04:00 |
|
|
incentive
|
4d893607c2
|
Add TeamSync canonical team state apply scaffold
|
2026-06-12 00:57:17 -04:00 |
|
|
incentive
|
6995e5b7f4
|
Improve TeamSync coordinator error logging
|
2026-06-11 22:34:47 -04:00 |
|
|
incentive
|
e9187609ae
|
Add TeamSync exchange task scaffold
|
2026-06-11 22:28:35 -04:00 |
|
|
incentive
|
bf3c9c08e6
|
Harden TeamSync config parsing
|
2026-06-11 22:00:23 -04:00 |
|
|
incentive
|
c4fb18b3b4
|
Add TeamSync configuration scaffold
|
2026-06-11 21:59:00 -04:00 |
|
|
James Osborne
|
fe412ebd84
|
merge upstream master 20260611
Feature/merge upstream master 20260611
|
2026-06-11 20:02:10 -04:00 |
|
|
incentive
|
ee5ee49d22
|
Use EmulatorBase DisassembleResult for DOL semantic diff
|
2026-06-11 19:18:07 -04:00 |
|
|
incentive
|
12481996b8
|
Merge upstream master
# Conflicts:
# README.md
|
2026-06-11 18:31:23 -04:00 |
|
|
James Osborne
|
aae7e64018
|
Add BB license update admin endpoint
Add BB license update admin endpoint
|
2026-06-11 18:28:17 -04:00 |
|
|
incentive
|
ed47fdc5d1
|
Add BB license update admin endpoint
|
2026-06-11 13:13:27 -04:00 |
|
|
James Osborne
|
021cb9b176
|
account login locks
Feature/account login locks
|
2026-06-11 12:19:25 -04:00 |
|
|
incentive
|
3d37aacc06
|
Add login lock coordinator heartbeat
|
2026-06-11 02:06:07 -04:00 |
|
|
incentive
|
56084c736f
|
Add coordinator login lock acquire request
|
2026-06-11 01:28:23 -04:00 |
|
|
incentive
|
6a4789b248
|
Add login lock session plumbing
|
2026-06-11 01:22:32 -04:00 |
|
|
James Osborne
|
f18d5a468c
|
Allow account concurrency across client sources
Allow account concurrency across client sources
|
2026-06-10 15:35:53 -04:00 |
|
|
incentive
|
79fa456365
|
Allow account concurrency across client sources
|
2026-06-10 15:27:17 -04:00 |
|