1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-12-26 14:45:48 +00:00
Commit graph

346 commits

Author SHA1 Message Date
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
fgenesis
a90f57afb0 [vfs #1] Add ttvfs, miniz, and minihttp sources 2012-06-01 17:23:19 +02:00
fgenesis
99e3f5ebe2 Fix possible crash on OSX introduced with localisation patch 2012-05-27 16:56:36 +02:00
fgenesis
c02ea1ce83 Re-implement (optionally) pre-decoding audio to reduce disk seek/decoding time.
This was removed in HG changeset 7ec478d993b7, and is now implemented
in a way that is better than before: voice overs and music
no longer cause decoding lag, as they are always decoded on-the-fly.
The additional memory use (~40 MB) should be no problem for anyone.
The default is still to decode everything on the fly.
2012-05-27 04:46:36 +02:00
fgenesis
fdce574cc5 More filename case fixes for linux (skeletal + skin) 2012-05-25 18:23:30 +02:00
fgenesis
77c9b86235 vcproj update 2012-05-25 17:39:07 +02:00
fgenesis
f953f2b5ab Do all sound decoding in *one* background thread, instead of one thread per decoder. 2012-05-25 17:38:59 +02:00
fgenesis
6ffb668668 Improve Lua-related warning messages - show call stack 2012-05-23 01:16:14 +02:00
fgenesis
2278e55d0c Multi-language patch by Henrik Holst 2012-05-21 04:05:44 +02:00
fgenesis
0fbd5d81ae Don't use internal zlib headers.
Thanks Henrik Holst for pointing.
2012-05-21 03:43:15 +02:00
fgenesis
faf4023b5d Fix subtitles not appearing when starting a new game.
The problem originally appeared in changeset 203af0d613b4.
2012-05-21 03:35:20 +02:00
fgenesis
da15c7424e Fix compile for gcc 2012-05-19 00:41:31 +00:00
fgenesis
c03c43c291 Merge branch 'master' of /home/fg/fgone/Aquaria_fg_clean 2012-05-19 00:17:31 +00:00
fgenesis
05af5dfe21 Replace magic animlayer numbers with an enum (cosmetical change only) 2012-05-14 15:48:01 +02:00
fgenesis
a8c951672b Add a few functions to ScriptInterface 2012-05-14 15:46:29 +02:00
fgenesis
1350876b3d Restore & correct collision radius rendering. Enabled toggling the debug console on Mac.
Collision rendering is now mapped to Ctrl+Shift+Return instead of capslock.
Also fixed one float->int truncation in script interface,
and removed useless debug message when particle effect "" was supposed
to be spawned (but does never exist).
2012-05-05 17:00:46 +02:00
fgenesis
5cef84ad9d Fix some oversights in the animation editor that wrongly occured during text input. 2012-05-05 16:53:53 +02:00
fgenesis
8b80af432a MSVC9 project files + missed icon & rc file 2012-04-15 15:20:48 +02:00
fgenesis
1a20ff5d59 Compile fix for win32/MSVC that creeped up for some reason 2012-04-06 20:57:26 +02:00
fgenesis
fc7fa440da Fix currents not displaying correctly after resolution change. 2012-04-01 21:24:31 +02:00
fgenesis
83dbb7e310 minor things, added entity_loadSkin function 2012-04-01 18:14:02 +02:00
fgenesis
3fb9e41349 Merge branch 'master' of /home/fg/fgone/Aquaria_fg_clean 2012-03-17 17:50:20 +00:00
fgenesis
e94de627eb Really fix variadic calls (including self). Also fix avatar_setPullTarget() failing because entities are userdata now.
This does now allow constructs like this, in an entity script:

  function msg(me, a)
      if a > 1 then
          a = a * entity_msg(me, a - 1)
      end
      return a
  end

So that entity_msg(thing, 5) == 120 is true.
2012-03-14 20:11:14 +01:00
fgenesis
0cdbc66c02 Minor script fixes
- Bigmouth & Grabbyarm will no longer spam "entity invalid pointer"
- Make Huggys follow through local warps (thx to Andrew Church for this)
2012-03-14 01:00:46 +01:00
fgenesis
273b608214 Misc fixes and cleanups; fixed variadic Lua calls to self.
Script interface:
- entity_msg() will no longer corrupt the Lua stack if sending messages to itself.
- added more info to non-critical Lua errors ("attempt to call a nil value", etc)
- replaced many lua_tostring() with getString(), which does never return NULL.
  This prevents possible crashes when a non-string parameter is passed to functions
  expecting a string.

Misc:
- Removed classes BoxElement, DFSprite, Datafile, and related references.
  They were essentially unused.
- Removed unused Element class member variables.
- Show more lines in the in-game console.
2012-03-14 00:58:59 +01:00