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
fgenesis
18034bcc18
Fix problems with loading a packaged mod twice. Thx to Daxar for reporting, was in fact a ttvfs bug.
2014-04-23 05:26:03 +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
46b070eb00
Not sure if this really fixes a crash, but worth a try. Thx Daxar for reporting.
2014-04-23 02:31:37 +02:00
fgenesis
71c87e1302
Restore pathfinding to be map-block-exact.
2014-04-23 02:07:00 +02:00
fgenesis
0486643455
Merge branch 'master' into experimental
2014-04-23 00:21:22 +02:00
MaddTheSane
991d7de27d
Update Cocoa.mm
...
An update broke compilation on versions of Mac OS X that didn't have/can't have Xcode 4 or later, including PowerPC versions.
2014-04-22 16:11:17 -06: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
471aca067a
Fix build on OSX with SDL 1.2
2014-04-15 20:32:31 +02:00
fgenesis
6855e198bc
Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental
2014-04-15 19:07:17 +01:00
fgenesis
dc0f4b3b9c
Fix linux build
2014-04-15 19:57:16 +02:00
fgenesis
4df08dc19f
Fix oversight because of copying files around + make sure this won't happen again.
2014-04-15 19:58:10 +02:00
fgenesis
f69d88b656
ttvfs related cleanups
2014-04-15 19:48:06 +02:00
fgenesis
3cf3ac7659
ttvfs update
2014-04-15 15:04:33 +02:00
C.W. Betts
87bc46abf6
Merge branch 'master' into experimental
2014-04-06 23:26:38 -06:00
C.W. Betts
c4f5ce3f85
Fix compilation on OS X/Clang.
2014-04-06 23:22:32 -06:00
C.W. Betts
33ad610b96
Remove removed files from the CMake file.
2014-04-06 23:07:31 -06:00
C.W. Betts
45185dee33
Fix a security warning on OS X.
2014-04-06 22:16:01 -06:00
fgenesis
95fb836221
Fix linux build
2014-04-07 05:09:40 +02:00
fgenesis
7630587279
Little bugfix
2014-04-07 04:40:50 +02:00
fgenesis
6d4b9502cb
Fix build + use win32 message boxes if on windows (they are nicer for dealing with Lua errors)
2014-04-07 04:19:54 +02:00
fgenesis
906563c957
Merge branch 'experimental' of github.com:fgenesis/Aquaria into experimental
2014-04-07 04:16:34 +02:00
fgenesis
0bf247169a
sync with ttvfs repo
2014-04-07 04:16:15 +02:00
C.W. Betts
5d9f7c2c18
Use SDL2's MessageBox API.
2014-04-06 19:28:56 -06: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
8026cdd905
Update ttvfs to new version
2014-04-06 19:19:33 +02:00
fgenesis
ac034fc708
Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental
2014-04-01 17:26:31 +01: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
a49dda92d6
Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental
2014-03-10 16:45:56 +00: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
