Commit Graph

191 Commits

Author SHA1 Message Date
Nathan Fulton
00a92e2f6c Animation read updated anir structure
- StripData count is now dword
- Added chars for bitmap and bitmap2 name
- ibm and ibm2 are now words

acrunch max structure was updated in commit 33420b0970728fde92292c525e588cfbdffd7373
2017-10-21 20:40:28 -04:00
Nathan Fulton
119cf11f08 Add 24bpp color array
Change Color to dword and add gaclr24bpp
2017-10-21 20:40:28 -04:00
Nathan Fulton
57c6e26ce2 Read RGBA TileMap data 2017-10-21 20:40:27 -04:00
Nathan Fulton
9662079334 Implement direction16 for mobile units 2017-10-21 20:40:26 -04:00
Nathan Fulton
3f83856115 Update unit strip indices for art2432 2017-10-21 20:39:58 -04:00
Nathan Fulton
dfc9e088f8 Remove old palette code 2017-10-21 20:39:57 -04:00
Nathan Fulton
dfd1d63d1a gszPrefsFilename prefs.bin -> prefs.json 2017-10-21 20:39:13 -04:00
Nathan Fulton
71dd4eb5b5 Save preferences as json
Preferences have keys as defined in ht.h. These keys can be used to read/write preferences. Preferences are saved in a .json on the disk.
This is much easier to work with than the old presences binary structures as it doesn’t require preference versioning.
2017-10-21 20:36:37 -04:00
Nathan Fulton
122a2d198f Change gnScrollSpeed to float 2017-10-21 20:36:36 -04:00
Nathan Fulton
3ecad7c281 Accept the 2432 data directory 2017-10-21 20:36:35 -04:00
Nathan Fulton
fd31d33274 Android gszMainDataDir = NULL
Using NULL as the main data dir will tell the SDL API (the current host file I/O) to fallthough and read from the .apk assets. This is currently desirable in every existing case.
2017-10-21 20:29:54 -04:00
Nathan Fulton
84b4e0f6ba Implement Android HostHelper code for SdlPackFileReader
Needed for changes SdlPackFileReader changes in commit 61e081be5690202cae1e03d6e6cc89a3e94257b7
2017-10-21 20:28:33 -04:00
Nathan Fulton
6b9241fbc5 Add Android jni method for obtaining the AssetManager 2017-10-21 20:28:33 -04:00
Nathan Fulton
5d7e0ddf3c Update SdlPackFile I/O
SdlPackFile can now push and pop directories using host file I/O. This allows for reading from directories as though they were .pdbs (like the htdata2432 dir) while maintaining the pushed hierarchy. pdbs can still be used.
2017-10-21 20:28:32 -04:00
Nathan Fulton
2ef0ab5ae8 Implement host file I/O
Host file I/O API to read files from disk
2017-10-21 20:28:31 -04:00
Nathan Fulton
e02296b6ac Add utility scripts for font processing
fontmap.py:
Maps glyph images to characters via the file name notation and then outputs a font json

fontutils.py:
Contains functions and variables that are used by both fontmap.py and glyphpos.py

