mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-25 09:44:02 +00:00
Code Issues Releases Wiki Activity
753 commits 9 branches 3 tags 31 MiB
Commit graph

753 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
8e576b66e7 Better FindTinyXML2.cmake. Fixes #44. 2017-01-13 13:11:11 +01:00
fgenesis
bb7cb7df71 update libogg, libvorbis, minihttp + enable /MP for vs2008 debug builds. 2017-01-13 13:09:16 +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
False.Genesis
6f4474df36 Merge pull request #45 from Cat-Ion/issue15 
Fix charIsUpper().
 2017-01-13 11:32:45 +01:00
Valentin Ochs
a317a0d273 Fix charIsUpper(). Solves issue #15. 2017-01-13 10:17:06 +01:00
fgenesis
d84a8bb2c2 fix possible startup crash 2017-01-12 23:57:21 +01:00
fgenesis
ffa26e4105 Update inlcuded ttvfs 2017-01-12 23:53:13 +01:00
False.Genesis
fe0a91129f Merge pull request #42 from Cat-Ion/foodholders 
FoodHolder changes
 2017-01-12 23:53:38 +01:00
Valentin Ochs
585489611b [foodholders] Foodholder changes 
- Add convenience functions toggleValid() and isValid() to wrap around
  the alpha/alphaMod members
- Fix bug #37 that allows cooking with the third slot at all times
 2017-01-12 23:38:07 +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
79ef0b9514 Add clipboard manipulation functions 2017-01-12 21:29:45 +01:00
fgenesis
11488f85d0 fix copy-paste oopsie 2016-11-28 23:19:25 +01:00
fgenesis
717132a723 vs2008: Enable multicore compiles 2016-11-28 23:16:16 +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
b32ce853e7 Fix possible stack overflow 
Why did this never happen before??!
 2016-11-14 04:17:53 +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
a3d5d63eed possible link fix for cmake build but not sure 2016-10-04 00:08:03 +02: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
204525bb37 should drunkcode more often 2016-10-03 22:40:04 +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
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
58df545ec8 cleanup #2, no functional changes 2016-09-26 01:54:45 +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
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
916c3214d2 Make SDL2 the default 2016-08-06 20:03:51 +02:00
fgenesis
93ac73179f Support vs15 2016-08-06 19:50:07 +02:00