fgenesis
8084a4c613
Fix loading stringbank.txt form a mod when loading a saved game, and load treasures.txt from mods if it exists.
2012-07-13 16:10:07 +02:00
fgenesis
aeb96ca2dd
Fix russian font display & font size calculation (my bad, thx Henrik)
2012-07-13 16:03:21 +02:00
fgenesis
319b9d09ed
Fix regression that prevented few textures from loading (Labyrinth mod icon, for example)
2012-07-12 03:46:18 +00:00
fgenesis
93892ff46a
Merge branch 'master' of /home/fg/fgone/Aquaria_fg_clean
2012-07-12 02:43:13 +00:00
fgenesis
78e35ca5c9
Merge branch 'master' of file:///Users/User/code/coding/Aquaria_fg_clean
2012-07-12 01:32:35 +01:00
fgenesis
918c69d15b
Some simplifications in ingredient name handling, by Henrik Holst
2012-07-11 22:00:14 +02:00
fgenesis
2565ee074a
Merge branch 'master' of /home/fg/fgone/Aquaria_fg_clean
2012-07-11 16:20:27 +00:00
fgenesis
0caed714fb
Forgot CMake update
2012-07-11 16:19:22 +02:00
fgenesis
345ff6063b
Fix locale related oversights
2012-07-11 04:50:19 +02:00
fgenesis
459a41e1f6
Fix loading world map data when loading a mod's saved game
2012-07-11 04:42:53 +02:00
fgenesis
84c49e5ce0
Fix wrongly adding shield song when loading a savegame. Also add obj_getTexture() function.
2012-07-10 22:50:31 +02:00
fgenesis
37654f4c8c
vcproj update. This enables fast SSE2 float math.
2012-07-10 22:25:12 +02:00
fgenesis
500355019d
More russian data files.
...
The .glf file is based on the original russian file, but binary-patched
so that the game can load it without special hacks messing with
texture coordinates, which would break loading the original english glf file.
2012-07-10 22:22:05 +02:00
fgenesis
24b08b1043
Hackish fix to load glf files even if corrupt (this is required or the next commit...)
2012-07-10 22:18:21 +02:00
fgenesis
7b2fa39428
Move localisation code to BBGE, and allow textures to be localised.
2012-07-10 22:16:48 +02:00
fgenesis
b22ceb2aa0
Fix a problem that prevented loading a saved game of a mod in a zip file, which occured when no patches were loaded.
2012-06-30 00:58:06 +02:00
fgenesis
b4e1f91217
Merge branch 'master' of /home/fg/fgone/Aquaria_fg_clean
2012-06-27 22:12:15 +00:00
fgenesis
e09a4c13ef
Merge branch 'master' of /home/fg/fgone/Aquaria_fg_clean
2012-06-27 21:59:09 +00:00
fgenesis
ad0eff411c
Fix typo in icecunk script, thx Red Skull
2012-06-27 23:46:23 +02:00
fgenesis
7e1c32a99c
gcc 4.7 again... thx Red Skull
2012-06-27 22:15:55 +02:00
fgenesis
9f244e90b2
Little correction to last patch - really override entity_delete().
2012-06-27 22:11:30 +02:00
fgenesis
dff86833ef
Fix regression from "Script interface improvements & extensions."
...
This caused a crash due to an already freed point in Avatar.cpp pull target update.
Thanks to Red Skull for reporting.
2012-06-27 21:57:10 +02:00
fgenesis
38501dca35
Some fixes to make the ever-complaining gcc 4.7 happy (hopefully)
2012-06-27 21:51:54 +02:00
fgenesis
86bcecf5d2
Improved russian ingredients translation, thx KS-10!
2012-06-19 16:22:46 +02:00
fgenesis
283fc0086e
Minor changes; based on russian opensource patch.
2012-06-19 02:29:14 +02:00
fgenesis
c7d7e6126f
Some russian locale files for testing. Stringbank is incomplete.
2012-06-19 02:18:22 +02:00
fgenesis
5d871383f6
Forgot one file
2012-06-19 02:16:24 +02:00
fgenesis
e924a164c9
Also load localized font files
2012-06-18 18:54:56 +02:00
fgenesis
98c5cefed7
Ingredient name localisation somewhat works, not fully tested yet
2012-06-18 18:54:41 +02:00
fgenesis
a55cbb64b8
More happy build fixing (gcc 4.7 again)
2012-06-18 14:08:21 +02:00
fgenesis
5329a9e6e3
Moar linux build fixing
2012-06-17 03:41:53 +02:00
fgenesis
d526b6c193
Fix build with gcc 4.7, thx vincent/mirandir
2012-06-17 03:37:37 +02:00
fgenesis
513407671f
Merge branch 'master' of /home/fg/fgone/Aquaria_fg_clean
2012-06-15 18:11:26 +00:00
fgenesis
6bd5caf4fa
Little stringbank localization improvement
2012-06-15 18:29:17 +02:00
fgenesis
b719b8fd60
Removed textureMemoryMultiplier again; a bit more debug output for differing texture sizes
2012-06-15 17:58:18 +02:00
fgenesis
e5b0a81bea
Merge branch 'master' of /home/fg/fgone/Aquaria_fg_clean
2012-06-15 04:24:23 +00:00
fgenesis
82888471bb
Merge branch 'master' of /home/fg/fgone/Aquaria_fg_clean
2012-06-15 04:19:58 +00:00
fgenesis
c7456efd55
Merge branch 'master' of /home/fg/fgone/Aquaria_fg_clean
2012-06-15 04:14:09 +00:00
fgenesis
0ea9ba0770
oops, very stupid thing i made there.
2012-06-15 04:23:22 +02:00
fgenesis
a5b5da6f4b
gcc complaining...
2012-06-15 04:19:03 +02:00
fgenesis
063b1c0dfc
Moved most uses of glGetTexImage() into a single function with better error checking.
...
Also small config addition to optionally increase memory allocation size
for temporary texture pixel data; the nouveau drivers seem notoriously
awkward and keep writing over the buffer.
2012-06-15 04:12:20 +02:00
fgenesis
bfe7742965
Merge branch 'master' of /home/fg/fgone/Aquaria_fg_clean
2012-06-14 19:07:01 +00:00
fgenesis
488ec5a1bf
Merge branch 'master' of file:///Users/User/code/coding/Aquaria_fg_clean
2012-06-14 18:16:39 +01:00
fgenesis
8142376bbf
Merge branch 'master' of file:///Users/User/code/coding/Aquaria_fg_clean
...
Conflicts:
Aquaria/UserSettings.cpp
2012-06-14 18:16:31 +01:00
fgenesis
5b7757530f
More linux file name case issues...
2012-06-14 19:06:06 +02:00
fgenesis
647832ed5b
More linux file name case issues...
2012-06-14 18:55:30 +02:00
fgenesis
8f2279e28a
Fix problems with loading saves after saving over them.
...
This was caused by the VFS caching file sizes,
and not noticing that the file size had changed,
which confused zlib because the data stream ended too early.
2012-06-14 17:54:40 +02:00
fgenesis
6d92cd24c8
Fixed more weirdness in functions using glGetTexImage(), add proper bounds checking
2012-06-14 17:40:01 +02:00
fgenesis
a6fc88d885
Two little localzation patch additions, by Henrik Holst.
2012-06-13 23:37:21 +02:00
fgenesis
67bdd77a9f
Attempting to fix weirdness from a bug report (thx!).
...
This might speed up obstruction calculation a bit.
Also fixed crash when attempting to autosave on an invalid map.
2012-06-13 23:28:24 +02:00
