1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-12-25 06:05:45 +00:00
Commit graph

65 commits

Author SHA1 Message Date
fgenesis
b5d32906f7 Longer Lua tracebacks are better for debugging 2014-06-21 18:08:09 +02:00
fgenesis
f4302d8313 Someone should REALLY debug tinyXML2 a bit before throwing it at the public. Add some debug assertions to track misuse. 2014-06-10 02:15:01 +02:00
fgenesis
9b44aed00a Disable tinyxml2's LoadFile() functions to catch ttvfs bypass for reading 2014-06-09 23:40:29 +02:00
fgenesis
4bafcb3e18 Merge branch 'tinyxml2' into experimental. Thanks to James Le Cuirot for this.
Conflicts:
	Aquaria/UserSettings.cpp
	CMakeLists.txt
2014-06-09 22:31:39 +02:00
fgenesis
1c67b5479b Include tinyxml2, update cmake to use this optionally 2014-06-09 22:21:24 +02:00
fgenesis
8d379653d4 Stash commit 2014-06-09 16:38:19 +02:00
James Le Cuirot
43d41feeb8 Migrate from TinyXML v1 to v2. Not bundled (yet). 2014-06-08 21:11:23 +01:00
fgenesis
a9f9dd0736 glpng: Fix CVE-2010-1519, update to v1.46. By James Le Cuirot. 2014-06-07 18:36:47 +02:00
fgenesis
18034bcc18 Fix problems with loading a packaged mod twice. Thx to Daxar for reporting, was in fact a ttvfs bug. 2014-04-23 05:26:03 +02:00
fgenesis
dc0f4b3b9c Fix linux build 2014-04-15 19:57:16 +02:00
fgenesis
4df08dc19f Fix oversight because of copying files around + make sure this won't happen again. 2014-04-15 19:58:10 +02:00
fgenesis
f69d88b656 ttvfs related cleanups 2014-04-15 19:48:06 +02:00
fgenesis
3cf3ac7659 ttvfs update 2014-04-15 15:04:33 +02:00
C.W. Betts
c4f5ce3f85 Fix compilation on OS X/Clang. 2014-04-06 23:22:32 -06:00
fgenesis
95fb836221 Fix linux build 2014-04-07 05:09:40 +02:00
fgenesis
7630587279 Little bugfix 2014-04-07 04:40:50 +02:00
fgenesis
0bf247169a sync with ttvfs repo 2014-04-07 04:16:15 +02:00
fgenesis
b437a7cb2c Fix ttvfs bugs, sync with dev repo 2014-04-07 02:25:58 +02:00
fgenesis
6203bc7ce4 Update Aquaria/BBGE/External sources to comply with the new ttvfs API 2014-04-07 02:10:05 +02:00
fgenesis
8026cdd905 Update ttvfs to new version 2014-04-06 19:19:33 +02:00
fgenesis
9041197ea7 Should actually upload the file in question... 2013-12-10 03:52:17 +01:00
fgenesis
8e1be3a5d2 Attempt to fix some VFS problems 2013-11-05 14:55:37 +01:00
fgenesis
3361baf91a Update SDL2 win32 libs 2013-07-20 00:20:36 +02:00
fgenesis
8455939e2e Add SDL2 libs and headers (only win32, for now) 2013-07-18 22:01:11 +02:00
fgenesis
9d2dcc2d0f Update ttvfs to current HEAD 2013-06-24 19:54:25 +02:00
fgenesis
93abd03c27 Merge branch 'experimental'
Conflicts:
	BBGE/Shader.cpp
