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

898 commits

Author SHA1 Message Date
fgenesis
067472d61b avoid creating a (0,0)-sized window at the start 2021-01-12 14:05:22 +01:00
fgenesis
a1f92433d8 fixes to window size management, fullscreen transition, etc 2021-01-12 11:06:09 +01:00
fgenesis
86cd7950ca Merge branch 'experimental' into controllerfixup + bring back BBGE_BUILD_OPENGL_DYNAMIC
# Conflicts:
#	BBGE/Base.cpp
#	BBGE/FrameBuffer.cpp
#	BBGE/Shader.cpp
2021-01-12 02:45:41 +01:00
False.Genesis
b3b3d98f79
Merge pull request #73 from dimag0g/experimental
Compatibility with non-standard build environments
2021-01-12 02:15:49 +01:00
fgenesis
94dbecac43 Only keep the one screen mode with the highest refresh rate per resolution 2021-01-12 01:57:29 +01:00
fgenesis
03c698320a Merge branch 'experimental' into controllerfixup
# Conflicts:
#	Aquaria/AnimationEditor.cpp
#	Aquaria/AquariaComboBox.cpp
#	Aquaria/AquariaMenuItem.h
#	Aquaria/Avatar.cpp
#	Aquaria/BitBlotLogo.cpp
#	Aquaria/Continuity.cpp
#	Aquaria/DSQ.cpp
#	Aquaria/DSQ.h
#	Aquaria/Game.cpp
#	Aquaria/Game.h
#	Aquaria/Intro.cpp
#	Aquaria/RecipeMenuEntry.cpp
#	Aquaria/SceneEditor.cpp
#	Aquaria/States.h
#	Aquaria/UserSettings.cpp
#	BBGE/ActionMapper.cpp
#	BBGE/Base.cpp
#	BBGE/BitmapFont.h
#	BBGE/Core.cpp
#	BBGE/Core.h
#	BBGE/ParticleManager.cpp
#	BBGE/Particles.h
#	BBGE/RenderObject.h
#	BBGE/Shader.cpp
#	BBGE/Shader.h
#	BBGE/SkeletalSprite.h
#	BBGE/Texture.cpp
#	BBGE/Vector.h
2021-01-12 00:26:44 +01:00
fgenesis
a1253e60f9 Merge branch 'controllerfixup' of github.com:AquariaOSE/Aquaria into controllerfixup 2021-01-11 19:32:48 +01:00
fgenesis
25696c4436 Enable msvc signed/unsigned mismatch warnings and fix remaining cases 2021-01-11 19:27:54 +01:00
fgenesis
812848e382 Fix crash on startup 2021-01-11 19:26:32 +01:00
False.Genesis
6af1fd10e1
Merge pull request #48 from Cat-Ion/gccwarn
Get rid of even more warnings
2021-01-11 18:14:48 +01:00
Valentin Ochs
c3f1058ff2 Change some stuff for butt-endian architectures 2021-01-11 12:28:27 +01:00
Valentin Ochs
d57d989963 This one slipped through 2021-01-11 12:28:27 +01:00
Valentin Ochs
4c7c4c240e Fix some more warnings 2021-01-11 12:28:27 +01:00
Valentin Ochs
b9d402199c Get rid of a lot of gcc warnings
Mostly signed/unsigned comparisons. Also some bugs, but I don't remember
where :D
2021-01-11 12:28:27 +01:00
Dmitry Grigoryev
0e2d669d42 Merge branch 'master' into experimental 2021-01-02 02:18:36 +01:00
Dmitry Grigoryev
9596e7eac8 fix static FrameBuffer/Shader build 2021-01-02 02:14:15 +01:00
Dmitry Grigoryev
d15204758f avoid conflict with quad precision types 2021-01-02 01:54:19 +01:00
Dmitry Grigoryev
c6968454e6 Merge branch 'master' of https://github.com/dimag0g/Aquaria 2021-01-02 01:50:48 +01:00
Dmitry Grigoryev
3d65f113c6 avoid conflict with quad precision types 2021-01-02 00:50:27 +01:00
C.W. Betts
76fc77051c Add ARM support. 2020-10-20 00:32:22 -06:00
fgenesis
36059deae0 remove some unused code 2020-07-13 23:13:07 +02:00
fgenesis
c80176d20a preliminary support for joystick POV-hats 2020-07-07 22:30:25 +02:00
fgenesis
53b027067a improvements to key config menu
- hide actionset selection if only 1 set is present
- show keys pressed
- highlight "tabs" a bit more visually
- rumble selected controller on device select change
2020-07-07 16:24:03 +02:00
fgenesis
04bf58ab91 remove minActionSets config setting 2020-07-07 16:22:18 +02:00
False.Genesis
c37f6ea6d8
Merge pull request #63 from pelupessy/master
Minor fixes
2020-07-06 15:42:07 +02:00
pelupessy
470a89510d
Update SceneEditor.cpp
Use of operand of type #bool# in #operator++# is depreciated.
2020-07-06 17:03:34 +09:00
pelupessy
2f55036986
Update ScriptInterface.cpp
Required space between literal and string macro added.
2020-07-06 16:37:47 +09:00
False.Genesis
9376b1aeb3
Merge pull request #60 from ya-isakov/controllerfixup
Force desktop OpenGL
2020-07-04 18:19:30 +02:00
fgenesis
021512337e fix build on RPi4 (and probably newer gcc), thx pelupessy
Close #62
2020-07-04 18:13:48 +02:00
Yaroslav Isakov
74e196daa5 Force desktop OpenGL 2020-07-01 18:46:13 +02:00
fgenesis
a939bc2660 don't warn about nested main in key config 2020-06-19 20:42:33 +02:00
fgenesis
988db94b72 tiny cleanup 2019-09-06 02:58:06 +02:00
fgenesis
5fff755c1e more ignore 2019-09-06 02:57:08 +02:00
fgenesis
1de786efc6 Fix bug that a bone's rq="0" attribute would disappear when skel was saved while visible 2019-09-06 02:56:53 +02:00
fgenesis
61f1e87180 fix uninitialized ptr. ooopsie 2019-04-15 02:26:48 +02:00
fgenesis
b8b9039693 don't plop up error message for non-existing save files 2019-04-14 19:45:14 +02:00
fgenesis
6704fd1ac6 fix SDL 1.2 window focus handling 2019-03-24 21:15:27 +01:00
fgenesis
0f0d839fc7 block help screen from accidentally opening in key config menu, and make sure (?)-button isn't shown 2019-03-24 19:45:52 +01:00
fgenesis
0abe0f821c hard-wire Escape key to always trigger ACTION_ESC.
Additional config for more keys/button to trigger the same action
is still possible.
2019-03-18 01:07:14 +01:00
fgenesis
520c71fdb7 old shit begone 2019-03-18 00:51:28 +01:00
fgenesis
77709a2d85 Display errors when loading XML fails 2019-03-18 00:50:56 +01:00
fgenesis
b7a6b52fe5 SDL window backend cleanup 2019-03-18 00:50:36 +01:00
fgenesis
04c557f5e8 Refactor Window functionality out of Core. Minor cleanups.
SDL2 impl seems to work, SDL1 impl finalization pending.
2019-01-29 00:36:48 +01:00
fgenesis
3fe9b1590c SDL 1.2 backend compiles again, but window stays black 2018-04-17 01:28:23 +02:00
fgenesis
64150bcb5b Merge branch 'controllerfixup' of github.com:AquariaOSE/Aquaria into controllerfixup 2018-04-17 01:16:47 +02:00
fgenesis
239df3c339 compiles again 2018-04-17 01:15:30 +02:00
fgenesis
5f2eafad7c temp commit 2018-01-21 12:47:32 +01:00
meh2481
eae1e31e80 Add both sdl1.2 and sdl2 builds to travis 2018-01-06 21:52:18 -05:00
meh2481
c279a8b17c Fix .travis.yml to use SDL1.2 2018-01-06 21:29:14 -05:00
fgenesis
8f565c6171 Include stringbank.txt into binary in case stringbank.txt is out of date
This makes sure engine-internal strings are always present.
2018-01-02 20:59:38 +01:00