Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,219 Commits 1 Branch 0 Tags 8.5 MiB
102ca4d641
Commit Graph

1219 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
scatterflower
102ca4d641 Create brushes for area list once 2020-08-15 19:47:24 -05:00
scatterflower
8b44d4ae95 Only regenerate the area list once per ARUP packet 2020-08-15 19:40:52 -05:00
oldmud0
ec1c95bdb3
Merge pull request #217 from AttorneyOnline/kfo-ao2 
Final mega-merge with the Killing Fever Online client, along with other associated bugfixes and feature additions.

This commit is release-ready.
 2020-07-31 16:17:05 -05:00
windrammer
36b5af3cb9
Add option for automatic logging (#203) 
Just so we're on the same page, this is enabled by default.

Co-authored-by: Cents02 <Cents02@Cents0.me>
 2020-07-31 15:14:39 -05:00
Crystalwarrior
bab10ea14d
Add "Play Random Song" option (#200) 
It also respects the search string, so only visible tracks are chosen from the pool. Categories (i.e. entries with children) are also ignored.
 2020-07-31 15:11:38 -05:00
Crystalwarrior
56d7fff500
Fix reload theme breaking BG sizing (#212) 
May need additional testing with animated BGs.
 2020-07-31 15:07:14 -05:00
Crystalwarrior
740d825fd2
Add a p_char optional argument to set_fonts() (#209) 
Add overrides to set_font for font name and size (this is to preserve the chat_size and chat_font char.ini arguments that were implemented way earlier)
Cease the baddening with set_font that was there before and condense it into a proper set_font function call
Implement set_font for custom showname shenanigans from the misc folder
 2020-07-31 15:06:55 -05:00
oldmud0
a0ce2089f2
Merge pull request #220 from AttorneyOnline/kfo_master_merged 
Resolve conflicts before merging kfo-ao2 into master.

Essentially all conflicts were resolved favoring kfo-ao2, so this merge commit is a +0/-0 diff.
 2020-07-31 12:10:14 -05:00
likeawindrammer
276dac351b Merge branch 'master' into kfo_master_merged 
# Conflicts:
#	src/aoevidencedisplay.cpp
#	src/courtroom.cpp
#	src/packet_distribution.cpp
 2020-07-31 10:01:28 -06:00
likeawindrammer
204d6c4b79 Add callwords.ini and config.ini to gitignore 2020-07-30 22:06:04 -06:00
likeawindrammer
f00efbb1ca Update reference for themes submodule 2020-07-30 21:21:52 -06:00
likeawindrammer
6cc7d7dd6d Adds background, characters and sounds to gitignore 2020-07-30 21:13:49 -06:00
oldmud0
be4b6e78ab Fix regression parsing HTML escapes 
Introduced trying to fix emoji. This parsing function is cancerous.
 2020-07-30 21:55:15 -05:00
Crystalwarrior
1802f6309f
Make spectator function as a character with ID -1 (#211) 
- Don't hide spectator button anymore.
- Make the spectator button properly send the char switch packet.
- Fix the spectator button not properly loading the courtroom and music list etc.
 2020-07-30 16:25:19 -05:00
oldmud0
906a600a64
Fix emoji displaying extraneous characters (#219) 
Fixes #192.
 2020-07-30 16:17:06 -05:00
oldmud0
a82c2d4fc1 CI: Deploy entire base folder 
Yes, all of it.
 2020-07-30 14:48:54 -05:00
likeawindrammer
3a84a3f187 Add missing misc folder 2020-07-30 13:13:10 -06:00
windrammer
55fa6d7da0
Add darker button generator (#201) 
When an `_off` emote button exists without an `_on` counterpart, the client will automatically generate the `_on` button and save it to disk.

Co-authored-by: Cents02 <Cents02@Cents0.me>
Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
 2020-07-30 12:10:58 -05:00
oldmud0
6844f72ab5
Fix build error from bad merge 
redefinition of objection_mod
 2020-07-29 18:31:15 -05:00
in1tiate
3afdad90c8
Add support for multiple custom interjections via context menu (#162) 
* YOU DO NOT BELONG IN THIS PR
GET OUT

Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
Co-authored-by: likeawindrammer <31085911+likeawindrammer@users.noreply.github.com>
Co-authored-by: Crystalwarrior <Varsash@Gmail.com>
 2020-07-29 17:45:46 -05:00
windrammer
abe80513d8
Add Qt 5.9 compatibility (#202) 
* Added Ubuntu 18 backwards compatibility

Co-authored-by: Cents02 <Cents02@Cents0.me>
 2020-07-29 17:43:33 -05:00
in1tiate
949a323903
Fix showname placeholder text and shout button after changing characters (#147) 2020-07-29 17:38:34 -05:00
windrammer
fc9fe6b34b
Fix colors not persisting when refreshing IC log (#204) 
Co-authored-by: Cents02 <Cents02@Cents0.me>
 2020-07-29 17:08:39 -05:00
windrammer
58180371ef
Hitting return on blank search box should collapse music list (#205) 
* If enter is hit with no query it collapses the music list

Co-authored-by: Cents02 <Cents02@Cents0.me>
 2020-07-29 17:07:55 -05:00
windrammer
314fc821fe
Merge pull request #216 from Pyraqq/kfo-ao2 
Please include this updated Polish translation.
 2020-07-29 13:31:16 -06:00
Pyraq
6c2e999561 Please include this updated Polish translation. 2020-07-29 21:22:16 +02:00
likeawindrammer
620d0c0c93 Update one string in Spanish and Portuguese translations 2020-07-29 11:52:34 -06:00
likeawindrammer
b3bb06a89c Please update Polish translation 2020-07-29 11:35:16 -06:00
likeawindrammer
b15c78af0d Add Portuguese and Polish language options 2020-07-29 11:23:17 -06:00
windrammer
0b7b70c76a
Fix character-specific theme not falling back to current theme (#207) 
It is only logical to say that the user, when not specifying any specific speedline or similar in the theme, then the current theme should be checked first rather than the default theme.

Co-authored-by: Cents02 <Cents02@Cents0.me>
 2020-07-29 12:19:27 -05:00
windrammer
a640def157
Fix screenshake button shunting character to origin (#215) 
* Fix #193
By making sure handle_chatmessage_3 calls start_chat_ticking
and thus do_screenshake only after either play_idle or play_talking is called

* Move call to start_chat_ticking to the end of handle_chatmessage_3
 2020-07-29 12:15:30 -05:00
likeawindrammer
2935d24a07 Update reference for themes submodule 2020-07-29 09:06:41 -06:00
Crystalwarrior
4a0df25c39
Fix chatlog instances where char_id 0 is ignored (#210) 2020-07-27 12:09:09 -05:00
windrammer
37520f9318
Fix connect button issue when using favorites list (#206) 
Co-authored-by: Cents02 <Cents02@Cents0.me>
 2020-07-27 12:08:14 -05:00
Crystalwarrior
d9d9232ea8
Fix private evidence arrows not updating (#213) 2020-07-27 12:06:33 -05:00
Crystalwarrior
c423a5ee56
Make music 'fade out previous' an effect enabled by default (#196) 
Simply make the "FADE_OUT" music effect flag by default so more users experience the SMOOTH FADE OUT magic by accident and praise the based client.
 2020-07-26 11:21:58 -05:00
oldmud0
1bccc5c3d8
Merge pull request #198 from Crystalwarrior/bugfix/max_colors 
Fix max colors being one int off
 2020-07-26 11:17:50 -05:00
Crystalwarrior
154ba64f4a Fix max_colors allowing +1 more than the actual max 2020-07-25 19:31:36 +03:00
Crystalwarrior
e84426ae8d Credits corrected for CrazyJC and MaximumVolty involvement in 2.8 2020-07-24 18:39:22 +03:00
Crystalwarrior
29f0e06bc8
Make 'FL' packet reset settings to default and take the new settings in (#186) 
* Fix colors in ic logs not parsing HTML properly when log_goes_downwards=false and colorlog=true

* Restore KFO branding

* Reset the settings values when receiving the 'FL' packet. This allows enabling/disabling features at runtime, such as ARUP system.

* Revert "Restore KFO branding"

This reverts commit 7f19b6257a0d75ec1d392b9b8c02a384c8dba43d.
 2020-07-23 19:32:34 +02:00
Crystalwarrior
b2a5f517d9
Add showname alignment option for theme makers (#189) 
* Add alignment options for shownames

* Make shownames align to the left by default like before

* Use this branch as an opportunity to fix showname not being resized according to misc/ folder courtroom_design.ini
 2020-07-23 19:28:53 +02:00
sD
bcbc48f9b0 fix mac builds, opus lib path was wrong 2020-07-22 20:55:08 +02:00
likeawindrammer
e6b0b2e318 Small changes to the Spanish translation. 2020-07-15 18:17:04 -06:00
likeawindrammer
4be472f360 Update Portuguese translation. 
(Needs review)
 2020-07-15 18:16:21 -06:00
likeawindrammer
8639dc2f61 Finished updating the Spanish translation. 2020-07-14 20:46:57 -06:00
likeawindrammer
44659fd2a6 Update some strings for 2.8 in the Spanish translation. 
(WIP)
 2020-07-14 03:55:18 -06:00
raidensnake
b38e221fb1
Fix APNG backgrounds not appearing on list; fix BASSOPUS path for macOS (#185) 
* Added apng support for animated background positioning.

* Adjusted the apng background position search.

* Fixed libbassopus.dylib path on MacOS preventing opus files from playing.
 2020-07-11 23:06:38 -05:00
Crystalwarrior
4c5fdab9e9 Fix the color fix pr when logs go downwards where it didn't add an \n because html doesn't like \n very much so it has to be <br> because that's what HTML does 
yea
 2020-07-08 00:02:17 +03:00
Crystalwarrior
c29fe7c7ba
Regenerate the background when reload_theme is pressed to prevent scaling issues (#181) 2020-07-06 17:46:22 -05:00
oldmud0
e827f560f3 Mac CI: Fix wrong zip name 2020-07-05 15:48:24 -05:00