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

621 commits

This branch
This branch
All branches
Author SHA1 Message Date
fgenesis
ce7239056b Minimap icon overhaul: 
- Allow specifying custom minimap icons for nodes and entities
- Allow overriding minimap textures
- This removes various hacks in MiniMapRender and related
- Allow access to the MiniMapRender object via Lua
  (don't delete it or the game will crash)

Little extra: Added destructors for some entity classes
 2016-03-21 03:40:56 +01:00
fgenesis
9e0d59460a Add getInterfaceFunctionNames(), isObstructedRaw(), OT_OUTOFBOUNDS 2016-03-20 19:19:21 +01:00
fgenesis
36f33da9a8 Remove some old, unused code 2016-03-20 19:14:48 +01:00
fgenesis
e661743775 Be less spammy when loading textures 
Oonly print "FROM DISK" when it was really from disk, and not retrieved from cache
 2016-03-15 03:38:01 +01:00
fgenesis
65e2bd83b2 Implement setSceneDisplayNameInSave() Lua function. 
This allows to specify pretty map names to be shown in save slots for mods.
 2016-03-15 02:19:39 +01:00
fgenesis
abc35b4c9d Fix save slot index confusion in dev mode. + tiny cleanup. 2016-03-13 02:50:43 +01:00
fgenesis
4585bb19ca Merge branch 'experimental' of github.com:AquariaOSE/Aquaria into experimental 2016-03-13 01:37:56 +01:00
fgenesis
62c949f640 Fix rare texture loading problems introduced in 8bd40be8aa and f0d580d873. 2016-03-13 01:37:43 +01:00
fgenesis
77c7aed8a0 Merge branch 'master' into experimental 2016-02-15 17:17:59 +01:00
fgenesis
6971e7898f Always respect AQUARIA_EXTRA_DATA_DIR define. Thx smls. 2016-02-15 17:17:18 +01:00
fgenesis
198f0353d5 Fix typo in entity_getBoneByInternalId(), add obj_getBlendType() 2016-01-10 23:49:11 +01:00
fgenesis
f55a70b459 Give script-spawned entities a negative ID. 
This should prevent most ID conflicts and problems related to that,
e.g. spurious changes to entity positions while working on a map.
 2015-11-29 21:43:21 +01:00
fgenesis
d8da8576e8 Fix moveToBack/moveToFront when used on objects that have a parent 2015-11-28 23:42:39 +01:00
fgenesis
ed089f38f7 Add two more font/text related Lua functions, and some more: 
+ entity_getBoneByInternalId()
+ entity_getNumBones()
+ text_getLineHeight()
+ text_getNumLines()
 2015-11-16 03:59:47 +01:00
fgenesis
3ebf99acfa Fix msvc2008 project files 2015-11-11 23:28:23 +01:00
fgenesis
4cc21619d4 Little int->float conversion 2015-11-11 23:28:10 +01:00
fgenesis
26549f84b7 Fix font bounds calculation 
BitmapFont::getActualWidth() is still a bit less than getStringWidth(),
but won't fix that now since it shouldn't cause any issues... hopefully.
 2015-11-11 23:27:32 +01:00
fgenesis
d41375d5d2 Remove unmaintained VS2010 project files 2015-09-30 23:58:07 +02:00
fgenesis
fd2d076052 Fix vcproj 2015-09-30 23:57:22 +02:00
False.Genesis
b1e3cfbcba Merge pull request #19 from jbeich/glm095 
Unbreak build with glm-0.9.5
 2015-09-30 23:24:16 +02:00
False.Genesis
aa7afa1b00 Merge pull request #20 from jbeich/system-ftgl 
Allow using system FTGL
 2015-09-30 23:23:26 +02:00
False.Genesis
2d6a0ee2f2 Merge pull request #22 from jbeich/cmake-misc 
Minor cmake fixes
 2015-09-30 23:22:14 +02:00
False.Genesis
26ab331ef7 Merge pull request #21 from jbeich/freebsd 
Unbreak build on FreeBSD
 2015-09-30 23:19:29 +02:00
Jan Beich
74d95c7ee8 build: make -Wno-invalid-offsetof more specific 2015-09-18 08:26:39 +03:00
Jan Beich
2a31f932f9 build: add -DNDEBUG for Clang builds 2015-09-18 08:26:38 +03:00
Jan Beich
451d27a1d5 build: make tinyxml2 export multiple include dirs like advertised 2015-09-18 08:26:38 +03:00
Jan Beich
a888a44623 build: drop redundant check for bundled tinyxml2 2015-09-18 08:26:38 +03:00
Jan Beich
3bcbc30697 build: tinyxml2 needs module path set (like sdl2) 2015-09-18 08:25:59 +03:00
Jan Beich
d1654506d6 minihttp: include netinet/in.h for sockaddr_in 2015-09-18 04:28:16 +00:00
Jan Beich
5e64e66714 build: add option to use system FTGL 2015-09-18 07:17:17 +03:00
Jan Beich
b0a144c858 BBGE: use vector glm functions 
glm-0.9.5 removed scalar rotate() and translate()
 2015-09-17 21:43:31 +00:00
fgenesis
b86133f3e9 Merge branch 'master' of github.com:AquariaOSE/Aquaria 2015-08-16 15:19:19 +02:00
fgenesis
b320739684 Avoid sending an action multiple times in a row 2015-08-16 02:24:14 +02:00
fgenesis
9285ce49bd Make world map respect SeeMapMode (like the minimap already does) 
This makes the show or hide map status consistent for both map and minimap.
 2015-08-15 21:16:48 +02:00
fgenesis
e8dc99b30d Add script functions: 
+ createArialTextBig()
+ createArialTextSmall()
+ quad_getTexOffset()
+ quad_setTexOffset()
 2015-08-15 21:15:42 +02:00
fgenesis
03f47b0480 Add Lua functions: 
+ getModName()
+ getModPath()
And fileExists() returns the normalized file name as 2nd result now.
 2015-08-03 20:34:31 +02:00
fgenesis
5410028906 Constify some things, no functional changes 2015-08-03 20:33:22 +02:00
fgenesis
20ee050c7b Fix build with SDL1.2 that i accidentally broke 2015-08-03 20:32:41 +02:00
fgenesis
9faa503f32 Use glm for matrix math instead of the OpenGL stack 
Should cause less GL pipeline stalling / driver spinlocking if enabled.
Disable AQUARIA_USE_GLM (default: true) in CMake to use the old GL pipeline version.

Based on the implementation by Matt Bierner:
https://bitbucket.org/mattbierner/ios-aquaria
 2015-07-12 22:16:55 +02:00
fgenesis
c4b531ed5e Add glm 0.9.2 2015-07-12 22:07:27 +02:00
fgenesis
21545e1a24 Show refresh rate in resolution selector 2015-07-12 20:25:46 +02:00
fgenesis
e285c26e05 Add world map gem Lua functions: 
setGemName() to change texture
setGemBlink() to allow blinking other gems than only the first added one
 2015-07-09 01:12:52 +02:00
fgenesis
af1b831c85 attempt to fix sounds from zip files not loading properly 2015-07-07 01:16:59 +02:00
fgenesis
43a4f60ab1 Little fix to world map partial reveal method coloring. 
Bug has gone unnoticed until now.
 2015-07-05 22:31:59 +02:00
fgenesis
eb56a93200 Add node_setActivationRange() 2015-06-28 18:55:35 +02:00
fgenesis
f6fc75a165 Add isSkippingCutscene() Lua function 2015-06-22 23:58:07 +02:00
fgenesis
209964034d Make maxSpeed float, little cleanup, minor Lua API stuff 
Plus additional functions that don't use speed types:
+ entity_followPathSpeed()
+ entity_moveToNodeSpeed()
+ entity_swimToNodeSpeed()
+ entity_swimToPositionSpeed()

The following old functions (plus all of the above) return float now
(how long moving will take):

* entity_followPath()
* entity_moveToNode()
* entity_swimToNode)
* entity_swimToPosition()
 2015-06-12 02:59:01 +02:00
fgenesis
8bd40be8aa Fix oversight in texture loading that could cause the cape to appear as white blorb. Thx Daxar. 2015-06-10 01:49:12 +02:00
fgenesis
1af3a580ed Minor Lua changes: 
+ node_setEmitter(name)
+ node_getEmitter()
* obj_setTexture() returns bool now
 2015-06-08 02:14:45 +02:00
fgenesis
b71c21a0b3 Clear skel cache in animation editor 2015-06-08 02:13:52 +02:00