fgenesis
b70de7f94b
Add Lua function text_getStringWidth()
2015-03-08 20:44:14 +01:00
fgenesis
dee156cf7a
Remove some unnecessary code from StateMachine
2015-03-08 20:44:14 +01:00
fgenesis
db2faf026c
Merge branch 'experimental' of github.com:fgenesis/Aquaria_clean into experimental
2015-01-28 01:31:22 +00:00
fgenesis
2ddaa0d100
linking against openalsoft; system AL isn't necessary anymore iirc
2015-01-28 01:28:39 +00:00
fgenesis
220c8f1c08
add Lua function: setBGGradient()
2015-01-28 02:21:48 +01:00
fgenesis
2612b6e251
tiny cleanup
2015-01-28 01:45:52 +01:00
fgenesis
f54d341242
Allow obj_addChild() to specify front or back order
2015-01-14 21:49:04 +01:00
fgenesis
4b32c4364f
Allow interactive parallax layer elements
2015-01-14 21:48:37 +01:00
fgenesis
ba9c37f704
Make RenderObject::moveTo[Front|Back]() work for things that have a parent.
2015-01-14 21:42:54 +01:00
fgenesis
0fdc0e8acc
Delete spinycrab glow on death. Fixes #16 .
2015-01-14 21:40:54 +01:00
fgenesis
b4906a3840
Fix possible dangling pointer / crash in predatorytunicate script
2014-12-29 00:36:00 +01:00
fgenesis
aab0dad1cb
Allow Shift+G to increase game time 10x
2014-09-17 05:11:26 +02:00
fgenesis
15379db4b8
Fix possible crash when saving animation to non-existing file + loading malformed XML from skin file.
...
Also fix skeletal cache memory leak.
2014-09-16 00:29:57 +02:00
fgenesis
26dc8560b7
Fix gcc compile (broke in 300f326777)
2014-09-15 20:59:21 +02:00
fgenesis
d82553d6a7
Fixes to element interaction.
...
It now works with multiple entities doing interaction, and the correct
update list is used, which should save a bit more CPU.
2014-09-13 16:33:32 +02:00
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
e03e2ad3b7
Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental
2014-07-21 21:29:57 +01:00
fgenesis
70e175c8d6
Merge branch 'experimental' of github.com:AquariaOSE/Aquaria into experimental
2014-07-21 22:22:30 +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
C.W. Betts
bc260fa581
OS X: Fix a memory overrelease.
...
CoreFoundation functions that have "Get" in their names usually don't need to be released.
2014-06-27 14:48:24 -06:00
fgenesis
2ad27b63de
Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental
2014-06-22 23:41:43 +01: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
b5d32906f7
Longer Lua tracebacks are better for debugging
2014-06-21 18:08:09 +02:00
fgenesis
4a20874841
Fix unnecessary error message with empty or non-existing songs.xml
2014-06-13 23:40:33 +02:00
fgenesis
b41016f03a
Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental
2014-06-13 02:46:09 +01: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
f4302d8313
Someone should REALLY debug tinyXML2 a bit before throwing it at the public. Add some debug assertions to track misuse.
2014-06-10 02:15:01 +02:00
fgenesis
9b44aed00a
Disable tinyxml2's LoadFile() functions to catch ttvfs bypass for reading
2014-06-09 23:40:29 +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
f2a8060a55
vcproj update
2014-06-09 22:21:33 +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
4d04c9cb94
Suppress some annoying warnings about offsetof.
2014-06-08 21:42:27 +01:00
James Le Cuirot
43d41feeb8
Migrate from TinyXML v1 to v2. Not bundled (yet).
2014-06-08 21:11:23 +01:00
fgenesis
a9f9dd0736
glpng: Fix CVE-2010-1519, update to v1.46. By James Le Cuirot.
2014-06-07 18:36:47 +02:00
fgenesis
8b0ccb2ee4
Fix cmake build + disable "unsafe" Lua package table
2014-05-30 22:51:12 +02:00
fgenesis
d2fdbddd5a
Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental
2014-05-21 00:04:43 +01:00
fgenesis
7416ec0e15
Merge branch 'master' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental
2014-05-21 00:04:34 +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
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
b98e2532ed
Fix crash when AnimationLayer is missing
2014-05-16 00:04:56 +02:00
fgenesis
8d6b65c8b8
Merge branch 'master' of file:///Users/User/code/coding/Aquaria_fg_clean
2014-04-24 13:41:51 +01:00
