mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-25 01:33:49 +00:00
Code Issues Releases Wiki Activity
619 commits 9 branches 3 tags 31 MiB
Commit graph

619 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
fgenesis
d8301284c0 Merge branch 'master' of file:///Users/User/code/coding/Aquaria_fg_clean 2013-12-11 01:44:03 +00:00
fgenesis
313b539981 Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental 2013-12-11 01:01:04 +00:00
fgenesis
9d3aa5160f vcproj update 2013-12-11 01:57:11 +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
9041197ea7 Should actually upload the file in question... 2013-12-10 03:52:17 +01:00
fgenesis
204152a783 Little optimization for molestPath() 2013-12-10 03:48:40 +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
9ba8e21467 Merge pull request #3 from MaddTheSane/master 
OS X: Indentation and syntax
 2013-11-19 09:57:13 -08: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
fgenesis
bb515842a8 Create screenshots dir on startup, if necessary 2013-11-17 02:24:13 +01:00
fgenesis
ca9ed11680 Update README 2013-11-17 02:23:53 +01:00
fgenesis
96195219e8 Move scripts to files, to make automated overriding easier 2013-11-17 02:23:39 +01:00
C.W. Betts
5ca82aea1c Indenting 2013-11-15 18:45:53 -07:00
C.W. Betts
b9ed32049f Use more modern Objective-C syntax. 2013-11-15 18:45:13 -07:00
fgenesis
373ccff7e4 Fix build on linux 2013-11-14 20:37:50 +01:00
fgenesis
ab752e1156 replace CreateDirA() and mkdir() scattered everywhere by createDir() with some more error checking. 2013-11-14 20:07:39 +01:00
fgenesis
7de589e275 Add custom upper<->lowercase translation tables for better localization support. 
Translation tables by Henrik Holst.
 2013-11-14 17:58:33 +01:00
fgenesis
7a9df46830 Replace some leftover luaReturnNum(0) with luaReturnNil() 2013-11-14 15:20:52 +01:00
fgenesis
cccd42227f Merge branch 'experimental' 2013-11-05 16:51:26 +01:00
fgenesis
c60e2c3757 Merge branch 'vfsfix' 2013-11-05 16:47:24 +01:00
fgenesis
8e1be3a5d2 Attempt to fix some VFS problems 2013-11-05 14:55:37 +01:00
fgenesis
e8b9261004 Attempt to fix some VFS problems 2013-11-05 14:53:57 +01:00
fgenesis
18a6475236 Merge pull request #2 from cuddlyogre/master 
Now Visual Studio 2010 Compatible
 2013-11-03 08:49:38 -08:00
fgenesis
7d27489ac3 Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental 2013-11-02 14:28:01 +00:00
fgenesis
1701c9a67d More Lua functions: 
- entity_hasSkeletal()
- entity_getNumAnimLayers()
- filterNearestEntities() to fill an internal filter buffer
- getNextFilteredEntity() to iterate over the filter buffer
 2013-11-02 15:22:55 +01:00
cuddlyogre
1f6887fcb0 Now Visual Studio 2010 Compatible 
Removed a "using namepsace std;" to stop an ambiguous symbol error
regarding the "hash" datatype when compiling with Visual Studio 2010. As
a result, I had to add a "std::" to an ostringstream.

Duplicated, upgraded, and reworked the existing Visual Studio 2008
project so that it now compiles successfully with Visual Studio 2010.
Both debug and release work without a hitch on Windows 7. The original
Visual Studio 2008 solution is still there if it is needed.
 2013-10-31 18:44:02 -05:00
fgenesis
c9bcbd3c1e Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental 2013-10-28 03:32:55 +00:00
fgenesis
8d444a3327 Get rid of a few unnecessary continueity resets. 
Continuity resets load a bunch of small files from disk;
this speeds up the startup precess very slightly if the files
are not in the OS's file cache yet.
 2013-10-28 04:29:46 +01:00
fgenesis
9377b6edb9 Add Lua function isShuttingDownGameState() 2013-10-28 04:28:05 +01:00
fgenesis
c312572ff7 Do not allow rolling when riding. 
Rolling while riding does not make sense, is not handled/animated at all,
and it looks strange. I wonder why nobody has fixed this in all this time.
 2013-10-28 04:27:44 +01:00
fgenesis
0cb36b9830 Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental 2013-10-25 01:35:15 +01:00
fgenesis
3fe9ffc2cd Fix setGemPosition(), add more Lua functions: 
- isShader()
- isParticleEffect()
- pe_start()
- pe_stop()
- pe_isRunning()
- isMiniMapCursorOkay()
 2013-10-25 01:47:24 +02:00
fgenesis
69e25640fb Reload shaders on resolution change. 2013-10-25 01:44:34 +02:00
fgenesis
77b56cf19b Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental 2013-10-21 02:27:29 +01:00
fgenesis
fa6ca8d60a Add 2 Lua functions: 
+ obj_getWorldScale()
+ obj_getParent()
 2013-10-21 02:34:57 +02:00
fgenesis
b0c098bbcd Compile fix for prev. commit 2013-10-21 02:34:30 +02:00
fgenesis
d97bb25b9e Add some Lua functions, changes to hair. 
+ beam_getEndPos()
+ entity_setCurrentHealth()
+ entity_setMaxHealth()
+ beam_getEndPos()
+ entity_hasAnimation()

- Add 3 new parameters to entity_damage: shot, hitX, hitY
- entity_getAnimationLength() supports string as 2nd parameter now.
  This will lookup an animation's length via name.
  Passing an ANIMLAYER_* constant works as it used to.
 2013-10-19 17:30:42 +02:00