1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-09-15 19:51:49 +00:00
Commit graph

617 commits

Author SHA1 Message Date
fgenesis
e8ff469205 Revert "Fix crash when adding a gem in entity init()", broke world map.
This reverts commit 17b8cd2079.
2014-08-15 21:18:43 +02:00
fgenesis
07807bfa36 Minor SDL lib file update for win32. Add isShot() Lua function that was forgotten. 2014-08-15 20:29:22 +02:00
fgenesis
300f326777 Use std::vector instead of std::list for RenderObject children 2014-07-21 22:21:22 +02:00
fgenesis
35c8086802 Some changed to pathfinding. This hopefully gets rid of spikes in very short paths. Some untested changes. 2014-07-21 22:20:08 +02:00
fgenesis
6b82ea86be Add some Lua functons for shots:
* shot_canHitEntity
* filterNearestShots
* filterNearestShotsAdd
* getNextFilteredShot
2014-06-22 02:19:45 +02:00
fgenesis
94cd430b84 oops 2014-06-21 18:47:05 +02:00
fgenesis
fceb1d1bcc This should fix some problems on Linux/OSX, which uses absolute paths for mods. Thx Daxar. 2014-06-21 18:14:01 +02:00
fgenesis
4a20874841 Fix unnecessary error message with empty or non-existing songs.xml 2014-06-13 23:40:33 +02:00
fgenesis
17b8cd2079 Fix crash when adding a gem in entity init() 2014-06-13 03:39:01 +02:00
fgenesis
121e0f9e8a Allow passing a shot name to most shot_get*() Lua functions 2014-06-13 01:31:57 +02:00
fgenesis
d95b5cccdd Allow editing repeat scale via editor, and save this in map files.
I chose to add an extra XML tag storing only the needed data in order to
preserve compatibility with older versions that expect the specific
layout of the <SE k="..." /> tag, which can't be changed.
Adding a new tag like <SE m="..." /> with an updated layout is also
not an option, because older versions would not load these, and
maps would be empty as a result.
2014-06-12 20:07:49 +02:00
fgenesis
817d4beb1c Fix tinyXML2 misuse; simplify scene saving code a little 2014-06-10 02:18:55 +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
fgenesis
1c67b5479b Include tinyxml2, update cmake to use this optionally 2014-06-09 22:21:24 +02:00
fgenesis
8d379653d4 Stash commit 2014-06-09 16:38:19 +02:00
James Le Cuirot
43d41feeb8 Migrate from TinyXML v1 to v2. Not bundled (yet). 2014-06-08 21:11:23 +01:00
fgenesis
8b0ccb2ee4 Fix cmake build + disable "unsafe" Lua package table 2014-05-30 22:51:12 +02: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
3db8c9e13a Pathfinding & map grid improvements.
There were still only 6 of 8 bits of the map grid in use.
The last 2 bits are now available as non-colliding user bits,
and are ignored unless specially treated.
The findPath() function can now be told which bits to respect,
which allows to prevent pathfinding to pass through fish tunnels,
for example.
A function for fast user bit map dilation is added as well.
2014-05-16 00:11:52 +02:00
fgenesis
00b5f46154 Unload mod archives when exiting a mod - so that the file doesn't stay open 2014-04-23 05:20:47 +02:00
fgenesis
71c87e1302 Restore pathfinding to be map-block-exact. 2014-04-23 02:07:00 +02:00
fgenesis
a0c53a488f Set positional sound position early 2014-04-15 21:39:32 +02:00
fgenesis
0b4e6854f7 Fix lost health refill on save.
The old HP (before health refill) ended up in the save file.
Loading a save would therefore continue with the HP the player
had before saving.
2014-04-15 21:01:18 +02:00
fgenesis
f69d88b656 ttvfs related cleanups 2014-04-15 19:48:06 +02:00
fgenesis
b437a7cb2c Fix ttvfs bugs, sync with dev repo 2014-04-07 02:25:58 +02:00
fgenesis
6203bc7ce4 Update Aquaria/BBGE/External sources to comply with the new ttvfs API 2014-04-07 02:10:05 +02:00
fgenesis
209ad526c6 Add canShotHit() interface function
Let entity decide if it wants to collide with shot or not.
2014-04-01 18:16:33 +02:00
fgenesis
84ffb703e1 Fix pathfinding crash 2014-04-01 01:47:41 +02:00
fgenesis
664b2bd5f2 Lua functions:
- Change entity_handleShotCollisionsHair(): Allow setting hair collision width percent
- Change entity_collideSkeletalVsCircle(): Allow colliding with any RenderObject
- Add entity_collideSkeletalVsCirclePos(): Allow specifying (x,y,radius)
2014-03-28 03:54:58 +01:00
fgenesis
b8af382bd9 SceneEditor: Hack for german keyboard layout 2014-03-28 03:52:24 +01:00
fgenesis
3741c6c9f7 oops 2014-03-10 17:42:29 +01:00
fgenesis
65e457423c Add option for particles to inherit alpha/color from their ParticleEffect 2014-03-10 17:28:41 +01:00
fgenesis
af463e63b2 Make mouse constraint circle scriptable. New Lua functions:
- setMouseConstraintCircle()
- setMouseConstraint()
2014-03-10 02:26:01 +01:00
fgenesis
071ca187e6 Fix dead object accumulation when hitting note in song circle 2014-03-10 01:56:49 +01:00
fgenesis
04ce34afa2 Add new setting for shots: DieOnKill (default: off) 2014-03-08 02:17:55 +01:00
fgenesis
b95dfee4c6 Add Lua functions: getZoom(), setMaxLookDistance() 2014-03-08 02:17:20 +01:00
fgenesis
2cec85fd05 Improve camera zooming behavior + camera related cleanups
- Now, the camera will now no longer be pulled towards the upper left
  or lower rigtht corner.
