fgenesis
3dda97d32a
Hopefully fix build against SDL 1.2. Does not yet run!
...
Also: Recently introduced key names in usersettings.xml will no longer work.
But this should automatically detect key names as they used to be,
and convert automatically. Needs testing.
2017-02-15 04:41:52 +01:00
fgenesis
4095fde219
Move GL headers to ExternalLibs
2017-02-15 01:03:43 +01:00
fgenesis
b7e3e55cf1
Remove some unnecessary includes of glpng
2017-02-15 00:56:00 +01:00
James Le Cuirot
0dd19f9cb3
Add option to use system copy of GLPNG
2017-02-10 10:01:35 +00:00
James Le Cuirot
4d1fa75545
Put tinyxml2 in subdir so that system header is respected
2017-02-10 10:01:24 +00:00
James Le Cuirot
f19011e3dd
Delete duplicate GL headers
...
Nothing was pointing at BBGE/glext.
Only the VS project was pointing at ExternalLibs/GL. I have pointed it
at the headers under BBGE/GL instead.
I have also adjusted the includes to use the GL prefix as is standard
practise. These will still work as BBGE is in the include path. This
allows users to build against their system GL headers simply by
deleting the BBGE/GL directory.
2017-02-09 21:08:57 +00:00
fgenesis
1472c71bfe
Merge branch 'experimental' into controllerfixup
2017-02-08 21:55:52 +01:00
fgenesis
5ba014640c
Fix compile with VS2008, disable XMLDocument::LoadFile()
2017-02-08 21:53:59 +01:00
fgenesis
daca65d20a
Merge branch 'experimental' into controllerfixup
2017-02-08 21:33:05 +01:00
James Le Cuirot
5a16a290fc
Bump TinyXML2 to 4.0.1
2017-02-08 10:21:25 +00:00
fgenesis
7456e785fa
Remove mandatory defines and their checks:
...
BBGE_BUILD_SHADERS
BBGE_BUILD_FRAMEBUFFER
BBGE_BUILD_OPENGL
BBGE_BUILD_OPENGL_DYNAMIC
2017-02-05 22:51:25 +01:00
Valentin Ochs
f9357e7fca
Merge branch 'gccwarn' into controllerfixup
2017-01-17 11:15:47 +01:00
fgenesis
a648bdfe30
Small update to ttvfs_zip
2017-01-14 18:38:10 +01:00
Valentin Ochs
fe0ab0418b
Get rid of a lot of gcc warnings
...
Mostly signed/unsigned comparisons. Also some bugs, but I don't remember
where :D
2017-01-14 18:10:20 +01:00
fgenesis
7629fc0c33
Hopefully fix build on weird platforms
2017-01-14 12:52:08 +01:00
fgenesis
65f23789da
Hopefully fix build on weird platforms
2017-01-14 12:48:54 +01:00
fgenesis
40e5385636
Merge branch 'experimental' into controllerfixup
...
# Conflicts:
# CMakeLists.txt
# win/vc90/Aquaria.vcproj
# win/vc90/BBGE.vcproj
# win/vc90/external.vcproj
2017-01-13 13:17:47 +01:00
fgenesis
bb7cb7df71
update libogg, libvorbis, minihttp + enable /MP for vs2008 debug builds.
2017-01-13 13:09:16 +01:00
fgenesis
0dc30e668d
Merge branch 'experimental' into controllerfixup
...
# Conflicts:
# Aquaria/Avatar.cpp
# Aquaria/Continuity.cpp
# Aquaria/DSQ.cpp
# Aquaria/DSQ.h
# Aquaria/Game.cpp
# Aquaria/Game.h
# Aquaria/Main.cpp
# Aquaria/UserSettings.cpp
# BBGE/Base.cpp
# BBGE/Base.h
# BBGE/Core.cpp
# BBGE/Core.h
# BBGE/DebugFont.cpp
# BBGE/Shader.cpp
# BBGE/SoundManager.h
2017-01-13 12:19:23 +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
b4c001edb6
Update zlib to 1.2.8, libpng to 1.6.25, and move out of glpng subdir
2016-09-26 03:40:35 +02:00
fgenesis
8f524279b3
warning fix + cleanup, no functional changes
2016-09-26 01:54:30 +02:00
fgenesis
cd24278bf8
Use glGenerateMipmapEXT if available
...
Don't want to do mipmaps on CPU if not necessary.
2016-09-25 22:55:59 +02:00
fgenesis
8472718fb7
Major include refactor; changes to pretty much everything
...
This untangles some of the gigantic kitchen sink headers
in an attempt to split things into smaller files.
Also don't include gl.h, glext.h, windows.h,
and other such nonsense *everywhere*.
Lots of cleanups on the way too. More dead/unused code removal.
Remove incrFlag(), decrFlag() Lua functions.
2016-07-09 04:18:40 +02: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
