Commit Graph

38 Commits

Author SHA1 Message Date
oldmud0
156a760eba Full revert to tag 2.6.2
Due to a countless number of changes made to the core that were not
fully understood, tested, or documented, it was decided to roll
everything back to the last known stable version (2.6.2).

Changes dropped include:
 - Witness needed
 - Shake
 - Frame SFX
 - Multiple custom objections
 - Multithreaded thumbnail generation
 - Looping
 - Various translation additions
 - "Mirror IC"
 - Color in IC log
 - An invocation of clang-format

Next time, work together and split your big fork into independently
testable feature branches.
2020-05-22 17:02:32 -05:00
oldmud0
13942345c6 Run clang-format on entire project
Indentation fixed to 2 spaces per tab. Braces set to Stroustrup style.
Lines reflow at 80 characters. One-line method bodies are on the same
line as the signature. Space always after `//`. No indentation
on preprocessor macros. Includes are sorted lexicographically.

If you don't want to see this commit on blames, use the hidden
whitespace option on GitHub, or use `-w` in git-blame.
2020-04-17 21:57:16 -05:00
likeawindrammer
8486e19119 Add Portuguese translation 2020-04-11 18:21:04 -06:00
sD
2e8ae44167 Revert "reactivate discord and bass so they get used in the CI pipeline"
This reverts commit d077bab4e3.
2020-02-24 19:20:34 +01:00
sD
d077bab4e3 reactivate discord and bass so they get used in the CI pipeline 2020-02-24 00:49:49 +01:00
sD
b5c5141007 make network debug depend on if its a debug build or not 2020-02-21 18:47:46 +01:00
stonedDiscord
7d55ff01f5
Merge branch 'master' into 2.7 2020-02-21 16:39:32 +01:00
sD
6ccabdd568 maybe at some point, someone will try this again 2020-01-22 15:24:59 +01:00
sD
abbbb43c98 redundant headers in projectfile 2019-12-26 16:34:47 +01:00
Pyraq
327661c0a4 Added polish translation. 2019-09-14 21:29:23 +02:00
Pyraq
9967a57f46 Added polish translation. 2019-09-14 21:16:29 +02:00
stonedDiscord
7fe64163ea
Merge pull request #88 from AttorneyOnline/i18n
I18n
2019-08-08 00:20:51 +02:00
stonedDiscord
5180bb4f21 its called jp not ja 2019-08-06 21:09:03 +02:00
stonedDiscord
4936de0f12 the line numbers changed + compiled ru, es 2019-08-06 20:09:19 +02:00
stonedDiscord
d4129f0225 try this again 2019-08-04 19:39:34 +02:00
stonedDiscord
d71aad9d72 Revert "make default clone compileable to improve new dev experience and switch to qt on linux"
This reverts commit bf8aad33de.
2019-07-31 22:33:15 +02:00
stonedDiscord
bf8aad33de make default clone compileable to improve new dev experience and switch to qt on linux 2019-07-31 21:50:16 +02:00
stonedDiscord
847da688b1 adjust path in .pro 2019-07-29 21:54:12 +02:00
stonedDiscord
95da26195f add translation to .pro so lupdate and lrelease find them 2019-07-29 21:50:47 +02:00
oldmud0
e3187b6824
Bump version to 2.6.2 (#87) 2019-07-27 10:11:48 -05:00
stonedDiscord
4a2a167f7d Merge branch 'master' into 'bass-optional'
# Conflicts:
#   Attorney_Online.pro
#   include/aoapplication.h
2019-07-20 16:20:05 +00:00
stonedDiscord
3fb6b50d10 cleanup qmakefile 2019-03-12 19:27:38 +01:00
stonedDiscord
fced80661c looks like multimedia isn't really necessary 2019-03-12 00:46:27 +01:00
stonedDiscord
dbb05f2b4b c++ 14
i guess this is important
2019-03-12 00:31:01 +01:00
stonedDiscord
e4edb7e127 project rules where i can configure stuff 2019-03-12 00:27:00 +01:00
stonedDiscord
8c2eeca9d7 update project file 2019-03-11 01:27:08 +01:00
oldmud0
09ff1755a0 Add more frameworks 2019-02-10 02:32:11 +00:00
oldmud0
e4c4ecb0fd Use CoreFoundation library 2019-02-10 02:19:12 +00:00
iamgoofball
0dcf8a7f17 bump the version number to 2.7.2 2019-02-01 17:20:08 -08:00
oldmud0
4860be3cdf Update Attorney_Online.pro for C++14
(cherry picked from commit 032ba33ecf)
2019-01-21 02:46:23 +00:00
oldmud0
032ba33ecf Update Attorney_Online.pro for C++14 2019-01-21 02:43:57 +00:00
iamgoofball
3c0cedbe92 Add screenshake, frame-specific effects, looping SFX, and clientside music looping
Committed by patch since Goof is currently banned on GitHub for no good reason.
2019-01-18 23:08:46 -06:00
David Skoland
ce459e3bc1 version bump in .pro file 2019-01-05 23:02:07 +01:00
David Skoland
bda0457f2e declutter pro file 2019-01-03 00:47:02 +01:00
David Skoland
181b5da379 removed redundant QTPLUGIN declaration and added macx icon file 2019-01-03 00:29:42 +01:00
David Skoland
110751ac39 added dynamic loading of qapng and fixed mac sound 2018-12-26 22:19:49 +01:00
David Skoland
c353b3f24f same LIBS for unix and win32 is fine. and RC_ICONS is only relevant for windows 2018-12-26 19:33:18 +01:00
David Skoland
ac290a38ca renamed pro file to nicer name 2018-12-26 18:17:16 +01:00