1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-02-28 17:09:49 +00:00
Commit graph

59 commits

Author SHA1 Message Date
fgenesis
97cea29235 remove old world map reveal method
Note that this makes the world map highly inefficient for now because
the number of draw calls goes up crazy high. Will investigate.
2024-11-09 03:46:52 +01:00
fgenesis
f71c7f5d40 make dmon optional at compile time, and a dedicated runtime option
it's still experimental and might cause problems,
so only enable this if specifically requested,
since it's not needed for regular gameplay
2024-06-27 23:43:26 +02:00
fgenesis
578c8ecc45 remove parallax settings from config
there's no reason for this to exist, at all
2023-07-05 03:59:41 +02:00
fgenesis
1719fb5e74 eliminate DSQ::game, singe game is already a global ptr and we don't need both 2023-05-31 17:52:06 +02:00
fgenesis
af6c6a31aa fix crash when usersettings fail to load 2022-06-20 04:24:01 +02:00
fgenesis
4db7990ac2 remove displaylist support
i'd rather trim all possible fat off the renderer and then modularize it
into multiple backends. gotta start somewhere.
2022-05-18 03:39:33 +02:00
fgenesis
04bf58ab91 remove minActionSets config setting 2020-07-07 16:22:18 +02:00
fgenesis
4e7e0df524 Get rid of MenuUp, MenuDown, MenuLeft, MenuRight action entries
This makes ACTION_MENU* internal and non-configurable, but Lua code
can still rely on those actions being sent so that controller input
can be interpreted as menu input where appropriate.

