1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-01-25 01:36:38 +00:00
Commit graph

630 commits

Author SHA1 Message Date
Louis M
42c877f714 Fix WinMain conflicting with SDL_main 2024-06-10 14:14:38 -04:00
Louis M
ab3ee7de4f Windres... or what we have to do to have an executable icon 2024-06-10 14:01:59 -04:00
Louis M
8f303c4d44 Another fix for windres 2024-06-10 13:52:30 -04:00
Louis M
ec511b5fd7 Fix windres error in Windows MSYS2 compilation 2024-06-10 13:39:51 -04:00
Louis M
9097df9ea1 Adding a default usersettings.xml for Linux packaging 2024-06-10 13:15:48 -04:00
Louis M
0057ced4a0 MSYS2 compatibility 2024-06-10 13:13:49 -04:00
Louis M
bdddd3227b Adding Github workflow 2024-06-10 13:03:01 -04:00
Louis M
60a887a7f9 Github workflow and Windows build using MSYS2 2024-06-10 12:59:07 -04:00
Louis M
871b37906b Modification in concordance with commit 91bd6ae 2024-02-28 13:53:39 -05:00
Louis M
91bd6ae022 Fix Segmentation fault at shutdown 2024-02-28 13:32:08 -05:00
Louis M
91bc885991 Remove texture reutilisation when the texture loading failed. 2024-02-26 10:43:41 -05:00
False.Genesis
23b2d94450
Merge pull request #85 from NickoLabs/patch-fr
Sending the 2009 French translated version

Credits from commit comments:

Dialogues
Numenorian
OliverTrets
Stalfos (that's me)

Menus and images
Butt3rs

Descriptions and other
Butt3rs
Xqua
Yoda13

Proofreading and correction
Achigankiller
Aodhan
Butt3rs
Numenorian
Yoda13

Help and support
Argone
Centor
guinours
Heretwix
Irtsenar
Limestraël
Narjhan
Serapheos
Snowstorm
2024-01-01 19:45:50 +01:00
Nickolas Simard
b9b22a7358
Sending the 2009 French translated version 2023-12-29 15:11:42 -05:00
Kreeblah
7377ea0a09
Fixed SDL2 and OpenAL references (#78)
* Fixed SDL2 and OpenAL references

* Revert OpenAL changes
2022-03-30 22:53:23 +02:00
False.Genesis
c37f6ea6d8
Merge pull request #63 from pelupessy/master
Minor fixes
2020-07-06 15:42:07 +02:00
pelupessy
470a89510d
Update SceneEditor.cpp
Use of operand of type #bool# in #operator++# is depreciated.
2020-07-06 17:03:34 +09:00
pelupessy
2f55036986
Update ScriptInterface.cpp
Required space between literal and string macro added.
2020-07-06 16:37:47 +09:00
fgenesis
021512337e fix build on RPi4 (and probably newer gcc), thx pelupessy
Close #62
2020-07-04 18:13:48 +02:00
fgenesis
84366ad533 hopefully fix build on gcc6, tiny cleanup
... in fact i forgot that much more cleanup was already done
on the experimental branch. whatever.
2016-06-20 01:56:27 +02:00
fgenesis
96206dd82a Fix yet another oopsie RenderObject::setTexture()
Didn't apply empty ("") texture when another texture was already set.
2016-06-19 00:42:13 +02:00
fgenesis
6971e7898f Always respect AQUARIA_EXTRA_DATA_DIR define. Thx smls. 2016-02-15 17:17:18 +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