2013-06-24 02:48:17 +02:00
fgenesis
98399f6bc3 More win32 cmake fixes, should now hopefully compile out of the box 2013-06-19 18:35:06 +02:00
fgenesis
2ac3ad9fb1 Fixes & enhancements to shader interface code 2013-05-12 00:05:57 +02:00
fgenesis
cd6d9ae2c5 Update libvorbis to 1.1.3 2012-09-24 02:27:51 +02:00
fgenesis
823290201d Stop complaining, MSVC 2012-09-24 02:26:39 +02:00
fgenesis
8ac5cf69ab Initial Haiku support 2012-09-23 05:31:29 +02:00
fgenesis
31930051d5 More compile fixes for gcc 2.95 2012-09-23 05:30:47 +02:00
fgenesis
f369fa48c8 Update libpng to 1.5.12 2012-09-23 04:49:13 +02:00
fgenesis
aeb96ca2dd Fix russian font display & font size calculation (my bad, thx Henrik) 2012-07-13 16:03:21 +02:00
fgenesis
84c49e5ce0 Fix wrongly adding shield song when loading a savegame. Also add obj_getTexture() function. 2012-07-10 22:50:31 +02:00
fgenesis
24b08b1043 Hackish fix to load glf files even if corrupt (this is required or the next commit...) 2012-07-10 22:18:21 +02:00
fgenesis
38501dca35 Some fixes to make the ever-complaining gcc 4.7 happy (hopefully) 2012-06-27 21:51:54 +02:00
fgenesis
283fc0086e Minor changes; based on russian opensource patch. 2012-06-19 02:29:14 +02:00
fgenesis
a55cbb64b8 More happy build fixing (gcc 4.7 again) 2012-06-18 14:08:21 +02:00
fgenesis
8f2279e28a Fix problems with loading saves after saving over them.
This was caused by the VFS caching file sizes,
and not noticing that the file size had changed,
which confused zlib because the data stream ended too early.
2012-06-14 17:54:40 +02:00
fgenesis
cd18ef2a43 Small fix for non-MSVC 2012-06-01 18:43:41 +00:00
fgenesis
6dc1c1e8d1 [vfs, #3] All file reading code goes through the VFS now, new mod downloader & mod selector in place. Also a bunch of other stuff. (...)
- HTTP networking support, mods can be downloaded via the builtin downloader.
  All network activity runs in a seperate thread, which is started
  as soon as any network activity is requested.
- The master server is hard-coded to fg.wzff.de/aqmods/ if not specified otherwise;
  this setting can be overridden in the config file.
- The mod selector screen is now a grid-view for much better navigation;
  also works with joystick.
- VFS code is functionally similar to the old molebox-packed release
  for win32. The game could also have its data shipped in a Zip file
  or any other kind of archive.
- It is still possible to build without VFS support, but then the mod
  downloader and soft-patching will not be available.

The full commit history can be found here:
https://github.com/fgenesis/Aquaria_clean/compare/master...vfs

The most important commit messages follow:
[...]
    This replaces all std::ifstream with InStream, and fopen(), ... with vfopen(), ...
    Some code is #ifdef'd for better performance and less memory-copying.
    VFILE is defined to whatever type of file is in use:
    - FILE if BBGE_BUILD_VFS is not defined
    - tttvfs::VFSFile if it is.

    Other changes:
    - [un]packFile() is now unused and obsolete. That code has not been adjusted to use VFILE.
    - glpng can now load from a memory buffer.
    - TinyXML uses the VFS for reading operations now.
    - The rather clunky binary stream loading of glfont2 got replaced with ByteBuffer,
      which gets its data in one block (necessary to use the VFS without implementing
      a somewhat STL-compliant std::ifstream replacement.)
-------------
Implement loading mods from zip files.
-------------
Implement soft-patching game data files. (Replacing textures/audio/... on the fly)
-------------
Misc bits:
- Extended GUI focus handling a bit
- Fixed weirdness in texture loading... not sure but this seems more correct to me.
  Actually, considering that the texture will have its native size after restarting the game,
  the lines removed with this commit seem pretty useless.
2012-06-01 17:52:19 +02:00
fgenesis
1709503344 [vfs, #2] Move around some files (cleanup only) 2012-06-01 17:26:13 +02:00
fgenesis
a90f57afb0 [vfs #1] Add ttvfs, miniz, and minihttp sources 2012-06-01 17:23:19 +02:00
fgenesis
da15c7424e Fix compile for gcc 2012-05-19 00:41:31 +00:00
fgenesis
1a20ff5d59 Compile fix for win32/MSVC that creeped up for some reason 2012-04-06 20:57:26 +02:00
fgenesis
75e7b137d6 Drop use of tempfiles when loading compressed files.
Also simplified .zga texture and .aqs savegame loading.
Dropped support for "crunched" .sav files (those were never used),
and the corresponding crunch functions.

To be done: Temp files are still used when compressing files,
will address this in a later commit.
2012-02-10 00:10:50 +01:00
fgenesis
a551d70a6d little fix, replaying ryan's patch to libogg and an oversight in GridRender that got lost 2012-01-18 03:16:00 +00:00
fgenesis
1ab32b585f Fixes for Linux
- fixed warning about PlaySfx::handle
- fixed displaying subtitles - if the path was not full lowercase it didn't find its txt files.
- CMake: removed SDLMAIN_FOUND, which is seemingly only defined on windows and does more harm than good.
- glpng: always use new libpng API (fixes windows build)
2012-01-10 19:34:31 +01:00
fgenesis
2d795b5bf7 Update libpng, libogg, libvorbis to newest versions
This also fixes a sneaky divide by zero in glpng, because some PNG's width was read incorrectly by the old libpng. (I wonder why it worked anyway...)
2012-01-10 18:43:28 +00:00