Commit Graph

35 Commits

Author SHA1 Message Date
OmniTroid
0e45f3c0ee
Universal configure script (#1022)
* Init configure.sh

* echo detected platform

* Implement check_command

* Implement install_bass_macos, plus checks

* Ignore tmp

* Add configure main function and bass installs

* Less functions

* Reformat file, add some stuff

* Start adding automatic qt detection

* Curl is more portable it seems

* Try finding Qt's bundled cmake

* fix cmake command checking

* Reorder to windows first

* do not download deps if already present

* Add configure clean

* Fix basic command checks

* cmd fixes

* thank you bash, very cool!

* fix file shenanigans

* unneccessary comment

* Use qt_path instead of qt_cmake

* Ignore apng folder

* Rework with QT_PATH

* Move find_qt to the top

* move check_command near the top

* Tidy up command checking

* Rename QT_PATH to QT_ROOT and call the qt installation path QT_PATH instead

* only clone qtapng if no dir

* Cmake shenanigans

* Fix build with ninja

* Fix apng cp cmd

* Fix apng check

* Just call it cmake

* Run cmake in configure.sh

* Ignore generated files

* Comment out mega cmake command

* Fix apng check

* more cmake stuff

* make the cmake command we use very clear

* ignore cmake_cmd.txt

* Note that linux and macos is not supported

* Update README

* Add some stuff to windeployqt

* Clone themes

* macos fixes

* Only call windeployqt on windows

* Linux fixes

* Remove linux todo comment

* Remove git stuff from themes checkout

* Note about vanilla content..

* Add note about formatting in readme

* Remove e flag so script doesn't stop with no error messages

* Note about toolchains on unix-likes

* Fix cmake path on linux

* Rework get_zip for better error handling and less unzipping unnecessary files

* Adjust get_zip calls

* Hopefully make error handling more robust

* Fix bassopus on linux

* linux bassopus pathing fix

* Fix discord rpc linux

* Add note about opengl

* Ignore test_aopacket

* Tidy up readme a bit again

* Remove old configure scripts
2024-07-31 13:40:43 +02:00
OmniTroid
36345612d7
Readme and script cleanup (#995)
* Ignore .idea

* Ignore build dir too

* Remove unused Windows Docker files

* Remove somewhat cryptic launch.sh script

* Remove kebab (javascript)

* Remove outdated release_macos script and rename the most up-to-date one to macos_release

* Clean up README.md and delete the other ones

* Add preliminary configure script

* Add hint in dependencies

* Remove obsolete CONTRIBUTING.md

* let's write the configure script later

* Adding this is so supremely ironic that I can't even

* Update QtApng repo

* Actually we needed that

* Add comment

* Contact should be h2
2024-07-01 18:00:23 +02:00
TrickyLeifa
c9f52b7223 Ported to CMake, ...
* Ported the project to CMake
  * Android and Mac support dropped for the time
being.
  * Tests, BASS and Discord-RPC are now options
* Restructured and reformated the project.
  * Merged `include` and `src`
  * Renamed `resource` to `data`
  * Renamed various files
  * External libraries headers are no longer included in `src`
  * Replaced header guards with #pragma once
  * Multiple refactors (keywords, headers)
  * Added Qt6 compatibility
* Removed various unused functions and headers
* Reworked AOPacket
  * When content is passed to AOPacket, it should be ensured that the content is already decoded.
  * Encoding/decoding are now static methods.
* Fixed various memory leaks
* Removed animation code for AOImage
  * AOImage is always using static images
* Simplified ChatLogPiece
2024-05-15 00:04:16 +02:00
stonedDiscord
1f181d6016
new qt creator creates additional project user files (#898) 2023-06-27 01:14:15 +02:00
Caleb Mabry
8a0404f424
Gitignore bin (#867)
* Adding MS

* Ignore bin folder contents but keep folder

* Undo a file change

* On pull request
2022-12-17 11:44:12 +01:00
stonedDiscord
f55cbe543b
move themes into bin folder (#849)
* as if this is going to work

* use android libs and spec for android

* install ndk and use clang over g++

* shut the fuck up

* SHUT THE FUCK UP

* shut up shut up shut up

* get remove from favs button

* move themes into bin folder

* bin folder now already comes with repo

* actually install old ndk version

* Delete .gitlab-ci.yml

* apply font for version
2022-08-14 23:16:55 +02:00
stonedDiscord
d87371b65e
GitHub android ci (#767)
* try this matrix thing

* syntax error

* use my own qt installer so it actually works

* allow changing path

* whoops cant have it twice

* get the right version of discord rpc

* get correct bass

* try to fix windows

* overwrite bass files

* forgot to delete these

* here's your version bro

* what did we even use catch2 for??

* linux doesnt have a c folder

* android bass

* switch from cmake to qmake

* opus dylib

* we don't install

* put bass in a subfolder so we don't build the stupid examples

* was using wrong arch for android

* fix up gitignore

* get correct artifact folder

* lets hope qmake will ignore the ABI for all the other platforms

* use platform name for artifact

* copy dlls into bin folder

* lmao i yeeted the folder

* create folder

* use more recent mingw

* windows uses dlls

* 2017 doesn't work

* our libs are 64 bit

* install msvc

* shitty ms documentation

* ok ms

* wrong directory for deploy

* copy apng

* use correct image for msvc2019

* deploy android

* 32bit windows it is

* adroideploy

* try this

* Update build.yml

* move libs

* armeabi-v7a

* fix android build files

* only get linux bass for linux

* don't try to install discord on android

* deploy mac

* get rid of double permission warning

* define filename for APK

* add mac dependencies

* put android bass in the correct folder

* mac apng

* android apng

* remove old CI

* ask for storage permissions

* qt bug ..........

* update clang-tidy-review

* update everything

* fuck you lukka

* fuck you jurplel for merging that shitty PR that broke everything

* give it what it wants

* Update clang-tidy-review.yml

* github is failing it because it's too big

* wait for the user and request a proper permission string

* underscore moment

* use write external storage instead

* try this instead

* 082 fails with docker again
2022-05-24 21:16:04 +02:00
stonedDiscord
7e9ad9946b
add new hdid algo (#694)
* add new hdid algo

* forgot the w for unicode

* add advapi32 to windows

* get rid of visual studio 2022 shit

* Update src/hardware_functions.cpp

Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>

* close handle when it fails

Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
2022-03-27 15:02:08 +02:00
likeawindrammer
385f476269 gitignore: Ignore base/serverlist.txt 2020-08-21 00:03:00 -06:00
likeawindrammer
204d6c4b79 Add callwords.ini and config.ini to gitignore 2020-07-30 22:06:04 -06:00
likeawindrammer
6cc7d7dd6d Adds background, characters and sounds to gitignore 2020-07-30 21:13:49 -06:00
oldmud0
ab00005bf7 Update themes submodule 2020-05-31 21:20:59 -05:00
sD
f0a0ecb983 ignore the logs 2020-05-23 18:53:31 +02:00
oldmud0
df8f19320b Bring back CI changes and macOS support 2020-05-22 19:35:49 -05:00
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
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