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

1226 commits

This branch
This branch
All branches
Author SHA1 Message Date
Valentin Ochs
c988858cd2 This one slipped through 2017-01-14 18:30:58 +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
False.Genesis
ce4e76a3a1 Merge pull request #47 from Cat-Ion/travis 
Travis-CI integration. Closes #11
 2017-01-14 14:27:05 +01:00
fgenesis
dce0fc992c Merge branch 'experimental' into controllerfixup 2017-01-14 14:22:58 +01:00
Valentin Ochs
1e341052e0 enable IRC notifications 2017-01-14 14:11:38 +01:00
Valentin Ochs
648b7acfaa install sdl/openal on osx 2017-01-14 13:30:31 +01:00
Valentin Ochs
267e2b5696 Can I do multiple OSs like this? 2017-01-14 13:15:29 +01:00
Valentin Ochs
f1218a8d7b I don't know what I'm doing 2017-01-14 13:12:07 +01:00
Valentin Ochs
3aff70d91e Add CheckCXXCompilerFlag 2017-01-14 13:09:12 +01:00
Valentin Ochs
7eb08bf2ce Try to find C++ standard 2017-01-14 13:06:42 +01:00
Valentin Ochs
ef9d04b13b Merge remote-tracking branch 'upstream/experimental' into travis 2017-01-14 12:57:02 +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
Valentin Ochs
d9c418f292 Switch to SDL 1 for container stuff 2017-01-14 12:30:22 +01:00
fgenesis
26422da4e5 Merge branch 'experimental' into controllerfixup 2017-01-14 12:25:33 +01:00
Valentin Ochs
23e3904f24 Changes for container-based infrastructure 2017-01-14 12:23:08 +01:00
False.Genesis
10d506740f Merge pull request #46 from Cat-Ion/cxxflags 
Set c/cxx flags to -Wall -pedantic
 2017-01-14 12:22:38 +01:00
Valentin Ochs
0f4c1208ba Install libsdl2 for travis 2017-01-14 12:20:29 +01:00
Valentin Ochs
95e2d2f8d9 Install openal for travis 2017-01-14 12:13:03 +01:00
Valentin Ochs
1ff004b33c nop, test travis 2017-01-14 12:09:39 +01:00
Valentin Ochs
092559f4d3 Add travis.yml config 2017-01-14 12:06:06 +01:00
Valentin Ochs
8886c03883 Set c/cxx flags to -Wall -pedantic 
Special case for freetype2: -Wno-extended-offsetof, to prevent some 140
warnings.
 2017-01-14 00:38:55 +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
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