glyphpos.py:
Since the game now draws glyphs directly from their image, a glyph’s placement within its image is very important. glyphpos.py is a helper script to mass (re)position the glyphs within their images.
2017-10-21 20:28:30 -04:00
Nathan Fulton
4896fbe384 Read json fonts
A font.json maps characters to image file names. The Font class caches all the glyph images then draws the appropriate one(s) at blt time.
2017-10-21 20:28:29 -04:00
Nathan Fulton
97a84b8e27 Add texture atlas manager 2017-10-21 20:28:28 -04:00
Nathan Fulton
901a201a45 Refactor: ".tbm" -> ".png" 2017-10-21 20:28:27 -04:00
Nathan Fulton
0cd8cff9c2 Change HtBitmap references to TBitmap 2017-10-21 20:27:45 -04:00
Nathan Fulton
7fa189e3da Use CreateTBitmap()
Replace:
- GetSharedTBitmap()
- LoadRawBitmap()
- LoadTBitmap()
2017-10-21 20:27:44 -04:00
Nathan Fulton
da52f61897 Implement new TBitmap code
Texture bitmap, for storing information about images in texture atlases.
2017-10-21 20:27:24 -04:00
Nathan Fulton
bc8777e56e Implement new DibBitmap code
Implemented with SDL API
2017-10-21 20:27:23 -04:00
Nathan Fulton
de281e5fd7 Remove old bitmap code
- DibBitmap
- HtBitmap
- RawBitmap
- Tbitmap
2017-10-21 20:27:23 -04:00
Nathan Fulton
f7a4eb1d69 ht.h include yajl/wrapper/jsontypes.h 2017-10-21 20:27:05 -04:00
Nathan Fulton
16be766113 chooseserverform use yajl wrapper functions 2017-10-21 20:27:04 -04:00
Nathan Fulton
cb8c198a25 PackInfoManager support new json types
- JsonNumber
- JsonBool
2017-10-21 20:27:04 -04:00
Nathan Fulton
4a644e8f36 IndexLoader support new json types
- JsonNumber
- JsonBool
2017-10-21 20:26:49 -04:00
Nathan Fulton
5274dea626 server update to support new json types
- JsonNumber
- JsonBool
2017-10-21 20:26:48 -04:00
Nathan Fulton
5e46c58727 yajl wrapper support numbers and bools 2017-10-21 20:26:48 -04:00
Nathan Fulton
ff2249995d mcl don't throw exception "Couldn't find tile index!" 2017-10-21 20:26:26 -04:00
Nathan Fulton
36afa67e5f mcl write RGBA tile data
- Remove palette references
- Write tile data and mini-map pixels as RGBA
2017-10-21 20:26:25 -04:00
Nathan Fulton
948f2e2417 AniMax don't overwrite existing images 2017-10-21 20:26:13 -04:00
Nathan Fulton
ae45c7539f AniMax release image files after opening
This keeps image files from being locked to the AniMax process while an image is open in AniMax
2017-10-21 20:26:13 -04:00
Nathan Fulton
c8fba37725 acrunch don't use palette 2017-10-21 20:26:00 -04:00
Nathan Fulton
7c742bb08d Update acrunch .amx structure
- Write StripData count as dword
- Write bitmap and bitmap2 name
- Write ibm/ibm2 as word
2017-10-21 20:25:59 -04:00
Nathan Fulton
806c698e7a Texpack initial commit
Texpack is a C# tool to build textures from the game art repository. Texpack takes a json as input. The json tells Texpack where the art is, what art to pack, and how to pack it. See texpack/texjson.py for input json generation, json structure, and Texpack customization options. Texpack outputs a json that maps each image filename to information such as what texture the image was packed in where it is within the texture.
2017-10-21 20:25:46 -04:00
Nathan Fulton
07fc4f9bff Upgrade M project to VS format version 12
One-way upgrade
Visual Studio will automatically make functional changes to the
following projects in order to open them. You will not be able to open
these projects in the version of Visual Studio in which they were
originally created.
- mgui, m/mgui/mgui.csproj
- mcl, m/mcl/mcl.csproj
- m, m/m.csproj
- m, m/m.sln
2017-10-21 20:23:28 -04:00
Nathan Fulton
fcb0a828c7 Upgrade Animax project to VS format version 12
One-way upgrade
Visual Studio will automatically make functional changes to the
following projects in order to open them. You will not be able to open
these projects in the version of Visual Studio in which they were
originally created.
- AniMax, AniMax/Animax.csproj
- AniMax, AniMax/AniMax.sln
2017-10-21 20:16:47 -04:00
Nathan Fulton
cb627b2b4b Upgrade acrunch project to VS format version 12 2017-10-21 20:15:25 -04:00
Nathan Fulton
e402ca76b5 Remove prebuilt SDL2 libraries 2017-10-21 19:56:12 -04:00
Nathan Fulton
875dd884ec Remove Android -fexceptions cpp flag 2017-10-21 02:55:34 -04:00
Nathan Fulton
8800cca7cc Set appropriate GL attributes 2017-10-21 02:55:10 -04:00
Nathan Fulton
ed1d50c8ea Add D3 to challenge maps list 2017-10-21 02:54:25 -04:00
Nathan Fulton
31ca038021 Fix bug with simulation pause state and backgrounding 2017-10-21 02:54:14 -04:00
Nathan Fulton
b06b3db1d4 Process SDL_KEYUP for SDLK_AC_BACK
This prevents SDLK_AC_BACK from getting processed multiple times if an
Android user holds their finger on the hardware back button.
2017-10-21 02:54:09 -04:00
Nathan Fulton
830dc6a0d3 Correct use of Android system UI flags
Removed the use of SYSTEM_UI_FLAG_HIDE_NAVIGATION and
SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION for API 14 through API 18.
2017-10-21 02:54:09 -04:00
Nathan Fulton
8ecee55001 Recompile data assets with recent changes
Mute sound option was added to forms.ini
2017-10-21 02:53:50 -04:00
Nathan Fulton
81a4cf6ed3 Make lasso selection available on desktop 2017-10-21 02:49:40 -04:00
Nathan Fulton
891e6273ac In-game option to mute sound
In 1dceae4cf0ea47df5ee8ab24ae2fde2644527c43 the in-game mute option was
ignored. This has been undone because players requested a mute sound
button added to options.
2017-10-21 02:49:39 -04:00