Commit Graph

415 Commits

Author SHA1 Message Date
Salanto
6b4a19ca66 English is hard 2021-03-31 15:30:01 +02:00
Salanto
a2153e58a5 Remove empty line 2021-03-31 15:30:01 +02:00
Salanto
27103e9620 Fix crash on empty evidence list 2021-03-31 15:30:01 +02:00
Salanto
f18c8733d0 Negative numbers not needed. 2021-03-31 15:30:00 +02:00
Salanto
ba56eaa66d Add /evidence_swap 2021-03-31 15:29:06 +02:00
in1tiate
f3d52e79c1
Merge branch 'master' into muties-for-cuties 2021-03-31 04:48:46 -05:00
in1tiate
a20f8b69bc
Merge branch 'master' into notecards 2021-03-31 04:41:41 -05:00
in1tiate
ed3b043f40 use iniswaps for pairing 2021-03-30 22:06:02 -05:00
scatterflower
d9b4936861
Merge pull request #33 from Cerapter/feature/docs
Doxygen documentation
2021-03-30 12:57:42 -05:00
in1tiate
ca0d5123d2
fix dumb mistake 2021-03-25 00:35:20 -05:00
Cerapter
c13a2d06f9 Merge branch 'master' into feature/docs 2021-03-24 21:02:21 +01:00
in1tiate
5277a7dd7c i was supposed to not commit this all at once but i forgot 2021-03-23 20:42:53 -05:00
Cerapter
bce07ec4c1 Further document AOClient 2021-03-21 21:02:53 +01:00
in1tiate
ef20ff00d7 add notecard functionality 2021-03-21 15:01:15 -05:00
scatterflower
1636dd93ef extremely important commit 2021-03-17 05:52:04 -05:00
in1tiate
d6b41d00d5 send hardcoded string only when client version is below 2.9.1 2021-03-15 18:20:08 -05:00
in1tiate
64d745dc0f Merge branch 'master' into feature/net-auth 2021-03-15 18:17:12 -05:00
scatterflower
c11546c7a8 make advertiser version string less stupid 2021-03-15 18:04:20 -05:00
Cerapter
0612494277
Document Server 2021-03-15 18:05:26 +01:00
Salanto
6415732da3 Logic is hard, mkay? 2021-03-15 16:38:37 +01:00
Cerapter
7d706b122d
Document WSClient 2021-03-15 15:29:03 +01:00
Salanto
6de72085af Prevent empty OOC name 2021-03-15 12:45:39 +01:00
scatterflower
27375ffa84
Merge pull request #35 from AttorneyOnline/music-stoppage
properly support music stopping
2021-03-14 21:06:14 -05:00
in1tiate
499765bfaa update version string 2021-03-14 20:37:25 -05:00
in1tiate
82a53826a9 properly support music stopping 2021-03-14 20:35:07 -05:00
scatterflower
cfc75798e7 add /about and update version string 2021-03-14 17:51:14 -05:00
in1tiate
4aba84734e
Merge branch 'master' into recent-bans 2021-03-14 17:44:02 -05:00
in1tiate
01f81c7107 always reload theme on subtheme change 2021-03-14 15:16:30 -05:00
in1tiate
954744d86a add /subtheme 2021-03-14 15:14:44 -05:00
in1tiate
6b3bfb2fda add some cute flavor text for permanent bans 2021-03-14 13:49:55 -05:00
in1tiate
9b32188cc6 add /unban and /removeuser 2021-03-14 13:44:12 -05:00
Cerapter
ea9716949d
Document WSProxy 2021-03-14 19:34:40 +01:00
in1tiate
b562b77be9 use BanInfo for inserting bans, send ban id and duration with KB packet 2021-03-14 13:28:59 -05:00
in1tiate
b5779b1aa5 add /bans 2021-03-14 13:13:26 -05:00
Cerapter
e49324fcbc
Document Logger 2021-03-14 19:03:16 +01:00
in1tiate
535c05f3e2 Merge branch 'master' of https://github.com/AttorneyOnline/akashi 2021-03-14 12:13:13 -05:00
in1tiate
2a8ed66c4f rework getClient into getClientsByIpid, alter /ban and /kick to report number of clients affected 2021-03-14 12:11:18 -05:00
scatterflower
ae0d308ec7 apparently ipids are different 2021-03-14 12:01:27 -05:00
scatterflower
c673339653 Add mute and unmute 2021-03-14 08:21:58 -05:00
scatterflower
5368601b67 remove desu 2021-03-13 13:40:37 -06:00
scatterflower
fa72e87e34 fix ip bans and generally make it work correctly 2021-03-13 13:33:47 -06:00
scatterflower
6a38e50c4f add ban durations (only works for hdid atm) 2021-03-13 13:25:09 -06:00
Cerapter
243caf4292
Add docuumentation to AreaData
Also patch up a few errors with the ConfigManager documentation.
2021-03-13 16:35:58 +01:00
scatterflower
f45099e47b implement tsu-like time parsing 2021-03-13 05:10:36 -06:00
scatterflower
18f76d68ea fix crash from old music packets 2021-03-13 03:17:46 -06:00
in1tiate
7a64521c40 Merge branch 'master' of https://github.com/AttorneyOnline/akashi 2021-03-12 22:51:11 -06:00
in1tiate
dd7daa0c88 fix /mods 2021-03-12 22:48:44 -06:00
scatterflower
e680bb9e07
Merge pull request #29 from Salanto/GM-Command
Gm command
2021-03-12 15:18:51 -06:00
Salanto
834f908d84 For real this time 2021-03-12 22:17:19 +01:00
Salanto
ed03666a2c Change permission, remove unused permission 2021-03-12 22:14:45 +01:00
Salanto
79d64e6153 Send music update to area instead of a single client 2021-03-12 22:12:33 +01:00
Cerapter
b15660e81d
Adjust Doxyfile, document Advertiser
The Doxyfile now correctly reports the version as "0.0.1", and private
and static members are also now extracted, if only to make the
documentation fuller.

