Commit Graph

1238 Commits

Author SHA1 Message Date
scatterflower
4b7efc8536 allow -1 charid for system messages 2020-08-16 14:17:58 -05:00
scatterflower
3c031db2ea fix check for negative char_id 2020-08-16 14:14:26 -05:00
scatterflower
95725eb129 fix incorrect emote modifier 2020-08-16 13:53:16 -05:00
scatterflower
1c5b097f65 further cleanup of chat handler 2020-08-16 12:43:26 -05:00
scatterflower
e546ead1fa
Merge pull request #1 from scatterflower/ic_fixes
Ic fixes
2020-08-16 12:36:37 -05:00
scatterflower
5c6dad88ce
Merge branch '2.8' into ic_fixes 2020-08-16 12:35:41 -05:00
scatterflower
a31693323c
Merge pull request #250 from scatterflower/boldfix
Fix improper bolding behavior due to malformed string literal
2020-08-16 11:00:03 -05:00
scatterflower
42d939614f Fix improper bolding behavior due to malformed string literal 2020-08-16 10:59:06 -05:00
scatterflower
507180d164 Clean up logic in handle_chatmessage() 2020-08-16 08:37:12 -05:00
scatterflower
de6a2ba4ae
Merge pull request #244 from scatterflower/is241
Optimize ARUP
2020-08-16 07:26:55 -05:00
scatterflower
cd3ddfe16c Update brushes on theme reload 2020-08-16 07:21:49 -05:00
scatterflower
34604742f1
Merge pull request #245 from scatterflower/realization_fix
Check for custom realization sound when using effects list
2020-08-16 07:12:29 -05:00
scatterflower
079ce93b85 Remove clientside doublepost checking 2020-08-16 07:06:53 -05:00
scatterflower
11250e1386 Ensure consistent behavior in IC log, clarify showname logic, and define constants for minimum and maximum packet sizes 2020-08-16 06:50:19 -05:00
scatterflower
002086343a Check for custom realization sound when using effects list 2020-08-16 04:03:56 -05:00
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
Emiko
b04b22b33a
Update Russian translation (excl. courtroom UI) (#239)
Edited TL, added TL for tool tips and other untranslated strings.
Courtroom UI elements were left in English to avoid cropping.
2020-08-06 11:20:20 -05:00
windrammer
0ce60d66a7
Fix not using custom chatbox's colors (#228)
* Fix not using custom chatbox's colors

Moved set_text_color_dropdown() to after current_char is actually updated
with the selected char. Otherwise set_text_color_dropdown will try to
update the colors with either nothing as character, or with the previously
selected character.

Use get_chat() so it actually gets the name of the custom chatbox
instead of using the same name as the character.
Remove the extra "c" since get_chat_color it's already called
with this "c" in place.

* Fix previous fix crashing the client on DRO servers

For some reason the client would work just fine
if set_text_color_dropdown() was called only once
after updating the character selected by the user.
But when joining a DRO server the client would crash
just before loading the music.

* Improve comment with where crash happens

* Fix get_chat_markdown to get the custom chatbox on misc of the char

instead of trying to find the character folder on misc

* Fix client using the current character colors on other people's messages

Also remove the comment explaining the crash if set_text_color_dropdown
is removed from set_widgets

* Fix loading custom colors loading after the message was added to the log
2020-08-05 09:18:08 -05:00
windrammer
630518020a
Fix music display disappearing on theme reload (#233) 2020-08-04 10:09:27 -05:00
windrammer
07e1127096
Fix current_display_speed overflow (#232) 2020-08-04 10:03:40 -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