1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-25 09:44:02 +00:00
Commit graph

291 commits

Author SHA1 Message Date
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
89c1987693 Fix crash on shutdown
GL symbols were already unloaded in ~DarkLayer().
Why did this never crash before?!
2017-02-08 22:11:55 +01:00
fgenesis
58e3a247e4 Fix build on osx 2017-02-06 03:37:07 +01: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
fgenesis
c581ab01d8 Some preparations to compile with SDL1.2 (not yet!) 2017-02-05 21:25:06 +01:00
fgenesis
a3fb57fde9 un-recurse a thing 2017-01-21 03:34:38 +01:00
fgenesis
8411838636 Remove entity myTimer and related Lua functions. Fix warnings for now unsigned Entity::layer
- entity_resetTimer()
- entity_stopTimer()
2017-01-20 20:54:17 +01:00
Valentin Ochs
9245bee717 Fix some warnings
mostly sign-related, but also some about commas after the last item in
an enum list, usage of default in switches, implicit or old-style casts
2017-01-20 19:10:40 +01:00
fgenesis
d7cdb72143 Some more warning related stuff, but changed my mind about re-enabling the remaining ones :/ 2017-01-19 23:44:30 +01:00
fgenesis
7a60f493a5 Re-enable double->float cast warning and fix all instances where this fired 2017-01-19 23:31:56 +01:00
fgenesis
9bb3fe86f6 More signed/unsigned comparison fixes. int -> size_t. 2017-01-19 18:50:33 +01:00
Valentin Ochs
f9357e7fca Merge branch 'gccwarn' into controllerfixup 2017-01-17 11:15:47 +01:00
fgenesis
9d80077754 Preparations to get rid of DSQ::inputMode -- Pass device to action() methods. 2017-01-14 22:53:20 +01:00
Valentin Ochs
beb2216265 Change some stuff for butt-endian architectures 2017-01-14 20:10:42 +01:00
Valentin Ochs
2374c1a86b Revert ~0 to -1 2017-01-14 19:22:37 +01:00
Valentin Ochs
4dc7e27ee6 Fix some more warnings 2017-01-14 18:23:53 +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
eb8ef1fdf7 Use refresh rate setting + attempt to improve window/fullscreen apply logic 2017-01-14 00:06:04 +01:00
fgenesis
b781b45789 Implement "Desktop" resolution (0x0, default). Also fix music slider update in options menu
This makes the window resizable in desktop mode, and fixed size otherwise.
Fullscreen desktop has always the dame resolution as the desktop.
Add config setting to specify initial display.
Add config setting for the refresh rate (not yet properly integrated)

Closes #17
2017-01-13 18:20:35 +01:00
fgenesis
385c662714 Merge branch 'experimental' into controllerfixup 2017-01-13 12:25:10 +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
Valentin Ochs
a317a0d273 Fix charIsUpper(). Solves issue #15. 2017-01-13 10:17:06 +01:00
fgenesis
8af953cb63 Replace spaces with tabs (future self: i'm sorry)
In most places, that is. Left some files unchanges because they are a mess.
2017-01-12 22:51:46 +01:00
Valentin Ochs
dcd21b57bd Merge pull request #41 2017-01-12 22:14:26 +01:00
fgenesis
0d8a5c191c More graphics init cleanup. Remove aspect ratio check. Fix screen transition effect that broke in prev. commits. 2016-11-15 13:00:30 +01:00
fgenesis
034cf6a69f Little fixup + use RGBA16f framebuffer 2016-11-15 12:58:55 +01:00
fgenesis
ce869ba55a Load GL symbols *after* creating the window, else we only get a basic GL 1.1 context 2016-11-15 04:49:53 +01:00
fgenesis
90d70c117b Clean up framebuffer code a little 2016-11-15 04:48:21 +01:00
fgenesis
0db3c8242c Remove hardcoded Intel GMA 950 check 2016-11-15 01:18:54 +01:00
fgenesis
9422e74e43 Make window resizable 2016-11-14 04:17:04 +01:00
fgenesis
6d4f1175ba Fix input grabbing logic, add related user setting, minor cleanup 2016-11-14 03:42:11 +01:00
fgenesis
e92b76cf40 Some more opengl setup cleanup and fullscreen switching improvement 2016-11-14 03:42:10 +01:00
fgenesis
fe7c6ee048 Better fullscreen switching behavior, minor cleanup 2016-11-14 03:42:10 +01:00
fgenesis
c05f2db2e4 Fix vs2015 build 2016-11-09 02:10:13 +01:00
fgenesis
1bad4d006d Avoid recreating the GL context on Alt+Tab, resolution change, or windowed/fullscreen switch 2016-11-09 01:17:23 +01:00
fgenesis
b8aaccd7a1 Attempt to repair background pausing on Linux 2016-11-09 01:17:23 +01:00
fgenesis
b9d7d3e9fe screw this 2016-10-03 23:26:21 +02:00
fgenesis
a3421c323d hopefully last fix 2016-10-03 23:11:48 +02:00
fgenesis
6658b45da6 i'll just stop writing commit messages from now on and eventually unbreak my linux install or something 2016-10-03 23:01:19 +02:00
fgenesis
2ccc751f70 more fix 2016-10-03 22:54:13 +02:00
fgenesis
80175c3df6 another gcc 4.5 breakage, delete old unused leftovers 2016-10-03 22:34:54 +02:00
fgenesis
bc77c89ad3 Fix build with gcc ~5.4. Thx thegamemaster1234 for pointing. 2016-10-03 22:28:29 +02:00
fgenesis
b5e6234269 Move glext function pointer loading to GLLoad.cpp 2016-09-26 04:13:28 +02:00
fgenesis
4751b31653 Save screenshots in PNG instead of TGA format. Closes #34. 2016-09-26 03:44:15 +02:00
fgenesis
58df545ec8 cleanup #2, no functional changes 2016-09-26 01:54:45 +02:00
fgenesis
84da02e4aa Merge branch 'vs15' into controllerfixup 2016-08-07 23:57:35 +02:00
fgenesis
7b702673fe Fix some things/typos that were overlooked 2016-08-07 05:20:04 +02:00
fgenesis
21d4b43c29 Fix more opengl linkage problems on windows 2016-08-06 21:00:48 +02:00
fgenesis
93ac73179f Support vs15 2016-08-06 19:50:07 +02:00
fgenesis
15c78dd2e4 Rix mouse button emulation that broke somewhere along the way 2016-08-04 01:55:32 +02:00