The README.md file is used as the index page for the generated Doxygen
documentation.
2021-03-12 20:38:11 +01:00
Salanto
69911835ee Wrong permission 2021-03-12 18:44:35 +01:00
Salanto
56ef0d5958 Add /gm command 2021-03-12 18:41:21 +01:00
in1tiate
a62b12fb7a fix area config reading based on sanitized name 2021-03-12 05:01:31 -06:00
in1tiate
8b4929223c implement modchat 2021-03-11 23:58:51 -06:00
in1tiate
f43a498efa add /announce, change permission names for consistency 2021-03-11 23:49:42 -06:00
in1tiate
32c2d6a5e2
Merge branch 'master' into motd 2021-03-11 21:45:49 -06:00
in1tiate
027876a6ba
Merge pull request #28 from AttorneyOnline/fix/characters-taken
Fix characters not being correctly marked as taken
2021-03-11 21:44:44 -06:00
in1tiate
ee9ae6d7c6 rework characters_taken to be a QList<int> 2021-03-11 20:09:04 -06:00
in1tiate
d7870fd017 call arup in loadingDone instead of changeCharacter 2021-03-11 19:31:33 -06:00
Salanto
f06537973b Make permission check work; allow changed MOTD to be longer than one word 2021-03-12 00:56:54 +01:00
Salanto
06864e115a Make MODT editable - Part 1 2021-03-12 00:44:27 +01:00
Salanto
3e1f9825ca motd. Can't get simpler than that. 2021-03-11 22:42:47 +01:00
scatterflower
eba21d9108
Merge pull request #22 from AttorneyOnline/fix/area-sort
Fix areas being sorted lexicographically by storing a numerical position in the area name and sorting numerically
2021-03-11 13:42:58 -06:00
scatterflower
325aeb5349
Merge pull request #21 from AttorneyOnline/in1tiate/commands-uwu
Fixes and improvements
2021-03-11 13:42:48 -06:00
scatterflower
b515407967 make ms port selection actually work?? 2021-03-11 13:32:20 -06:00
in1tiate
9d10431da7 store a position in area config and sort areas numerically 2021-03-11 09:57:41 -06:00
in1tiate
e60f7e6796 update version string 2021-03-11 05:29:46 -06:00
in1tiate
07a19fe8cd don't allow for locked areas with no cm 2021-03-11 04:52:54 -06:00
in1tiate
bd471eda00 switch to QRegularExpression for client version validation 2021-03-11 04:32:41 -06:00
scatterflower
8c39d6ee35 finish implementing evidence mod 2021-03-11 03:33:35 -06:00
in1tiate
7157d5410e vastly improve client version string validation 2021-03-11 02:22:03 -06:00
scatterflower
1d4c1b8cda add all evidence mods EXCEPT hiddencm 2021-03-11 02:05:38 -06:00
in1tiate
953426fea1 fix status in area list, replace number() with str literal 2021-03-11 02:00:33 -06:00
scatterflower
5b328859cd
Merge pull request #20 from AttorneyOnline/in1tiate/commands-uwu
Add /help, /status, /forcepos, /currentmusic, /pm; 2.9 compatibility fixes
2021-03-11 00:32:41 -06:00
in1tiate
ae338b1ac0 please compile before you commit, rose 2021-03-10 21:02:59 -06:00
in1tiate
6aff469a8c send only x offset to old clients 2021-03-10 20:56:07 -06:00
in1tiate
d84c20784d add ~stop.mp3 checking 2021-03-10 20:33:37 -06:00
in1tiate
edbb531e88 add /pm, make changing pos send SP packet 2021-03-10 20:29:17 -06:00
in1tiate
d04fef0ded add currentmusic, define forcepos in aoclient.h 2021-03-10 20:10:05 -06:00
in1tiate
30ffc94a10 add forcepos and check for nonexistent client in invite 2021-03-10 19:59:35 -06:00
in1tiate
556fe9a0b1 improve arup function, add /status 2021-03-10 19:39:46 -06:00
in1tiate
a792c063ee add help command 2021-03-10 18:47:22 -06:00
scatterflower
b4817f1cb1
Merge pull request #19 from AttorneyOnline/in1tiate/commands-uwu
Add /area, /play, /area_kick, /switch, /randomchar, /toggleglobal, and /mods
2021-03-10 04:55:40 -06:00
in1tiate
f0d6b4eb53 add /mods 2021-03-09 19:29:59 -06:00
in1tiate
49071e6936 add global chat toggle 2021-03-09 18:40:58 -06:00
in1tiate
d1918e50a9 add area_kick, switch, randomchar 2021-03-09 18:09:28 -06:00
in1tiate
9985b7daf8 fix bounds checking, add /play 2021-03-09 17:43:20 -06:00
in1tiate
7d87a7027f add bounds checking to /area and evidence 2021-03-09 17:24:52 -06:00
in1tiate
483e89d5cf add /area 2021-03-09 17:17:18 -06:00
in1tiate
0c9e432fab
Merge branch 'master' into feature/net-auth 2021-03-09 14:41:08 -06:00
in1tiate
d2890e6e86 some fiddling 2021-03-09 14:35:23 -06:00
in1tiate
2a9eb18c5e add net auth + desk mod validation update 2021-03-09 14:24:03 -06:00
scatterflower
4ff32f099e
Merge branch 'master' into feature/iniswap_lock 2021-03-09 14:04:32 -06:00
scatterflower
d0dbd41232
Merge pull request #15 from AttorneyOnline/feature/dezalgo
Add "dezalgo" for IC and OOC chat
2021-03-09 14:03:48 -06:00
in1tiate
576b915828 send user id in hwid packet 2021-03-09 13:40:01 -06:00
in1tiate
5d4a3700ed config bg lock, fail if modpass is empty 2021-03-09 13:32:08 -06:00
in1tiate
088b34064f add iniswap locking 2021-03-09 13:23:32 -06:00
in1tiate
2c25fadc19 add dezalgo for IC and OOC chat 2021-03-09 12:56:59 -06:00
in1tiate
18efacb886 set timers when you join and change areas 2021-03-06 00:41:10 -06:00
in1tiate
6cf135a975 it works! *evil laugh* 2021-03-06 00:25:16 -06:00
in1tiate
2e3a16c9b0 send packet to show timer 2021-03-06 00:16:39 -06:00
in1tiate
e65caf2a59 probably initializing the timers would be a good idea 2021-03-06 00:00:50 -06:00
in1tiate
49bad39ec1 nonfunctional initial commit 2021-03-05 23:53:36 -06:00
in1tiate
62b3f8647f
move CM check before auth check 2021-03-04 05:27:00 -06:00
in1tiate
3aa937f908
fix indentation 2021-03-04 05:25:23 -06:00
in1tiate
f46eeeb94f
Merge branch 'master' into in1tiate/cming 2021-03-04 05:24:06 -06:00
Salanto
c5685a8a3b Missed some 2021-03-03 18:50:06 +01:00
Salanto
f2fe5227d6 Formatting if-else, Minor Nitpick 2021-03-03 18:36:20 +01:00
Salanto
9267729459 Caplock enum, update variable name to reflect config name 2021-03-03 17:26:44 +01:00
in1tiate
fb300e1b56 "heads" not "head" 2021-03-03 01:56:26 -06:00
in1tiate
954e64831c fix some config shenanigans 2021-03-03 01:44:41 -06:00
in1tiate
e30a91e8f7 fix previously nonfunctional area protection 2021-03-02 21:58:41 -06:00
in1tiate
f607be2d6c fix crash in logger, add (nonfunctional) protected area flag 2021-03-02 21:44:08 -06:00
in1tiate
0b024abe5c hook into ACL system for CM shenanigans 2021-03-02 20:45:01 -06:00
Salanto
10072aa9fc Corrected datatype in header and function 2021-03-03 01:49:10 +01:00
Salanto
c696e7d525 Attempted a smarter approach at handling negative numbers 2021-03-03 01:23:36 +01:00
in1tiate
6a6029b6da send player id 2021-02-28 18:30:56 -06:00
in1tiate
080e215fb3 cherrypick additional functionality from Salanto:Rolling-Rocks 2021-02-28 18:12:42 -06:00
in1tiate
7f615df8c5 comments, allow invited users 2 enter locked areas 2021-02-28 10:49:40 -06:00
in1tiate
fcca15a785 show lock status in getarea 2021-02-28 10:11:52 -06:00
in1tiate
30eb010bb6 compiles again, convenience messages 2021-02-28 10:08:23 -06:00
in1tiate
fd8654de97 add area locking 2021-02-28 09:59:37 -06:00
in1tiate
69da440e54 add invite system 2021-02-27 18:00:00 -06:00
Salanto
11066acdb3 Add method to configure the server name
+ Remove some redundant code to make use of this method
2021-02-28 00:45:54 +01:00
in1tiate
516610efeb Indicate CM status in getarea 2021-02-27 17:43:20 -06:00
in1tiate
033d4f93e5 add CMing and document commands 2021-02-27 17:36:21 -06:00
Salanto
2422287753 Add sendServerMessageArea and sendServerBroadcast
+ Update some prior created commands to use them
+ Change style of global messages
+ Change style of need messages
+ Pretend to fix some formatting since I don't understand indentation
2021-01-20 14:49:07 +01:00
Salanto
f43e360c86 add /rollp command
Code duplication is a crime I am willing to commit.
2021-01-14 22:03:57 +01:00
Salanto
9693d47515 Add /roll command 2021-01-14 21:24:39 +01:00
Salanto
6241b3d6cb Fix spacing, Replace quint16 with quint32 in ::genRand() 2021-01-10 03:17:49 +01:00
Salanto
fd1baacd3d Add /flip command ; Add AOClient::genRand(min, max)
Also added some punctuation for /g and /need
2021-01-10 02:58:39 +01:00
Salanto
296426d163 Add /need command 2021-01-09 22:24:32 +01:00
Salanto
3f148c9c66 Add /g command 2021-01-09 14:50:43 +01:00
scatterflower
ed9e86e183 add /pos 2021-01-03 18:19:48 -06:00
scatterflower
b04703ea88 add y offset to FL 2021-01-03 17:49:35 -06:00
scatterflower
73381f97ef some logging improvements 2020-10-08 00:19:13 -05:00
scatterflower
0a29665927 allow selection of listen address 2020-10-07 01:48:10 -05:00
scatterflower
8c6385048e testing before committing? in 2020? 2020-10-06 14:29:47 -05:00
scatterflower
83751d025a add logging to ooc, modcalls, and clean up default config.ini 2020-10-06 14:23:01 -05:00
scatterflower
5dd834c3af work with old qt 2020-10-06 14:05:45 -05:00
scatterflower
d76301cfcd general cleanup, net debug switch 2020-10-06 13:45:28 -05:00
scatterflower
e53fd2a02e add evidence 2020-10-06 13:00:39 -05:00
scatterflower
5e83c37bcb add music looping 2020-10-05 16:14:58 -05:00
scatterflower
ae6a6f7e94 implement pairing and other ic features 2020-10-05 15:57:30 -05:00
scatterflower
288e8ffa49 add modcall and IC logging 2020-10-04 14:35:45 -05:00
scatterflower
fde0c4b78f add validation for 2.4.x packets, and a lot more 2020-10-03 14:57:30 -05:00
scatterflower
d96fde7a69 user count robustness, and added user management commands 2020-09-29 14:45:57 -05:00
scatterflower
2cc415e42b add some user management command 2020-09-29 06:11:04 -05:00
scatterflower
7c6b892fb9 add background changing 2020-09-29 04:49:16 -05:00
scatterflower
89d7fed688 fix improper ooc name in areas list 2020-09-29 02:54:13 -05:00
scatterflower
d4c52e9b65 implement advanced permissions system 2020-09-29 01:16:38 -05:00
scatterflower
704366a2a0 refactor packet handler 2020-09-28 20:00:51 -05:00
scatterflower
20492c6a33 refactor command parser 2020-09-28 19:11:12 -05:00
scatterflower
acc6966216 finish implementing kicks and bans 2020-09-27 19:27:35 -05:00
scatterflower
26cf130bd0 implement bans 2020-09-27 17:44:32 -05:00
scatterflower
594782d19c begin working on bans 2020-09-27 16:53:03 -05:00
scatterflower
b37410fa1a implement command handler, getarea(s), and mod login 2020-09-26 14:55:57 -05:00
scatterflower
0fb7ab5fa3 implement hp bars 2020-09-09 06:15:32 -05:00
scatterflower
0f692a4103 add ic chat validation class thing 2020-09-06 10:39:44 -05:00
scatterflower
85b3b1fe14 do thing properly hehheheheh 2020-09-04 14:39:21 -05:00
scatterflower
20276891e6 fix memory leak from incorrect delete call 2020-09-03 01:03:41 -05:00
scatterflower
849a74fdc3 manage our memory better 2020-09-02 15:36:10 -05:00
scatterflower
d2fec1cce9 fix memory leak in websockets 2020-09-02 09:53:55 -05:00
scatterflower
14f442be6c fix race condition to delete websocket proxy object 2020-09-02 09:29:40 -05:00
scatterflower
5969157801 change music category name so that webAO likes it 2020-09-02 08:53:09 -05:00
scatterflower
619b42e1bb fix up all config file paths 2020-09-02 08:51:14 -05:00
scatterflower
002136ac63 add default config files 2020-09-02 08:31:27 -05:00
scatterflower
24dfc3cdb8 add validation for extra config files 2020-09-02 08:23:23 -05:00
scatterflower
857e36b835 don't try to generate config from scratch 2020-09-02 08:10:42 -05:00
scatterflower
f72cb575fe remove unnecessary ini entry 2020-09-02 00:58:21 -05:00
scatterflower
0724b0accd remove now unused stuff from main.cpp 2020-09-02 00:57:08 -05:00
scatterflower
c408b35198 remove all ui stuff 2020-09-01 16:19:08 -05:00
scatterflower
ccfb6481cf make no gui build 2020-09-01 15:43:48 -05:00
scatterflower
caeda501c3 implement area updates 2020-09-01 01:08:21 -05:00
scatterflower
7312097063 properly handle area change in same area 2020-08-31 15:53:18 -05:00
scatterflower
ee9ffa7f2a get areas working 2020-08-31 15:41:50 -05:00
scatterflower
dc932451e6 add music, lay groundwork for areas 2020-08-30 01:25:30 -05:00
likeawindrammer
de150ef9b3 Simplify advertise_server assignation
Since it's a bool we can just assign the result of the comparation
2020-08-28 07:09:57 -06:00
likeawindrammer
8dee403e7c Fix: Not using user's settings due to not specifying a group 2020-08-28 07:05:49 -06:00
likeawindrammer
c91d3a50a6 Fix: Server listening on the ms port instead of the actual port 2020-08-28 07:02:19 -06:00
scatterflower
a106b483da quick fix for linux thing 2020-08-27 20:50:27 -05:00
scatterflower
71d8ad725f change qt platform when headless on linux 2020-08-27 20:44:06 -05:00
scatterflower
0656789234 keep build stuff in its own dirs, and make console behavior work on windows 2020-08-27 15:11:50 -05:00
scatterflower
ebb1a85180 i should really stop messing with this 2020-08-26 13:58:01 -05:00
scatterflower
966fcb996b add webao support 2020-08-26 13:56:50 -05:00
scatterflower
75ec4175fd add license info to files 2020-08-26 02:08:54 -05:00
scatterflower
772e850d37 massive refactor ty longbyte 2020-08-26 01:28:00 -05:00
scatterflower
676b4cbf56 remove player count test woops 2020-08-25 15:58:21 -05:00
scatterflower
9cbf2a526e fix taken characters list getting messed up 2020-08-25 15:56:56 -05:00
scatterflower
42df56942b clang format, and indentation change 2020-08-25 07:07:08 -05:00
scatterflower
be8d8b215e you can add characters now 2020-08-25 06:56:40 -05:00
scatterflower
274c217e52 clang format 2020-08-25 01:51:57 -05:00
scatterflower
e342c45806 implement more packets 2020-08-25 01:51:30 -05:00
scatterflower
50f795b606 implement unfinished framework for loading 2020-08-24 16:22:06 -05:00
scatterflower
14088fccf2 add ipid 2020-08-24 14:35:56 -05:00
scatterflower
5c5e112cbc implement handshake 2020-08-24 04:16:19 -05:00
scatterflower
2d5b257799 implement server groundwork 2020-08-24 01:18:17 -05:00
scatterflower
0ab0fcd060 cleanup some things 2020-08-23 21:30:38 -05:00
scatterflower
0359628645 proper aopacket type 2020-08-23 15:23:12 -05:00
scatterflower
28ed456386 clang format 2020-08-23 14:45:11 -05:00
scatterflower
a3d2c1aa66 start implemented the actual server 2020-08-23 14:43:19 -05:00
scatterflower
ce46fa1657 move more config logic into config_manager.cpp 2020-08-23 14:28:16 -05:00
scatterflower
04ae43d960 move config logic to its own class 2020-08-23 14:13:55 -05:00
scatterflower
cdfa2d5760 finishing touches to advertiser 2020-08-23 05:54:02 -05:00
scatterflower
b186416874 initialize advertiser on the heap 2020-08-23 05:50:37 -05:00
scatterflower
3379557457 get ms advertiser properly working 2020-08-23 05:28:45 -05:00
scatterflower
7e45d372e3 master server client 2020-08-23 04:39:51 -05:00
scatterflower
4fb4119700 add basic configuration logic 2020-08-23 03:09:15 -05:00
scatterflower
10eb4b9b91 woops, use default system locale 2020-08-22 15:14:21 -05:00
scatterflower
1d09ff2a10 include qt translations 2020-08-22 15:13:53 -05:00
scatterflower
a4b40c99a1 i18n 2020-08-22 15:04:41 -05:00
scatterflower
fbc9feed13 set up command line options 2020-08-22 13:33:51 -05:00
scatterflower
b193d662c7 reorganize 2020-08-22 02:33:02 -05:00