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

984 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
fgenesis
ce4f6a7d3e move StringBank to BBGE 2018-01-02 17:00:27 +01:00
fgenesis
3a96c775db work around dev warning message; fix compiler warning 2018-01-02 16:18:50 +01:00
fgenesis
1acad1069e Add some Lua functions for Android compat: 
+ getEntityList()
+ entity_getEntityListInRange(e, range)
+ vector_getEntityListInRange(x, y, range)
 2018-01-02 15:39:18 +01:00
fgenesis
fec1cc7ac2 Initial support for scriptable shots 2017-11-01 19:25:31 +01:00
fgenesis
eb1f38d86c Minor script interface cleanup and prep for next commit 2017-11-01 19:25:19 +01:00
fgenesis
64406419c1 Some fixes for msys2/mingw build 2017-09-02 22:13:46 +02:00
fgenesis
4cfeadeb6e Whoever figured that enabling -Wall on MSVC would be a good idea should be shot. 2017-09-02 20:28:19 +02:00
fgenesis
db4af79389 Check against nesting recursive main() 2017-08-09 22:07:37 +02:00
fgenesis
02db145a01 Don't error for empty save slots 2017-08-09 21:02:45 +02:00
fgenesis
bd0e16774f Remove some old/unused cruft 2017-08-09 21:01:56 +02:00
fgenesis
fe93c91eca fix stupidity in prev commit 2017-07-14 03:36:43 +02:00
fgenesis
cabdf93e21 Tiny performance optimization 
Keep disabled damage types vector sorted and do binary search.
 2017-07-12 04:12:06 +02:00
fgenesis
78352d4402 Multi-display fixes 
- Enumerate display modes to show in the resolution selector based on the
  screen we're on
- Correct graphics init code to use the display index specified in
  user settings
 2017-06-26 08:34:30 +02:00
fgenesis
6f170de929 Proper ~Joystick() dtor. Make haptics optional. Hopefully fixes #50. 2017-06-25 15:56:45 +02:00