- cameraPos was never used as an interpolating vector, cleaned up related code.
- Core::invGlobalScale is now updated whenever Core::globalScale is changed
  (Not a nice solution but it does work)
- Increase cull radius by 10%, should prevent tiles from disappearing when
  zoomed in a lot.
2014-03-07 17:59:36 +01:00
fgenesis
b501ba67e3 Respect more nodes' active status: PATH_STEAM, PATH_WARP, PATH_RADARHIDE, PATH_WATERBUBBLE, PATH_ZOOM.
These nodes will no longer do their thing if active is set to false.
node_[is|set]EffectOn() is now an alias for the node_[is|set]Active() functions.

Also add getMaxCameraValues() Lua function.
2014-03-06 22:31:22 +01:00
fgenesis
429f612065 Get rid of some unnecessary float<->int casts + some new Lua functions:
- filterNearestEntitiesAdd()
- getEntityToActivate()
- setEntityToActivate()
- hasThingToActivate()
2014-02-23 18:27:42 +01:00
fgenesis
00ab9a38b6 Add fileExists() Lua function 2014-02-12 16:59:14 +01:00
fgenesis
a9712944ed Fix animation editor problems: Undo buffer memory hoarding, add warning if saving failed.
Thanks to Peri for finally making me fix this.
2013-12-28 04:42:02 +01:00
fgenesis
624744ca99 Lua API: Setter/getter for gravity 2013-12-17 18:49:03 +01:00
fgenesis
900b481f99 Reload stringbank on map editor map reload 2013-12-12 23:14:37 +01:00
fgenesis
201b3a76bc Add Lua functions (+ related text class changes):
- text_getHeight()
- getUserInputString()
2013-12-12 23:14:17 +01:00
fgenesis
5336c8d350 Fix linux build, once more, now for real 2013-12-11 03:36:44 +01:00
fgenesis
cf73567650 Lua API stuff:
+ isScriptedEntity()
+ findPath()
+ castLine()
- fix off by one in isObstructedBlock() (lower+rightmost row/col missing)
2013-12-11 01:57:00 +01:00
fgenesis
70286954a0 Replace A* pathfinding with much faster jump point search.
This also fixes entities glithing through walls, as diagonal cracks
were assumed walkable.
2013-12-10 03:47:58 +01:00
fgenesis
890ca90bd4 Add option to hideInGameMenu() to cancel the options menu if it's active. 2013-11-17 04:36:13 +01:00
fgenesis
711db4467f Display error if mod downloader failed to rename temp file 2013-11-17 04:34:34 +01:00