mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-26 18:23:49 +00:00
Code Issues Releases Wiki Activity
1131 commits 9 branches 3 tags 31 MiB
Commit graph

1131 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
881226fe43 Minor cosmetic fixes + prevent heap overflow after on taking more than 99999999 screenshots 
Gotta be correct!!11
 2016-07-14 05:01:30 +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
082dcacad8 whoops 2016-07-10 01:11:06 +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
798e4c6619 Remove support for input key config locking. 
Wasn't useful, isn't useful, and confused me to no end.
Better to have this gone.
 2016-07-09 19:09:39 +02:00
fgenesis
4b0f45df73 Regression: Fix optionsOnly not being remembered 2016-07-09 15:23:30 +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
d1778a97b8 wip, temp commit 2016-07-03 18:07:13 +02:00
fgenesis
4e37abd0f5 whoops forgot a file 2016-07-03 18:06:35 +02:00
fgenesis
34a1bcb70f Really use scancode names + little more cleanup 2016-07-03 15:48: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
e2e7753226 Remove some more unused cruft 2016-06-26 00:39:48 +02:00
fgenesis
7494529bd0 Remove old pre-SDL2 rumble code for Linux 
SDL2 is now ubiquitous on linux, and there is no reason to keep this around
 2016-06-26 00:03:10 +02:00
fgenesis
a7c2d054a2 Begin joystick code refactor; some related cleanups and unused code removal 2016-06-25 23:59:34 +02:00
fgenesis
4534b68fc5 Remove instant quit on Ctrl+Alt+Q, allow Alt+Enter for fullscreen switch on OSX 2016-06-25 19:43:20 +02:00
fgenesis
548da72632 Merge branch 'master' into experimental 
Conflicts:
	BBGE/SoundManager.cpp
	BBGE/SoundManager.h
 2016-06-20 02:05:42 +02:00
fgenesis
84366ad533 hopefully fix build on gcc6, tiny cleanup 
... in fact i forgot that much more cleanup was already done
on the experimental branch. whatever.
 2016-06-20 01:56:27 +02:00
fgenesis
96206dd82a Fix yet another oopsie RenderObject::setTexture() 
Didn't apply empty ("") texture when another texture was already set.
 2016-06-19 00:42:13 +02:00
fgenesis
06963a8d6a Implement loadXMLTable() Lua function 2016-06-10 02:26:43 +02:00
fgenesis
82c2122774 Do not restart DamageSprite scale interpolation when healed 2016-05-25 02:11:20 +02:00
fgenesis
589e5a90d4 derp 2016-05-14 17:50:39 +02:00
fgenesis
15c7776763 Remove TimeUpdateType enum and related code. Dynamic timestep was used all the time anyway. 2016-05-14 17:23:48 +02:00
fgenesis
9bb4226626 Remove RenderObjectLayer::sort() and related 2016-05-14 17:20:13 +02:00
fgenesis
c4b0decc10 Add some RenderObject child related functions: 
+ obj_getChild()
+ obj_removeChild()
+ obj_removeChildIdx()
+ obj_removeAllChildren()
+ obj_getNumChildren()
 2016-05-14 17:14:14 +02:00
fgenesis
65179870a9 Fix possible crash when loading applying a skeletal twice in one frame. 
Possibly a regression from 300f326777.
 2016-05-12 00:25:00 +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
False.Genesis
0ced7c1d50 Merge pull request #27 from nbraud/unifdef 
More cleanups
 2016-05-10 10:20:36 +02:00
fgenesis
2f0940f1df Fix yet another oopsie RenderObject::setTexture() 
Didn't apply empty ("") texture when another texture was already set.
 2016-05-09 08:15:41 +02:00
fgenesis
e7791c5ddc Remove RenderObject::collisionRects. 
Another vector that was always empty, optionally filled when specified
by a skeletal file, but none actually did this. Should be safe to remove.

Also small related optimization in Game::collideSkeletalVsCircle().
 2016-05-07 01:00:16 +02:00
fgenesis
35a3888c94 Remove RenderObject::collidePosition and related code 
This was always (0, 0) and optionally used for bones if defined in skeletal files.
None of the official skeletal files used this, so this should be safe to remove.
 2016-05-07 00:47:45 +02:00
fgenesis
d4a1e1ef1d Remove another unnecessary file 2016-05-05 20:36:10 +02:00
fgenesis
c26174d750 oops 2016-05-05 20:29:59 +02:00
Nicolas Braud-Santoni
fb8732e97d
Eradicate remnents of BBGE_BUILD_GFLW & SDL 2016-05-05 20:24:42 +02:00
Nicolas Braud-Santoni
bb50895595
Removing Z2D_J2K texture option 
Given that j2k-codec/ is nowhere to be found,
  this cannot possibly build.
 2016-05-05 20:15:11 +02:00
fgenesis
caee9f8b0c remove some unused Avatar functions and variables 2016-05-05 20:11:49 +02:00
fgenesis
51baa76816 Remove unused files 2016-05-05 20:09:39 +02:00
Nicolas Braud-Santoni
b29e57d15b
Removing more build options 
This times, it is `AQ_TEST_QUADTRAIL`, `AQUARIA_BUILD_MAPVIS`
  and `DISABLE_SUBS` that have disappeared.
 2016-05-05 20:02:08 +02:00
Nicolas Braud-Santoni
eb128e65a4 Remove commented-out code 2016-05-05 19:57:50 +02:00
Nicolas Braud-Santoni
0f39b825e1
Remove BBGE_BUILD_FMODEX option (always defined) 2016-05-05 15:45:31 +02:00
Nicolas Braud-Santoni
91c493344d
Removing obsolete build options 
The game cannot work with those anyhow...

```c
 #undef BBGE_BUILD_IRRKLANG
 #undef BBGE_BUILD_OPENALOGG
 #undef BBGE_BUILD_XINPUT
 #undef BBGE_BUILD_DELAYXINPUT
```
 2016-05-05 15:37:25 +02:00
Nicolas Braud-Santoni
9617bde3ec
Cleaning up RLT_* macros 
```c
 #define RLT_FIXED 1
 #undef  RLT_DYNAMIC
 #undef  RLT_MAP
```
 2016-05-05 15:21:44 +02:00
Nicolas Braud-Santoni
921e4ba101
Removing more commented-out, #if cruft 2016-05-05 04:52:51 +02:00
Nicolas Braud-Santoni
6bcee6a034
More cleanups. 
```c
 #undef BBGE_BUILD_X360
 #undef BBGE_BUILD_GLFW
 #undef BBGE_BUILD_SDLMIXER
 #undef BBGE_BUILD_BASS20
```
 2016-05-05 04:45:42 +02:00
fgenesis
903d222f65 Minor update to vc90 project files 2016-05-05 03:53:51 +02:00
fgenesis
b2a0694281 Very tiny cleanup 2016-05-05 03:52:22 +02:00
Nicolas Braud-Santoni
276265be1d Eliminating obsolete #ifdefs and friends (#26) 
The following options have been applied globally, using unifdef(1):
```c
 #undef BBGE_BUILD_DIRECTX

 #define BBGE_BUILD_OPENGL 1
 #define GL_GLEXT_LEGACY   1
 #define HAVE_PUTENV       1
 #define TIXML_USE_STL     1
 #define BBGE_BUILD_SDL    1
```
 2016-05-05 03:49:41 +02:00