mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-29 03:33:48 +00:00
Code Issues Releases Wiki Activity
700 commits 9 branches 3 tags 31 MiB
Commit graph

75 commits

Author SHA1 Message Date
fgenesis
5ba014640c Fix compile with VS2008, disable XMLDocument::LoadFile() 2017-02-08 21:53:59 +01:00
James Le Cuirot
5a16a290fc
Bump TinyXML2 to 4.0.1 2017-02-08 10:21:25 +00:00
fgenesis
7629fc0c33 Hopefully fix build on weird platforms 2017-01-14 12:52:08 +01:00
fgenesis
bb7cb7df71 update libogg, libvorbis, minihttp + enable /MP for vs2008 debug builds. 2017-01-13 13:09:16 +01:00
fgenesis
ffa26e4105 Update inlcuded ttvfs 2017-01-12 23:53:13 +01:00
Valentin Ochs
dcd21b57bd Merge pull request #41 2017-01-12 22:14:26 +01:00
fgenesis
a88ca0a90d Update JPS.h & fix typos in incremental pathfinding Lua API that prevented things from ever working 2016-04-07 13:05:57 +02:00
Jan Beich
d1654506d6 minihttp: include netinet/in.h for sockaddr_in 2015-09-18 04:28:16 +00:00
fgenesis
c4b531ed5e Add glm 0.9.2 2015-07-12 22:07:27 +02:00
fgenesis
07807bfa36 Minor SDL lib file update for win32. Add isShot() Lua function that was forgotten. 2014-08-15 20:29:22 +02:00
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