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

653 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
fgenesis
dff33b0530 Remove unused bones, don't crash when hardcoded bones are not found 2016-04-24 19:28:30 +02:00
fgenesis
6c56bc94a9 Add selectable flag for bones. 
Setting sel="0" in an anim's XML file prevents accidental modification
in the anim editor.
 2016-04-18 22:08:36 +02:00
fgenesis
65ab23536e Fix AnimLayer not applying bug introduced in 339490e3e9. 2016-04-18 21:07:46 +02:00
fgenesis
b4c1b811ce Make BoneCommand::parse() a bit more resilient and bail out when something is wrong 2016-04-17 15:16:55 +02:00
fgenesis
339490e3e9 Implemnt AC_SET_PASS and AC_RESET_PASS bone commands 2016-04-17 14:33:23 +02:00
fgenesis
7daf117744 Add findPathFreeMemory() Lua function 2016-04-09 00:01:38 +02:00
fgenesis
83ce096119 fix far off minimap symbols. broke in ce7239056 2016-04-08 23:58:48 +02:00
fgenesis
486541b1d7 actually fix incremental pathfinding for real this time 2016-04-08 23:14:33 +02:00
fgenesis
a88ca0a90d Update JPS.h & fix typos in incremental pathfinding Lua API that prevented things from ever working 2016-04-07 13:05:57 +02:00
fgenesis
361915947b Tiny vector cleanup 2016-03-21 03:41:22 +01:00
fgenesis
ce7239056b Minimap icon overhaul: 
- Allow specifying custom minimap icons for nodes and entities
- Allow overriding minimap textures
- This removes various hacks in MiniMapRender and related
- Allow access to the MiniMapRender object via Lua
  (don't delete it or the game will crash)

Little extra: Added destructors for some entity classes
 2016-03-21 03:40:56 +01:00
fgenesis
9e0d59460a Add getInterfaceFunctionNames(), isObstructedRaw(), OT_OUTOFBOUNDS 2016-03-20 19:19:21 +01:00
fgenesis
36f33da9a8 Remove some old, unused code 2016-03-20 19:14:48 +01:00
fgenesis
e661743775 Be less spammy when loading textures 
Oonly print "FROM DISK" when it was really from disk, and not retrieved from cache
 2016-03-15 03:38:01 +01:00
fgenesis
65e2bd83b2 Implement setSceneDisplayNameInSave() Lua function. 
This allows to specify pretty map names to be shown in save slots for mods.
 2016-03-15 02:19:39 +01:00
fgenesis
abc35b4c9d Fix save slot index confusion in dev mode. + tiny cleanup. 2016-03-13 02:50:43 +01:00
fgenesis
4585bb19ca Merge branch 'experimental' of github.com:AquariaOSE/Aquaria into experimental 2016-03-13 01:37:56 +01:00
fgenesis
62c949f640 Fix rare texture loading problems introduced in 8bd40be8aa and f0d580d873. 2016-03-13 01:37:43 +01:00
fgenesis
77c7aed8a0 Merge branch 'master' into experimental 2016-02-15 17:17:59 +01:00
fgenesis
6971e7898f Always respect AQUARIA_EXTRA_DATA_DIR define. Thx smls. 2016-02-15 17:17:18 +01:00
fgenesis
198f0353d5 Fix typo in entity_getBoneByInternalId(), add obj_getBlendType() 2016-01-10 23:49:11 +01:00
fgenesis
f55a70b459 Give script-spawned entities a negative ID. 
This should prevent most ID conflicts and problems related to that,
e.g. spurious changes to entity positions while working on a map.
 2015-11-29 21:43:21 +01:00
fgenesis
d8da8576e8 Fix moveToBack/moveToFront when used on objects that have a parent 2015-11-28 23:42:39 +01:00
fgenesis
ed089f38f7 Add two more font/text related Lua functions, and some more: 
+ entity_getBoneByInternalId()
+ entity_getNumBones()
+ text_getLineHeight()
+ text_getNumLines()
 2015-11-16 03:59:47 +01:00
fgenesis
3ebf99acfa Fix msvc2008 project files 2015-11-11 23:28:23 +01:00
fgenesis
4cc21619d4 Little int->float conversion 2015-11-11 23:28:10 +01:00
fgenesis
26549f84b7 Fix font bounds calculation 
BitmapFont::getActualWidth() is still a bit less than getStringWidth(),
but won't fix that now since it shouldn't cause any issues... hopefully.
 2015-11-11 23:27:32 +01:00
fgenesis
d41375d5d2 Remove unmaintained VS2010 project files 2015-09-30 23:58:07 +02:00