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
fgenesis
071ca187e6
Fix dead object accumulation when hitting note in song circle
2014-03-10 01:56:49 +01:00
fgenesis
fac96e3d51
Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental
2014-03-08 01:21:52 +00: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
8ce3baca7f
Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental
2014-02-25 01:02:22 +00: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
00c7f97ea8
Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental
2014-02-12 16:04:19 +00:00
fgenesis
00ab9a38b6
Add fileExists() Lua function
2014-02-12 16:59:14 +01:00
fgenesis
81de2b8e9d
Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental
2014-01-05 16:59:13 +00: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
508fae3574
Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental
2013-12-17 17:51:42 +00:00
fgenesis
624744ca99
Lua API: Setter/getter for gravity
2013-12-17 18:49:03 +01:00
fgenesis
7375a4879d
Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental
2013-12-12 22:21:29 +00: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
74c2c0fec2
Merge pull request #4 from dodumosu/master
...
Fix OSX/SDL1.2 build
2013-12-12 02:45:11 -08:00
dodumosu
f3fe225270
Update Core.cpp
2013-12-12 10:34:15 +00:00
fgenesis
5336c8d350
Fix linux build, once more, now for real
2013-12-11 03:36:44 +01:00
fgenesis
82ab3fa60c
Fix OSX build with SDL1.2 (nasty, nasty)
2013-12-11 03:06:59 +01:00
fgenesis
47b8c75dcb
Fix linux/osx build
2013-12-11 03:06:38 +01:00
fgenesis
124cb3561f
Merge branch 'master' into experimental
2013-12-11 01:44:37 +00:00
