Commit Graph

1467 Commits

Author SHA1 Message Date
Allanis
4e572b704c [Add] Created lstd for portable SDLKey isalpha functions and such. 2014-05-24 21:19:28 +01:00
Allanis
4f93b615a4 Merge branch 'Here' into dev 2014-05-24 14:47:12 +01:00
Allanis
5513a991a5 [Fix] Oops, I completely failed to get the input widgets. 2014-05-24 14:46:55 +01:00
Allanis
e761bb52e1 [Change] Limit the input widgets in a more sane compatible manner. 2014-05-24 14:35:32 +01:00
Allanis
21cfcbfb05 [Fix] Removed a warning. 2014-05-24 14:16:21 +01:00
Allanis
0064c2bf0b [Change] More stuff to work with SDL1.3 2014-05-24 12:30:58 +01:00
Allanis
fb3c093f02 [Add] Support SDL 1.3 as well as 1.2 right?! Who's going to tell me I should be using 2.0 already? 2014-05-23 23:49:15 +01:00
Allanis
81ae76236c [Add] I think I've been documenting this thing all day. D: 2014-05-23 23:05:30 +01:00
Allanis
5dc8a8f782 [Add] Have some more documentation. 2014-05-22 23:35:31 +01:00
Allanis
a3e781968b [Change] More doxygen stuff. 2014-05-22 22:22:29 +01:00
Allanis
3a13801a14 [Change] A ton of code cleanup. 2014-05-22 22:07:22 +01:00
Allanis
08a3fe6c9c [Change] Some code cleanup. 2014-05-22 20:43:46 +01:00
Allanis
5a84266a4f [Add] Added keybinding to cycle through secondary weapons backwards. 2014-05-22 20:35:23 +01:00
Allanis
23ec93cad4 [Change] Ensure version message doesn't get overlapped in small
resolutions.
2014-05-22 19:28:10 +01:00
Allanis
7c71ac5558 [Add] Friendly warning if ldata isn't found. 2014-05-22 19:08:58 +01:00
Allanis
7c77674d1f [Change] More work to improve accel sound handling when paused and
hyperspacing.
2014-05-22 18:51:27 +01:00
Allanis
a70a55982e [Change] Implemented pilot_copy a little better. 2014-05-22 18:48:36 +01:00
Allanis
f23b51e540 [Fix] Fixed memory leak. 2014-05-22 18:35:03 +01:00
Allanis
846cbd5e35 [Change] Slightly cleaner implementation of channel pause/resume. 2014-05-22 18:31:41 +01:00
Allanis
3182639db1 [Fix] Removed some warnings on SDL1.3 2014-05-22 18:22:06 +01:00
Allanis
d4d40f63ff [Change] Disabled the unable to play sound warnings to not scare people
on the last collective missions.
2014-05-22 15:02:12 +01:00
Allanis
b7cfc2bac2 [Fix] Fixed grep|sed screwup. 2014-05-22 14:35:22 +01:00
Allanis
a23d2c7810 [Change] Changes a TON of stuff in the Star System. 2014-05-22 01:55:10 +01:00
Allanis
fbc2cddac5 [Change] Pause engine sounds when pausing. 2014-05-21 21:34:42 +01:00
Allanis
7cb8dfd1f8 [Change] Don't abort autonav if damage is from volatile system. 2014-05-21 21:32:57 +01:00
Allanis
55a0cb0552 [Add] Dirty hack to make sure engine sounds stop when toolkit is open.
Proper fix will involve fixing SDL_mixer stuff.
2014-05-21 21:30:28 +01:00
Allanis
1b8467af22 [Change] Reset interference on player load/creation. 2014-05-21 20:10:29 +01:00
Allanis
ad43554177 [Fix] Fixed the thrust/afterburn sound getting stuck when landed. 2014-05-21 20:08:04 +01:00
Allanis
a8dd594369 [Add] Using confidence intervals now. 2014-05-21 17:24:30 +01:00
Allanis
40982ef496 Merge branch 'master' into dev 2014-05-21 16:34:38 +01:00
Allanis
fbc7169d21 [Change] Avoid a theoretical infinite loop plus a memleak in the map. 2014-05-21 16:34:10 +01:00
Allanis
13ce356566 [Change] AUTONAV will try to face away from the gravitational center if
too close.
2014-05-21 15:17:54 +01:00
Allanis
93930ad30b [Change] Use compression when saving. 2014-05-21 15:11:52 +01:00
Allanis
cce10777fb [Change] Make save files more readable (for better or worse). 2014-05-21 15:10:57 +01:00
Allanis
4fdda9b388 [Fix] Display FPS properly when game speed is accelerated. 2014-05-21 13:23:22 +01:00
Allanis
b75cf3d698 [Fix] Fixed Mace Rockets 2014-05-21 13:20:06 +01:00
Allanis
8c3836ce50 [Change] Mkay, escorts should properly hang if they have no target to
escort.
2014-05-21 00:23:41 +01:00
Allanis
ace738021f [Fix] Fixed escorts, I was keeping quiet about breaking them in the
first place.
2014-05-21 00:20:45 +01:00
Allanis
230329f868 [Change] Better handling of secondary weapons. 2014-05-21 00:09:43 +01:00
Allanis
8445d5a1ca [Fix] Mount y position is now properly in pixels. 2014-05-20 23:50:18 +01:00
Allanis
e52456d312 [Remove] Don't bother taking into account sprite size when creating
weapons. (It wasn't working anyway..)
2014-05-20 23:40:34 +01:00
Allanis
24379feab3 [Add] Take into account ship size for it's explosion. 2014-05-20 23:36:17 +01:00
Allanis
4254478ad0 [Add] Warn if ship has no mounts. 2014-05-20 23:31:07 +01:00
Allanis
8c5a419903 [Fix] Fixed the mounts offset due to the ortho projection. 2014-05-20 21:32:11 +01:00
Allanis
cc33574b5e [Change] Improve key handling to avoid situations where pilot gets
"blocked".
2014-05-20 21:28:59 +01:00
Allanis
22ebaef033 [Change] Made setSecondary static for minor optimization. 2014-05-20 15:50:49 +01:00
Allanis
3d85fa67f6 [Change] Fater comparison in rmOutfit. 2014-05-20 15:46:07 +01:00
Allanis
d06e4a6383 [Add] Take into account outfit sprite size when creating outfit. 2014-05-20 15:39:00 +01:00
Allanis
5e34b27baa [Add] rmOutfits should be mount aware. 2014-05-20 15:04:15 +01:00
Allanis
b689102f75 [Change] Lower faction loss for beams, no longer insta-hostile. 2014-05-20 14:56:43 +01:00
Allanis
cf4a4926d7 [Add] Missiles blow up when jammer destroys them. 2014-05-20 14:53:35 +01:00
Allanis
a597110019 [Remove] Removed some more @fn doxygen lines. 2014-05-20 14:46:33 +01:00
Allanis
5a714940f8 [Fix] Fixed minor memory leak. 2014-05-20 14:45:07 +01:00
Allanis
5429ed970d [Add] Mountpoints for turrets implemented. 2014-05-20 14:23:16 +01:00
Allanis
252f2f87b7 [Fix] Avoid possible out of bounds memory access. 2014-05-19 19:54:12 +01:00
Allanis
f1cc928709 [Add] Ammunition can now have accuracy (missiles etc..)
[Fix] Fixed a typo in weapon system.
[Add] New outfit.
2014-05-19 19:03:39 +01:00
Allanis
7534040724 [Change] Should only rumble when hit by the explosion of a ship. 2014-05-19 18:34:33 +01:00
Allanis
ea08de1644 [Change] Explicitly set NAV target at end of route to none. 2014-05-19 18:31:55 +01:00
Allanis
4f22f63f86 [Change] Bring a little order to the missions. 2014-05-19 18:29:59 +01:00
Allanis
6548b6fd9c [Change] Balance stack after conditional expression. 2014-05-19 18:04:11 +01:00
Allanis
ce39edb11d [Add] Slight additions to documentation system. 2014-05-19 17:21:04 +01:00
Allanis
6500acabfb [Change] Use luaL_error for the LLUA_* warnings. 2014-05-18 21:31:47 +01:00
Allanis
ea6db68433 [Add] No longer need Makefile when working in 'trunk', reads from
directories directly.
[Change] Code clean up.
[Add] Documentation.
2014-05-18 19:54:36 +01:00
Allanis
cbe4680de8 [Add] New mission - Help out some scientists deploy a probe. 2014-05-18 16:22:25 +01:00
Allanis
d0d02502ea [Change] Never try to create a screen aboe the players resolution unless
she forces it to.
2014-05-17 14:45:11 +01:00
Allanis
0da68c2c36 [Fix] Should fix possible segfaults. 2014-05-17 14:34:00 +01:00
Allanis
0121c6ac9d [Add] Added __tostring metatable functions. 2014-05-17 14:29:57 +01:00
Allanis
00384adf7b [Fix] More Lua stack balancing. 2014-05-17 14:25:55 +01:00
Allanis
04ed5fe1bc [Fix] Fixed some Lua stack unbalanced issues. 2014-05-17 14:21:45 +01:00
Allanis
970dd36c4f [Change] Tweaked interferance and lowered fire rate on seeker/headhunter
launchers.
2014-05-17 13:53:23 +01:00
Allanis
4aaed824c8 [Add] Updated beam graphics that use the wavy beam system implented a
while back.
2014-05-17 13:34:49 +01:00
Allanis
8f579ba9ac [Fix] Fixed segfault in volatile nebulae. 2014-05-17 13:15:08 +01:00
Allanis
31ec890d3e [Change] Tweaked the rumble system a little. 2014-05-17 13:11:11 +01:00
Allanis
3232d35cfe [Add] DEBUG_PARANOID should abort on Lua DEBUG statements. 2014-05-17 13:02:24 +01:00
Allanis
599e1c9860 [Fix] Should fix more issues with small resolution scaling. 2014-05-17 12:53:50 +01:00
Allanis
c9a79abac8 [Fix] Stupid typo broke saving. 2014-05-17 12:18:36 +01:00
Allanis
a2fd2e866a [Change] Lowered the velocity of the rumble. 2014-05-17 11:44:46 +01:00
Allanis
dc0ecd40ae [Change] A little cleanup and optimization. 2014-05-17 11:32:19 +01:00
Allanis
1abb2c117d [Add] Added flags to image creation to control transparency mapping.
Should speed up the loading and reduce memory usage.
2014-05-17 11:19:15 +01:00
Allanis
a14034411e [Fix] Fixed some issues introduced with the scaling. 2014-05-16 19:19:45 +01:00
Allanis
6758fd9393 [Add] Documented opengl file, explained coordinate system in use. 2014-05-16 14:44:21 +01:00
Allanis
090d9535c4 [Change] Code cleanup. 2014-05-16 12:05:31 +01:00
Allanis
d736e9a6a1 [Fix] Fixed fuckeries in last commit. Documented a bit more too. 2014-05-14 21:28:23 +01:00
Allanis
b75ec61d10 [Add] Scale window when size is too small so not to have stuff cut out. 2014-05-14 21:02:59 +01:00
Allanis
11c24c2d7b [Fix] Incorrect check. 2014-05-14 20:53:31 +01:00
Allanis
b4487e9af8 [Fix] Fixed up some old documentation. 2014-05-14 20:50:03 +01:00
Allanis
d8fd4383b4 [Add] More work on documentation. 2014-05-14 16:24:51 +01:00
Allanis
1f9768ccd6 [Add] Hey, someone has to document this stuff.. 2014-05-12 14:08:42 +01:00
Allanis
8bebc4fbbc [Changed] Cleaned up a bunch of doxygen stuff. 2014-05-10 17:56:50 +01:00
Allanis
871c5c89e5 [Change] Removed all "improper" usage of strcat/strncat. 2014-05-03 17:16:42 +01:00
Allanis
06891d765d [Add] Propperly finished adding interference. 2014-05-02 23:31:17 +01:00
Allanis
389f818844 [Change] Some more doxygen changes. 2014-05-02 22:06:52 +01:00
Allanis
b1b3cf1608 [Add] Added a nice little luadoc generation script. 2014-05-01 19:48:59 +01:00
Allanis
d6b0ab0e16 [Add] Gave plasma weapons their own special effect. 2014-04-29 17:19:01 +01:00
Allanis
e39e091425 [Fix] Weapons should work when player is dead. 2014-04-28 16:57:22 +01:00
Allanis
bd21f99e7d [Fix] Fixed some keys that should have been KMOD_ALL 2014-04-28 15:51:34 +01:00
Allanis
c450b11125 [Add] Added shield hit effects.
[Fix] Fixed Makefile, cleans lua libs properly, and corrected typo
preventing lua from building.
2014-04-28 15:45:29 +01:00
Allanis
96a38a1f60 [Fix] Error on file not found in pack_openFromCache. 2014-04-27 16:15:55 +01:00
Allanis
c7f9fd3a79 [Fix] Fixed some memory leaks. 2014-04-27 14:42:52 +01:00
Allanis
44db60f32b [Add] Using the pack cache now, initial loading is a lot faster. 2014-04-27 14:31:21 +01:00
Allanis
ba26575890 [Add] Started to work on cacheing the packfile. 2014-04-26 19:47:10 +01:00
Allanis
22b3f2085e Merge branch 'dev' 2014-04-26 18:54:08 +01:00
Allanis
05398e71d2 [Change] Huge changes to Lephisto's data management. 2014-04-26 18:53:22 +01:00
Allanis
67da34e9c0 Merge branch 'dev' 2014-04-25 20:33:51 +01:00
Allanis
82a82ed70e [Add] New Outfit type (EMP weapons)
[Add] New outfits.
[Add] New effects.
2014-04-25 20:33:02 +01:00
Allanis
c7d3010a60 Merge branch 'dev' 2014-04-23 20:03:42 +01:00
Allanis
08ec271629 [Add] Added more complicated xml parse functions.
[Change] Renamed xml.h to lxml.h
2014-04-23 20:02:50 +01:00
Allanis
0906173ae0 Merge branch 'dev' 2014-04-16 19:12:22 +01:00
Allanis
8ded27ec20 [Fix] Fixed a possible double free due to uninitialised memory. 2014-04-16 19:12:00 +01:00
Allanis
ddaef2556b Merge branch 'dev' 2014-04-15 23:14:58 +01:00
Allanis
5d34065512 [Add] Support for different armour/shield hit animations. 2014-04-15 23:14:38 +01:00
Allanis
d99e073a9c Merge branch 'dev' 2014-04-15 22:06:44 +01:00
Allanis
25e3174c33 [Fix] Fixed broken weapon lockon. 2014-04-15 22:06:32 +01:00
Allanis
930e8bc53c Merge branch 'dev' 2014-04-15 21:09:14 +01:00
Allanis
ac04faacea [Change] Removed all non dt timers from stuff that should be dt based. 2014-04-15 21:08:45 +01:00
Allanis
0e45699035 Merge branch 'dev' 2014-04-14 22:28:37 +01:00
Allanis
188feb7708 [Change] Converting the outfit timers to dt system. 2014-04-14 22:28:07 +01:00
Allanis
f6cbdecf67 Merge branch 'dev' 2014-04-14 21:16:02 +01:00
Allanis
01f13c6ac3 [Change] Renamed misn_lua to llua_misn 2014-04-14 21:15:38 +01:00
Allanis
10f150b751 Merge branch 'dev' 2014-04-14 01:12:29 +01:00
Allanis
943dc931fd [Add] Interference is generated and renders quite nicely. 2014-04-14 01:11:57 +01:00
Allanis
e5dfc56750 Merge branch 'dev' 2014-04-13 23:55:16 +01:00
Allanis
8fb96809ca [Fix] Autonav won't be interrupted once you start your hyperspace drive
now.
2014-04-13 23:54:42 +01:00
Allanis
ba960cf651 [Fix] Jeez, changed colour of fuel gauge, it blended too much with
nebulae.
2014-04-13 23:40:38 +01:00
Allanis
ea64abe980 [Fix] Fixed ship continually accelerating after coming out of
autonavigation.
2014-04-13 23:28:44 +01:00
Allanis
e536ab4da3 [Fix] Too many missions without any "active missions". 2014-04-13 23:26:07 +01:00
Allanis
8f7776217b [Change] Refactored 2d/3d fractals, should speed up generation of the
nebulae puffs, but it's still slower than I would like.
2014-04-13 01:33:47 +01:00
Allanis
f74603ab35 [Change] A ton of code cleanup and optimizations. 2014-04-12 23:29:15 +01:00
Allanis
6769b024b3 [Change] Cleaned up some code. 2014-04-12 21:04:39 +01:00
Allanis
d3c38d90f7 [Add] Economy now dynamically flutuates slightly. 2014-04-12 20:32:54 +01:00
Allanis
1d594b669d [Change] Tweaked some economy values. 2014-04-11 22:26:59 +01:00
Allanis
6844e4f5b8 [Change] Some code clean up and optimization. 2014-04-11 21:52:11 +01:00
Allanis
38a0328d66 [Removed] Removed some debug stuff. 2014-04-11 21:20:37 +01:00
Allanis
678c4d4b51 [Add] Added population and production factor data for dynamic economy. 2014-04-11 21:01:51 +01:00
Allanis
6285fb0629 [Add] Initial work on implementing a dynamic economy. 2014-04-11 02:08:28 +01:00
Allanis
da58e41da9 [Change] Some more clean up. 2014-04-10 20:09:23 +01:00
Allanis
69ad2fd3bb [Change] Some minor clean up. 2014-04-10 18:23:54 +01:00
Allanis
a17b7792f3 [Add] Support for FreeBSD. Had to play around with the physics slightly
as FreeBSD didn't like the optimizations in Runge-Kuta forcing it to
eventually become NaN.
2014-04-10 01:07:20 +01:00
Allanis
2809e5323f [Change] It's about time I changed the deprecated malloc headers in
favour of stdlib right?
2014-04-10 00:36:53 +01:00
Allanis
6483dccab3 [Change] Fixed handling of outfit license. 2014-04-09 21:47:00 +01:00
Allanis
8a183c2e22 [Add] Licences are viewable through outfits menu. 2014-04-09 21:33:30 +01:00
Allanis
d11385b452 [Change] Initialize the joystick before sound. 2014-04-09 21:07:15 +01:00
Allanis
0244ff470e [Fix] You shouldn't be able to target ships while the game is paused. :/ 2014-04-09 21:05:21 +01:00
Allanis
233b8b96f0 [Add] Initial implentation of licenses, licenses are to be purchased
before given permission to buy various ships/weapons.
2014-04-09 20:55:15 +01:00
Allanis
f8701e4bdc [Add] Added options menu for audio and faders. 2014-04-08 23:48:35 +01:00
Allanis
fa3c8ab7da [Fix] Fixed broken handling of health textures. 2014-04-08 21:43:23 +01:00
Allanis
e9d216446d [Change] Major rewrite of xml parser, increased sanity checks. 2014-04-08 21:28:52 +01:00
Allanis
8f96995c8f [Change] Changed gui.xml to use a cleaner format. 2014-03-19 21:48:10 +00:00
Allanis
5ab3eafc4d [Fix] Oops, let's not return if the player has just enough credits. 2014-03-18 15:26:32 +00:00
Allanis
cdd5549ad3 [Change] Improved the keybind loading system somewhat. 2014-03-18 15:23:42 +00:00