Closes #58.
2017-02-20 03:02:58 +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
Valentin Ochs
beb2216265 Change some stuff for butt-endian architectures 2017-01-14 20:10:42 +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
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
d84a8bb2c2 fix possible startup crash 2017-01-12 23:57:21 +01:00
fgenesis
11488f85d0 fix copy-paste oopsie 2016-11-28 23:19:25 +01:00
fgenesis
6d4f1175ba Fix input grabbing logic, add related user setting, minor cleanup 2016-11-14 03:42:11 +01:00
fgenesis
3de004262b Attempt to fix joystick enabled/disabled state 2016-07-19 02:45:56 +02:00
fgenesis
c943759ce1 Getting closer to mutliple inputs actually working
Split logic and state from ActionMapper into another class,
of which one exists per input set.
2016-07-17 22:25:24 +02:00
fgenesis
77e4bfd292 Various improvements and fixes 2016-07-17 05:54:09 +02:00
fgenesis
411f8950e5 Fix possible fatal error, and jostick not accepting esc 2016-07-17 03:05:26 +02:00
fgenesis
671d0ace1b Fix some regressions + improvements:
- ACTION_MENU* not sent
- allow using the game UI with keyboard only
- allow mapping ACTION_MENU to controller inputs
- fix joystick axis (-) not working due to typo
2016-07-17 02:34:34 +02:00
fgenesis
bf94d541cd More WIP towards multiple input sets 2016-07-16 22:08:39 +02:00
fgenesis
520239a845 Fix possible crash on startup & disable newly added ActionSets by default 2016-07-15 03:28:36 +02:00
fgenesis
2fd181913e Preparations for multiple ActionSets support 2016-07-15 03:22:27 +02:00
fgenesis
95fd453a99 Save "Flip Input Buttons" setting 2016-07-14 05:09:50 +02:00
fgenesis
dcd4fe6c86 Implement configurable screenshot key 2016-07-14 04:59:08 +02:00
fgenesis
a043dd852f Major input handling improvements (#28):
- Support joystick hotplugging
- Support axes as buttons (means xbox360 shoulder triggers can be used as buttons)
- Show pretty joystick axis & button names if possible
- Tabify input actions UI
- Add 'mouse' column to input actions UI
- Allow to configure form hotkeys
- Allow ALL keys, get rid of internal key remapping
- SDL2: Use scancodes instead of keycodes since they are layout independent
- Allow extra mouse buttons (if present)
- Remove "lmbd" & "lmbu" actions in favor of "PrimaryAction" & "SecondaryAction"
  Makes the configuration less redundant and doesn't send each action twice,
  which happened if both were set to the same key.
- Fix Regressions from prev commits (menu not opening on Esc)

Still has a few minor bugs/issues that need to be fixed,
but pushing this now before the commit gets too large again.
2016-07-13 05:00:19 +02:00
fgenesis
2efc227ad9 Improve input menu a bit, accept Esc in the designated field, remove "Mic" section from config 2016-07-09 19:42:33 +02:00
fgenesis
8472718fb7 Major include refactor; changes to pretty much everything
This untangles some of the gigantic kitchen sink headers
in an attempt to split things into smaller files.
Also don't include gl.h, glext.h, windows.h,
and other such nonsense *everywhere*.

Lots of cleanups on the way too. More dead/unused code removal.

Remove incrFlag(), decrFlag() Lua functions.
2016-07-09 04:18:40 +02:00
fgenesis
9414be864a Huge Game.cpp refactor and various other things
Started working on a tiny input/ActionMapper refactor,
then everything fell apart and i ended up doing this.
I'm sorry.

Pretty much untested because input mapping is broken right now,
will fix that next.
2016-06-30 02:58:55 +02:00
fgenesis
a7c2d054a2 Begin joystick code refactor; some related cleanups and unused code removal 2016-06-25 23:59:34 +02:00
fgenesis
d6dc3a8a09 Merge branch 'experimental' into moreclean
Conflicts:
	Aquaria/Avatar.cpp
	Aquaria/BoxElement.cpp
	Aquaria/BubbleRender.cpp
	Aquaria/FFTNotes.cpp
	Aquaria/StarRenderer.cpp
	Aquaria/WaterFont.cpp
	Aquaria/resource.h
	BBGE/AnimatedSprite.cpp
	BBGE/AnimatedSprite.h
	BBGE/BloomEffect.cpp
	BBGE/CShim.cpp
	BBGE/Collision.cpp
	BBGE/Collision.h
	BBGE/Core.cpp
	BBGE/Core.h
	BBGE/Cube.cpp
	BBGE/Cutscene.cpp
	BBGE/DFSprite.cpp
	BBGE/DFSprite.h
	BBGE/Datafile.cpp
	BBGE/Datafile.h
	BBGE/Flags.h
	BBGE/Interpolator.cpp
	BBGE/Light.cpp
	BBGE/Light.h
	BBGE/LightCone.cpp
	BBGE/Model.cpp
	BBGE/Model.h
	BBGE/OggStream.cpp
	BBGE/PackRead.cpp
	BBGE/PointSprites.cpp
	BBGE/RenderObject.cpp
	BBGE/SkeletalSprite.cpp
2016-05-10 18:40:01 +02:00
fgenesis
caee9f8b0c remove some unused Avatar functions and variables 2016-05-05 20:11:49 +02:00
Nicolas Braud-Santoni
eb128e65a4 Remove commented-out code 2016-05-05 19:57:50 +02:00
fgenesis
065def0674 Fixes to prev commit - restore ttvfs functionality when reading XML files, and minor other things 2014-06-09 23:39:33 +02:00
fgenesis
4bafcb3e18 Merge branch 'tinyxml2' into experimental. Thanks to James Le Cuirot for this.
Conflicts:
	Aquaria/UserSettings.cpp
	CMakeLists.txt
2014-06-09 22:31:39 +02:00
James Le Cuirot
43d41feeb8 Migrate from TinyXML v1 to v2. Not bundled (yet). 2014-06-08 21:11:23 +01:00
fgenesis
86d2fcebda Fix problematic Lua init and add user setting to keep 'os' and 'io' functions.
From the Lua 5.1 manual:
"The luaopen_* functions (to open libraries) cannot be called directly,
like a regular C function. They must be called through Lua,
like a Lua function."

All standard tables are now loaded with luaL_openlibs(), which includes os and io.
Because these are inherently unsafe, there is a new config setting:
<AllowDangerousScriptFunctions on="1" />
This is disabled by default.
The title screen will show a warning when the setting is on.
2014-05-16 01:03:54 +02:00
fgenesis
7de589e275 Add custom upper<->lowercase translation tables for better localization support.
Translation tables by Henrik Holst.
2013-11-14 17:58:33 +01:00
fgenesis
45ba35ca4b Get rid of AQUARIA_FULL define and move the setting to usersettings.xml. Some changes regarding AQUARIA_DEMO.
This means there are no longer two builds necessary (one normal,
one dev), and all mod deveopment can be done using one build,
by setting

Demo builds now allow browsing the online mod list, but neither
downloading nor starting mods or applying patches.
2013-07-20 02:27:53 +02:00
fgenesis
3485199bec temp commit - work on shaders 2013-06-15 00:58:32 +02:00
fgenesis
416c47b4e9 Make world map reveal method configurable via user settings,
and add the possibility for mods to override this setting.
2012-10-14 03:46:47 +02:00
fgenesis
de69273229 Localise scripts + silene debug spam in options menu 2012-07-14 15:57:21 +02:00
fgenesis
345ff6063b Fix locale related oversights 2012-07-11 04:50:19 +02:00
fgenesis
7b2fa39428 Move localisation code to BBGE, and allow textures to be localised. 2012-07-10 22:16:48 +02:00
fgenesis
b719b8fd60 Removed textureMemoryMultiplier again; a bit more debug output for differing texture sizes 2012-06-15 17:58:18 +02:00
fgenesis
063b1c0dfc Moved most uses of glGetTexImage() into a single function with better error checking.
Also small config addition to optionally increase memory allocation size
for temporary texture pixel data; the nouveau drivers seem notoriously
awkward and keep writing over the buffer.
2012-06-15 04:12:20 +02:00
fgenesis
af30e508f5 Another correction, the prev. patch used the keyboard layout code, not country code.
Misnamed APIs are awful.
2012-06-02 23:06:53 +02:00
fgenesis
b71dc80516 Correct OSX locale detection.
(For me this returns en_de, not sure why, but i can see some german strings
in my OSX installation here and there so this might be feasible.)

Also fix typo in Network.cpp.
2012-06-02 22:33:45 +02:00
fgenesis
1f3e472551 Attempt to fix locale detection on OSX. By Henrik Holst. 2012-06-02 19:05:44 +02:00