1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-12-27 23:35:51 +00:00
Commit graph

370 commits

Author SHA1 Message Date
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
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
fgenesis
af30e508f5 Another correction, the prev. patch used the keyboard layout code, not country code.
Misnamed APIs are awful.
2012-06-02 23:06:53 +02:00
fgenesis
b71dc80516 Correct OSX locale detection.
(For me this returns en_de, not sure why, but i can see some german strings
in my OSX installation here and there so this might be feasible.)

Also fix typo in Network.cpp.
2012-06-02 22:33:45 +02:00
fgenesis
1f3e472551 Attempt to fix locale detection on OSX. By Henrik Holst. 2012-06-02 19:05:44 +02:00
fgenesis
a420aa4f70 Missing graphics for new mod selector 2012-06-02 18:58:52 +02:00
fgenesis
b5518c28cd Move hardcoded UI strings to stringbank.txt. Patch by Henrik Holst. 2012-06-02 18:58:02 +02:00
fgenesis
cd18ef2a43 Small fix for non-MSVC 2012-06-01 18:43:41 +00:00
fgenesis
b30d124d50 vcproj update 2012-06-01 18:05:06 +02:00
fgenesis
1d4eb5533e Worked around "set global function xx" warnings in jukebox mod + fixed long comment ends. 2012-06-01 17:53:21 +02:00
fgenesis
6dc1c1e8d1 [vfs, #3] All file reading code goes through the VFS now, new mod downloader & mod selector in place. Also a bunch of other stuff. (...)
- HTTP networking support, mods can be downloaded via the builtin downloader.
  All network activity runs in a seperate thread, which is started
  as soon as any network activity is requested.
- The master server is hard-coded to fg.wzff.de/aqmods/ if not specified otherwise;
  this setting can be overridden in the config file.
- The mod selector screen is now a grid-view for much better navigation;
  also works with joystick.
- VFS code is functionally similar to the old molebox-packed release
  for win32. The game could also have its data shipped in a Zip file
  or any other kind of archive.
- It is still possible to build without VFS support, but then the mod
  downloader and soft-patching will not be available.

The full commit history can be found here:
https://github.com/fgenesis/Aquaria_clean/compare/master...vfs

The most important commit messages follow:
[...]
    This replaces all std::ifstream with InStream, and fopen(), ... with vfopen(), ...
    Some code is #ifdef'd for better performance and less memory-copying.
    VFILE is defined to whatever type of file is in use:
    - FILE if BBGE_BUILD_VFS is not defined
    - tttvfs::VFSFile if it is.

    Other changes:
    - [un]packFile() is now unused and obsolete. That code has not been adjusted to use VFILE.
    - glpng can now load from a memory buffer.
    - TinyXML uses the VFS for reading operations now.
    - The rather clunky binary stream loading of glfont2 got replaced with ByteBuffer,
      which gets its data in one block (necessary to use the VFS without implementing
      a somewhat STL-compliant std::ifstream replacement.)
-------------
Implement loading mods from zip files.
-------------
Implement soft-patching game data files. (Replacing textures/audio/... on the fly)
-------------
Misc bits:
- Extended GUI focus handling a bit
- Fixed weirdness in texture loading... not sure but this seems more correct to me.
  Actually, considering that the texture will have its native size after restarting the game,
  the lines removed with this commit seem pretty useless.
2012-06-01 17:52:19 +02:00
fgenesis
1709503344 [vfs, #2] Move around some files (cleanup only) 2012-06-01 17:26:13 +02:00