1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-12-29 00:05:50 +00:00
Commit graph

619 commits

Author SHA1 Message Date
fgenesis
61a5f5c35c Merge pull request #1 from MaddTheSane/master
OS X changes
2013-10-17 16:14:00 -07:00
fgenesis
7a2219783a Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental 2013-09-29 00:27:54 +01:00
fgenesis
84f1b12c67 Add riding related Lua functions:
- entity_getRidingPosition()
- entity_getRidingRotation()
- entity_getRidingFlip()
2013-09-29 01:27:36 +02:00
fgenesis
3915e64a54 Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental 2013-09-28 16:26:45 +01:00
fgenesis
36c409e1d4 Little things:
- Make ACTION_LOOK and ACTION_ROLL available to handle via nodes
- Add entity_getPushVec()
- Fix typo in beam_setFirer()
- Add pull param to addInfluence()
- Add entity_getPushDamage()
- Add getMouseWheelChange()
2013-09-28 17:21:11 +02:00
fgenesis
9a4a58a69f Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental 2013-09-24 16:26:01 +01:00
fgenesis
358b8d139d Display build date in version string. 2013-09-24 17:25:33 +02:00
fgenesis
0df586874d Script interface:
- Add entity_doElementInteraction()
- Add avatar_setElementEffectMult()
- Change entity_isUnderWater(): Can now supply an override position.
2013-09-24 17:02:06 +02:00
fgenesis
6f9063ce6d Map element code refactoring. Allow other entities to influence map elements (EFX_WAVY).
Reduce Element memory; as most elements do not have any effect set,
this saves more than 50 bytes per element.
2013-09-24 17:00:06 +02:00
fgenesis
ab74abe903 Fix some SceneEditor crashes/quirks and remove some dead code in the process. 2013-09-24 16:54:43 +02:00
fgenesis
4d7af56b95 Animation editor: Add D, Shift+D, Ctrl+Shift+D key combos to flip bone rotation. 2013-09-24 16:05:05 +02:00
C.W. Betts
e306347577 The released version of SDL2 (According to the OS X framework) replaced KMOD_META with KMOD_GUI. 2013-09-23 01:12:36 -06:00
C.W. Betts
2465c87844 Fix overreleasing in Cocoa code 2013-09-23 01:12:36 -06:00
fgenesis
da3c5e3821 Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental 2013-09-04 15:12:21 +01:00
fgenesis
fdae0fe9a4 New action: ACTION_PLACE_AVATAR. Add Lua functions:
- entity_getBoneLockData()
- entity_getWeight()
2013-09-04 16:09:58 +02:00
fgenesis
a91a22f463 Cleaning out some dead code.
This adds a small compile error, to be fixed in next commit.
2013-09-04 16:07:46 +02:00
fgenesis
31ab72334b Fix copy-paste oops. 2013-08-31 16:49:22 +02:00
fgenesis
009189d471 Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental 2013-08-31 15:16:31 +01:00
fgenesis
396f091c85 Add Lua functions:
- quad_isRenderBeforeParent()
- quad_setRenderBorder()
- quad_isRenderBorder()
- quad_setRenderCenter()
- quad_isRenderCenter()
- quad_borderAlpha()
- quad_getBorderAlpha()
- node_getShape()
- text_setAlign()

Constants: ALIGN_CENTER, ALIGN_LEFT, PATHSHAPE_RECT, PATHSHAPE_CIRCLE
2013-08-31 16:14:05 +02:00
fgenesis
8c8ed1ee90 Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental 2013-08-29 02:59:20 +01:00
fgenesis
4f6447b58e Script interface extensions:
- shot_setTargetPoint()
- shot_getTargetPoint()
- entity_getTargetPriority()
- fix oversight in entity_doEntityAvoidance()
- entity_getTargetRange()
- getJoystickAxisLeft()
- getJoystickAxisRight()
2013-08-29 03:58:50 +02:00
fgenesis
87774839fe Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental 2013-08-28 03:37:19 +01:00
fgenesis
18a19ca115 Disable path finding debug spam. 2013-08-28 04:33:12 +02:00
fgenesis
01d9211a34 Little script interface changes:
- Add avatar_isSwimming()
- toggleInput() does now parse bools correctly
- pickupGem() returns gem ID
- Change in entity_doCollisionAvoidance():
  * Add support for ignore obs
  * One arg was shifted, this is now fixed but not sure if it adds a problem somewhere.
