mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-15 05:59:16 +00:00
Code Issues Releases Wiki Activity
593 commits 9 branches 3 tags 31 MiB
Commit graph

593 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
fgenesis
236096683a Clear animLayers properly 2015-06-03 04:04:19 +02:00
fgenesis
778a275ce2 RenderObject::updateCull is now float, some Lua additions 
- add obj_getUpdateCull()
- add obs parameter to getWallNormal(x, y, dist, obs) to control which obs to consider
- add getPerformanceCounter(), getPerformanceFreq()
 2015-06-03 04:04:03 +02:00
fgenesis
f0d580d873 Refactor texture loading code; should fix a crash that started appearing recently. 2015-03-24 00:06:51 +01:00
fgenesis
66cf20ffa9 Allow loading eats.txt from mods 
Thx Daxar for pointing out this was forgotten.
 2015-03-16 03:48:20 +01:00
fgenesis
9973afbac6 Allow custom capes in mods 2015-03-09 04:55:03 +01:00
fgenesis
b70de7f94b Add Lua function text_getStringWidth() 2015-03-08 20:44:14 +01:00
fgenesis
dee156cf7a Remove some unnecessary code from StateMachine 2015-03-08 20:44:14 +01:00
fgenesis
db2faf026c Merge branch 'experimental' of github.com:fgenesis/Aquaria_clean into experimental 2015-01-28 01:31:22 +00:00
fgenesis
2ddaa0d100 linking against openalsoft; system AL isn't necessary anymore iirc 2015-01-28 01:28:39 +00:00
fgenesis
220c8f1c08 add Lua function: setBGGradient() 2015-01-28 02:21:48 +01:00
fgenesis
2612b6e251 tiny cleanup 2015-01-28 01:45:52 +01:00
fgenesis
f54d341242 Allow obj_addChild() to specify front or back order 2015-01-14 21:49:04 +01:00
fgenesis
4b32c4364f Allow interactive parallax layer elements 2015-01-14 21:48:37 +01:00
fgenesis
ba9c37f704 Make RenderObject::moveTo[Front|Back]() work for things that have a parent. 2015-01-14 21:42:54 +01:00
fgenesis
0fdc0e8acc Delete spinycrab glow on death. Fixes #16. 2015-01-14 21:40:54 +01:00
fgenesis
b4906a3840 Fix possible dangling pointer / crash in predatorytunicate script 2014-12-29 00:36:00 +01:00
fgenesis
aab0dad1cb Allow Shift+G to increase game time 10x 2014-09-17 05:11:26 +02:00
fgenesis
15379db4b8 Fix possible crash when saving animation to non-existing file + loading malformed XML from skin file. 
Also fix skeletal cache memory leak.
 2014-09-16 00:29:57 +02:00
fgenesis
26dc8560b7 Fix gcc compile (broke in 300f326777) 2014-09-15 20:59:21 +02:00
fgenesis
d82553d6a7 Fixes to element interaction. 
It now works with multiple entities doing interaction, and the correct
update list is used, which should save a bit more CPU.
 2014-09-13 16:33:32 +02:00
fgenesis
e8ff469205 Revert "Fix crash when adding a gem in entity init()", broke world map. 
This reverts commit 17b8cd2079.
 2014-08-15 21:18:43 +02:00
fgenesis
07807bfa36 Minor SDL lib file update for win32. Add isShot() Lua function that was forgotten. 2014-08-15 20:29:22 +02:00
fgenesis
e03e2ad3b7 Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental 2014-07-21 21:29:57 +01:00
fgenesis
70e175c8d6 Merge branch 'experimental' of github.com:AquariaOSE/Aquaria into experimental 2014-07-21 22:22:30 +02:00
fgenesis
300f326777 Use std::vector instead of std::list for RenderObject children 2014-07-21 22:21:22 +02:00
fgenesis
35c8086802 Some changed to pathfinding. This hopefully gets rid of spikes in very short paths. Some untested changes. 2014-07-21 22:20:08 +02:00
C.W. Betts
bc260fa581 OS X: Fix a memory overrelease. 
CoreFoundation functions that have "Get" in their names usually don't need to be released.
 2014-06-27 14:48:24 -06:00
fgenesis
2ad27b63de Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental 2014-06-22 23:41:43 +01:00