Commit Graph

20 Commits

Author SHA1 Message Date
oldmud0
faac191f0b Mega-merge of CR fork
CR likely stands for "CentsRaidensnake." Like the Case Cafe mega-merge
before it, this was not a clean merge, and it had to be split up into
two parts: the actual changes, and the attempt it made to reformat the
entire code via clang-format.

This branch had a complicated set of changes that would be difficult to
describe in this commit message. It would be better described in a
proper changelog.
2020-04-17 21:48:34 -05:00
BuildTools
b9aba62071 added file to .gitignore 2020-03-05 23:01:40 -06:00
sD
6ccabdd568 maybe at some point, someone will try this again 2020-01-22 15:24:59 +01:00
stonedDiscord
d56a53bcbd yeet all of these .obj files away 2019-07-26 01:43:29 +02:00
stonedDiscord
4a2a167f7d Merge branch 'master' into 'bass-optional'
# Conflicts:
#   Attorney_Online.pro
#   include/aoapplication.h
2019-07-20 16:20:05 +00:00
David Skoland
f2a4ac013d Mac improvements
Just modifying build scripts to make it less painful to build and release on Mac

See merge request AttorneyOnline/AO2-Client!64
2019-06-29 00:27:31 +00:00
stonedDiscord
2f759752b0 update gitignore so it leaves my base folder alone 2019-03-12 00:26:01 +01:00
David Skoland
a2d3ab8b96 adjusted gitignore files 2018-12-26 18:11:08 +01:00
David Skoland
706f5bb7c7 simplified the project file 2018-12-26 16:48:30 +01:00
Cerapter
b9f1998c93 Minor fix: the default showname is now correctly the name of the character. 2018-08-19 08:03:14 +02:00
Cerapter
b99e9c18b2 Changed the exe's official name to Attorney_Online_CC. 2018-08-14 13:18:03 +02:00
Cerapter
c460a5b795 Static linking for Windows. 2018-08-03 19:50:53 +02:00
Cerapter
374e939ac4 Added the tsuserver3 files necessary to support this custom client. 2018-07-31 00:44:41 +02:00
Cerapter
c5c29673c5 Gitignore updated. 2018-07-26 14:41:14 +02:00
oldmud0
a8ccbe77c1 Don't do failover for Android, try reconnecting automatically once
Issue: AOTextArea is supposed to have red text for errors, but it's not working
2017-11-04 18:42:44 -05:00
OmniTroid
8a45090fe9 fixed various evidence-related bugs 2017-04-07 17:53:57 +02:00
David Skoland
1fe3f25a25 added shared libs to gitignore 2017-03-18 16:09:31 +01:00
David Skoland
47ffce5db5 ignored .user file 2017-01-26 00:24:40 +01:00
David Skoland
4512e35dff threw thumbs.db into oblivion 2017-01-17 15:26:48 +01:00
David Skoland
e468bc53b7 cleaning up 2017-01-17 13:09:27 +01:00