2013-08-28 04:20:36 +02:00
fgenesis
3c38f614e7 Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental 2013-08-27 02:45:42 +01:00
fgenesis
a7447cc599 Allow nodes to catch ACTION_SECONDARY. 2013-08-27 01:42:31 +02:00
fgenesis
d4038c1ad9 Fix build on Linux/OSX 2013-08-26 22:25:36 +02:00
fgenesis
cf4e466c69 Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental 2013-08-26 20:17:43 +01:00
fgenesis
f85d6c213e vcproj update 2013-08-26 21:03:02 +02:00
fgenesis
69890093bd Add special memory allocator for Lua that should take some memory stress away from heavy scripting. 2013-08-26 21:02:46 +02:00
fgenesis
c857722213 Minor things. Most importantly: Game receives ACTION_SWIMLEFT and ACTION_SWIMLEFT now, for use in nodes' action() callback. 2013-08-26 20:57:38 +02:00
fgenesis
fefb30a7b3 Allow entities and nodes to update while the game is paused.
Added Lua functions:
- node_setPauseFreeze()
- entity_setPauseFreeze()
- getFPS()

Also fixed possible crash in entity_setStateTime().
2013-08-26 20:56:34 +02:00
fgenesis
41929955d3 Fix ScriptInterface developer mode settings not applying.
Minor changes:
- clean out some Lua functions registered twice
- Correct bool cast in quad_setSegs()
- Show nested mains in debug console
- One less //HACK comment
2013-08-03 22:37:10 +02:00
fgenesis
212a680541 Close singing interface + abort any song when avatar_setBlockSinging(true) is called 2013-07-29 16:32:18 +02:00
fgenesis
ffd425892f Oops, typo in last commit 2013-07-27 04:41:45 +02:00
fgenesis
09e27cf9ed Merge branch 'master' of file:///Users/User/code/coding/Aquaria_fg_clean 2013-07-27 00:20:04 +01:00
fgenesis
7aca65f47e Let's better keep SDL 1.2 the default until everything settles and mac bins are up. 2013-07-27 00:44:55 +02:00
fgenesis
3c0de8227c Merge branch 'modsel-cleanup' 2013-07-27 00:43:07 +02:00
fgenesis
d107503d71 modselector: Clean out some old code, add support to open URL via webbrowser. 2013-07-27 00:41:15 +02:00
fgenesis
86acaf84e1 Replace modselector gfx, part 1
Icons made by Frances Fawcett. Download button based on work By EntiteFred.
(Via http://www.bit-blot.com/forum/index.php?topic=931.msg10207#msg10207)
2013-07-26 23:38:37 +02:00
fgenesis
9e1e4264ee Merge branch 'posaudio' 2013-07-26 23:34:02 +02:00
fgenesis
26f183b2d4 Merge branch 'sdl2' 2013-07-26 23:33:53 +02:00
fgenesis
5c7401b877 Gfx changes for mod selector 2013-07-26 23:33:27 +02:00
fgenesis
0be960bedb Merge branch 'posaudio' of file:///Users/User/code/coding/Aquaria_fg_clean 2013-07-26 01:19:26 +01:00
fgenesis
f825ad9fb7 Fix crash on minimize + reactivate 2013-07-26 02:15:40 +02:00
fgenesis
cf6556b94d Implement stereo to mono mixing for proper L/R separation even for stereo samples.
This mixes only those sounds that are supposed to be played positional.
All centered (default) sounds are played in stereo, as usual.
2013-07-24 19:57:13 +02:00
fgenesis
965ec50228 Merge branch 'posaudio' of file:///Users/User/code/coding/Aquaria_fg_clean 2013-07-24 04:36:43 +01:00
fgenesis
66802e1935 Change AL distance model to AL_NONE, and implement a custom distance attenuation model.
This avoid the problems with AL_INVERSE_DISTANCE_CLAMPED (doesn't reach 0),
and sounds way better than AL_LINEAR_DISTANCE_CLAMPED, which has an
all-too-sudden decay when a sound goes out of audible range.
2013-07-24 04:36:36 +02:00
fgenesis
b4aa0a801b Merge branch 'posaudio' of file:///Users/User/code/coding/Aquaria_fg_clean 2013-07-22 21:20:26 +01:00
fgenesis
21e42bc27e Merge branch 'master' of file:///Users/User/code/coding/Aquaria_fg_clean 2013-07-22 21:19:56 +01:00