Commit Graph

1018 Commits

Author SHA1 Message Date
Allanis
7f10a1e69e [Add] Documented pack.* 2013-09-14 22:56:57 +01:00
Allanis
2cb22a8b7a [Change] Some code quality improvements. 2013-09-14 01:02:01 +01:00
Allanis
e9985fc8ca [Change] Improved accuracy of collision on explosions. 2013-09-12 16:10:36 +01:00
Allanis
b88bba7bdb [Fix] Bug when exiting with rumble effect not cleared. 2013-09-12 15:36:01 +01:00
Allanis
687ed47839 [Fix] Segfault if not checking for player when displaying small_menu. 2013-09-12 15:34:10 +01:00
Allanis
584f56e2a0 [Change] Check for GL_ARB_fragment_program instead of GL_ARB_fragment_shader. 2013-09-12 15:32:06 +01:00
Allanis
7b77faa53e [Fix] Fixed double free if an invalid faction was loaded. 2013-09-11 23:40:59 +01:00
Allanis
ef10443cda [Add] Documented space.h 2013-09-10 02:24:14 +01:00
Allanis
b44fb505cd [Add] Documented Pilot.h 2013-09-09 01:31:14 +01:00
Allanis
e1a43e2248 [Add] Documented ai.h. 2013-09-07 19:07:01 +01:00
Allanis
d1df9aeaae [Add] Pilot death explosion sounds.
[Add] More documentation.
2013-09-06 19:45:24 +01:00
Allanis
aa58ab2ef1 Merge branch 'testing' 2013-09-06 16:45:36 +01:00
Allanis
2533439f1b [Add] Audio noise when player enters jump-safe zone. 2013-09-06 16:45:01 +01:00
Allanis
a8fe667a34 Merge branch 'testing' 2013-09-06 16:38:09 +01:00
Allanis
fc3276464a [Add] Targetting sounds implemented.
[Add] More doxygen.
2013-09-06 16:37:38 +01:00
Allanis
c7ce52127a Merge branch 'testing' 2013-09-05 13:32:51 +01:00
Allanis
eae283417f [Add] Partially documented pilot.c 2013-09-05 13:32:30 +01:00
Allanis
1c09245b6c Merge branch 'testing' 2013-09-04 15:19:56 +01:00
Allanis
9178376c28 [Change] Split engine sounds and GUI sounds for player.
[Fix] Some issues in sound.c
[Add] More documentation.
2013-09-04 15:19:04 +01:00
Allanis
9faea8acaa [Add] music.c is documented. 2013-09-03 19:50:58 +01:00
Allanis
ffdb20f50b [Add] Fully doxygenized sound.c 2013-09-03 15:16:32 +01:00
Allanis
d3173f2949 [Add] player.c is now partially documented. 2013-09-02 17:08:51 +01:00
Allanis
ca4c910ec8 [Add] Preliminary doxygen support. 2013-08-31 14:19:36 +01:00
Allanis
de91ebd91f [Fix] Bug concerning not being able to shoot seeker weapons. 2013-08-30 17:54:02 +01:00
Allanis
e20b45a383 [Fix] Resource editor somehow destroyed all the planet techs. 2013-08-30 16:47:12 +01:00
Allanis
e4b72c0302 [Fix] Planets with 0 tech won't segfault anymore. :/ 2013-08-30 16:31:59 +01:00
Allanis
b387cf0da7 [Add] faction_modPlayerRaw and the misn bindings for it. 2013-08-29 15:30:55 +01:00
Allanis
01b3f2f77b [Change] AI now use more weapon types and uses them more wisely.
[Add] Draktharr gets mace rockets.
2013-08-28 15:08:22 +01:00
Allanis
74c0297b02 [Add] New Outfit. Also implemented dumb missiles. 2013-08-27 20:14:52 +01:00
Allanis
cc437a51e6 [Add] Can now handle outfit places without outfits. 2013-08-27 14:22:48 +01:00
Allanis
582afbd617 [Change] Using atan2 instead of atan. 2013-08-26 16:44:00 +01:00
Allanis
014ba77361 [Change] Improved the faction colouring a little. 2013-08-26 16:41:37 +01:00
Allanis
871a57ecd7 [Add] More faction validity checking. 2013-08-26 16:38:37 +01:00
Allanis
a9780b6c4d [Fix] Bug that converted a 100% chance mission to 0%.. 2013-08-26 15:40:28 +01:00
Allanis
569c77ab80 [Fix] Bug where hooks would not get removed properly. 2013-08-26 15:37:21 +01:00
Allanis
68a82bd3c9 [Fix] Mission emp_collective00.lua is working again. 2013-08-26 15:23:27 +01:00
Allanis
4fa786ce21 [Fix] space.getSystem(). 2013-08-26 14:56:28 +01:00
Allanis
800ac52895 [Add] Can now save/load planet/system data. 2013-08-26 13:43:53 +01:00
Allanis
ff172951e1 [Add] Display compiled and linked SDL versions. 2013-08-25 22:47:46 +01:00
Allanis
7ebeadc73c [Change] Stage two of the lua API conversion, needs some heavy testing. 2013-08-25 19:34:27 +01:00
Allanis
2c5d3433b5 [Change] Stage one of updating lua API to use metatables. 2013-08-25 16:20:41 +01:00
Allanis
018c3cd39d [Change] Tweaked rumble a bit more. 2013-08-24 13:16:03 +01:00
Allanis
6ea6188711 [Change] Increased default volumes a little. 2013-08-24 13:10:29 +01:00
Allanis
6087d22a5d [Fix] Wasn't freeing sound properly. 2013-08-24 11:55:51 +01:00
Allanis
e3ddc663bf [Add] planet_getClass. Lots more music. 2013-08-24 11:32:13 +01:00
Allanis
f96ece85f8 [Add] Some verbosity. 2013-08-24 08:19:12 +01:00
Allanis
9bb4b6e90e [Add] Primitive positional sound. 2013-08-23 20:45:49 +01:00
Allanis
5e1ac24f68 [Fix] Error when loading a player after another with sound. 2013-08-23 20:25:30 +01:00
Allanis
897bc36111 [Change] Re-wrote entire sound system with SDL_mixer. 2013-08-23 20:18:04 +01:00
Allanis
ae1cc7c494 [Add] Make assert(0) on WARN optional with DEBUG_PARANOID. 2013-08-22 18:31:28 +01:00
Allanis
5ddb5fff94 [Fix] Bug introduced by assert in WARN/ERR change. 2013-08-22 18:22:18 +01:00
Allanis
95c9cef39c [Add] New ships/fleets 2013-08-21 21:11:47 +01:00
Allanis
64e9e2e674 [Change] Some default key bindings to avoid problems with some SDL versions. 2013-08-19 23:32:26 +01:00
Allanis
a234593091 [Change] WARN and ERR now generate asserts in debug mode. 2013-08-19 23:27:47 +01:00
Allanis
a4d1ed9f6d [Change] Weakened the rumble effect. 2013-08-17 15:40:49 +01:00
Allanis
ce15505f7e [Change] Added punctuation to player_message()s 2013-08-17 15:37:05 +01:00
Allanis
a60c84465f [Change] Now using normal distibution for accuracy for weapons (clamped). 2013-08-16 13:45:42 +01:00
Allanis
f3ce7cfb34 [Fix] Faction comparison should be >0 not != 0. 2013-08-15 16:17:26 +01:00
Allanis
17b4e1d44b [Change] Swapped DEBUG's out for WARN's, it makes more sense.. 2013-08-15 16:15:03 +01:00
Allanis
aade673567 [Fix] Segfault when popping a task without a next task. 2013-08-15 13:36:25 +01:00
Allanis
aafeaa43cd [Fix] No longer seg fault if can't find a known system in a save file. 2013-08-15 13:26:07 +01:00
Allanis
719bb753a2 [Change] Improved enemy and turret ai, they hit a lot now!
-- also improved the global attack() ai.
2013-08-14 16:48:32 +01:00
Allanis
d4fe47f184 [Fix] ai.brake. 2013-08-14 10:50:50 +01:00
Allanis
0277fcc750 [Fix] Turrets causing seg fault when there is no target. 2013-08-12 09:39:10 +01:00
Allanis
284823ce25 [Add] Minor sanity checks. 2013-08-12 09:26:59 +01:00
Allanis
520ce4a9d6 [Change] Moved commodity text a little lower. 2013-08-11 18:40:52 +01:00
Allanis
35969bab38 [Add] Can now override pilot AI in a fleet.
[Change] Made fleet_parse() more up to date with xml.h
2013-08-10 20:23:06 +01:00
Allanis
b9c1f021b2 [Change] ai.exists() is more lenient with bad parameters. ;) 2013-08-10 18:04:39 +01:00
Allanis
51db82aa25 [Add] Some error checking in nebulae subsystem to avoid infinite loop. 2013-08-10 17:36:08 +01:00
Allanis
430fe0bb1f [Change] Thrust is per ton, makes more sense. 2013-08-10 17:11:49 +01:00
Allanis
e10841653d [Fix] Improved sanity on some AI functions. 2013-08-10 16:11:54 +01:00
Allanis
562ba56aab [Change] ai.exists() should return false if pilot is dead. 2013-08-10 12:42:23 +01:00
Allanis
4e7f7c73e5 [Remove] Forgot to take out debug message. 2013-08-10 12:33:28 +01:00
Allanis
cd1565a6d5 [Change] Tweaked faction hits to be more useful. 2013-08-10 12:32:06 +01:00
Allanis
03972e305a [Fix] Map fix for multiple faction bug. 2013-08-10 12:23:06 +01:00
Allanis
515c951078 [Change] It should be easiar to lose a faction than it is to gain it. 2013-08-10 12:21:15 +01:00
Allanis
79411d240e [Change] Unified colouring schemes. 2013-08-09 20:45:17 +01:00
Allanis
47f132a467 [Change] Made rating/faction gain not linear. 2013-08-09 20:19:47 +01:00
Allanis
c58223606b [Change] faction_modPlayer() now affects allies and enemies.
[Remove] Alliance references.
2013-08-09 18:11:43 +01:00
Allanis
c792e75240 [Change] Make map check if faction is -1. 2013-08-09 16:37:40 +01:00
Allanis
dc9332dc08 [Change] Made RNG() more robust. 2013-08-09 16:35:31 +01:00
Allanis
95d8eff1c5 [Add] Messages now fade away all sexy like. 2013-08-09 16:24:48 +01:00
Allanis
4d53076677 [Add] Uninhabited planets now show up as so on the radar. 2013-08-09 16:14:49 +01:00
Allanis
aa8408022d [Fix] Clear player lockons when running space_init(). 2013-08-09 13:49:11 +01:00
Allanis
6e0c3cd2d0 [Add] New outfit: Military specific jammers. 2013-08-08 21:45:31 +01:00
Allanis
ea484174e0 [Fix] Missile resist should not be 100 times stronger. :/ 2013-08-08 18:37:43 +01:00
Allanis
115fa94cb8 [Add] Missiles can resist jamming. 2013-08-08 18:31:06 +01:00
Allanis
21ca77d439 [Change] Updated TODO. 2013-08-08 16:35:45 +01:00
Allanis
da83f105e0 [Add] Jammers are now implemented fully. 2013-08-08 16:31:08 +01:00
Allanis
fe1ab6ea0f [Add] Forgot to change energy units of jammer. 2013-08-07 21:07:57 +01:00
Allanis
0db99107e0 [Add] Jammers now loaded (not used yet). 2013-08-07 20:16:45 +01:00
Allanis
9bd191ddfe [Fix] Prevent menu_small from opening when dead. 2013-08-07 14:43:09 +01:00
Allanis
790bd9b472 [Change] Tweaked faction hits from combat a bit. 2013-08-07 14:30:03 +01:00
Allanis
30aaa7852d [Fix] You can no longer buy extra outfits. 2013-08-07 14:26:45 +01:00
Allanis
48353d7c79 [Fix] Missiles are working quite nicely now. 2013-08-07 14:20:02 +01:00
Allanis
6dbfe22d90 [Change] Missiles now hack the physics subsystem, Needs fixing. 2013-08-07 13:30:55 +01:00
Allanis
0bcc2c3135 [Add] vect_reflect() - Mirror a vector off another. 2013-08-07 12:14:47 +01:00
Allanis
4dbc934722 [Add] Another define: FABS. 2013-08-07 12:10:11 +01:00
Allanis
17fba238d1 [Add] Innitial attempt at a proper facing system, primarily for missiles. 2013-08-07 12:07:58 +01:00
Allanis
26099de520 [Fix] misn_condLibs() was missing space lib. 2013-08-06 19:46:15 +01:00
Allanis
e5d050c22d [Fix] Another memleak. :/ 2013-08-06 19:44:53 +01:00
Allanis
c9a9eea55e [Fix] Small memleak. 2013-08-06 19:41:32 +01:00
Allanis
2ec37b673e [Fix] var.push(). 2013-08-06 19:37:17 +01:00
Allanis
f2702222d4 [Fix] Sanitize player faction standing. 2013-08-05 19:56:57 +01:00
Allanis
71e0803b1a [Change] Order files with lfile_readDir by newest first. 2013-08-05 17:10:53 +01:00
Allanis
7c723db96b [Change] Adjust text height to faction name length. 2013-08-03 18:53:18 +01:00
Allanis
f26101197e [Fix] Removed extra offset added to gl_printHeight. 2013-08-03 18:40:47 +01:00
Allanis
a9c57f2cab [Add] Factions are now able to have long names. 2013-08-03 18:38:23 +01:00
Allanis
9d43435d4a [Change] Afterburn now breaks when you run out of energy. 2013-08-03 17:57:35 +01:00
Allanis
846f12cd65 [Add] You can now target unknown system nodes to fly to them. 2013-08-03 16:35:09 +01:00
Allanis
6ebb90dc23 [Change] You can no longer buy a star map if you already know the area. 2013-08-03 16:31:20 +01:00
Allanis
82b210e6cc [Change] Sanitized the pilot_get* a bit. 2013-08-03 15:45:56 +01:00
Allanis
c58e73ade2 [Fix] FPS limiting. 2013-08-03 15:00:26 +01:00
Allanis
44a37c0a2c [Change] Small cosmetic change in fps_control. 2013-08-03 14:30:16 +01:00
Allanis
489b972879 [Change] Render player ontop of target graphics. 2013-08-03 14:28:08 +01:00
Allanis
6bc5e6d5af [Add] You can now specify target graphic different from normal gfx. 2013-08-03 13:25:43 +01:00
Allanis
a76a98de2a [Fix] Let's not segfault if outfit isn't found.. 2013-08-03 12:43:48 +01:00
Allanis
62d37ab334 [Add] Warn if outfit isn't found. 2013-08-03 12:39:38 +01:00
Allanis
0480a2a74e [Change] Added more Lua parameter checking. 2013-08-01 16:30:30 +01:00
Allanis
5109958e29 [Fix] More mission string formatting weirdness. 2013-08-01 16:26:17 +01:00
Allanis
34dccfb646 [Fix] Hook memleak. 2013-08-01 16:23:21 +01:00
Allanis
1c7bd75537 [Fix] Let's not segfault if a mission is not found in the stack when saving. :/ 2013-07-31 20:24:14 +01:00
Allanis
af92dcaaff [Add] player.getRating(). 2013-07-31 20:15:38 +01:00
Allanis
c3d6cf553e [Add] More space planet graphics. 2013-07-31 19:26:26 +01:00
Allanis
80f2e21429 [Add] Conditionalize the player Lua API. 2013-07-30 15:59:24 +01:00
Allanis
413ced137d [Change] Fixed space.faction to allow to check easily for certain factions. 2013-07-28 17:48:05 +01:00
Allanis
9c6567195c [Add] space.faction to get the faction of a star system. 2013-07-27 18:02:14 +01:00
Allanis
10ea68c5c3 [Change] Cleaned up XML loading somewhat. 2013-07-27 15:14:55 +01:00
Allanis
4f6c5fb93f [Fix] Sanitized lua bindings a little. 2013-07-26 18:39:21 +01:00
Allanis
fb7c73aae4 [Fix] printHeight was using wrong width. 2013-07-25 21:45:41 +01:00
Allanis
d0b55f1d1b [Add] Loading screens!!! :D 2013-07-25 21:43:22 +01:00
Allanis
c7e2a69d91 [Change] Replaced unused and depricated gl_blitRotate with gl_blitScale. 2013-07-25 19:26:45 +01:00
Allanis
b4e325a9fe [Change] Removed alliance deal, now each faction states it's own allies/enemies. 2013-07-25 17:23:05 +01:00
Allanis
5de9fd60d9 [Fix] Stupid lua parameter stuff. 2013-07-24 20:21:22 +01:00
Allanis
bda8ebb204 [Remove] Taken nebulae puffs out of the main menu. 2013-07-24 17:35:23 +01:00
Allanis
2f9c91d451 [Fix] More correction in gl_freeTexture() 2013-07-24 17:33:18 +01:00
Allanis
e1308dc570 [Add] Pilots lose their cargo when the die. 2013-07-24 16:59:28 +01:00
Allanis
8a294f76c0 [Add] Fancy cargo graphics for when jettisoning. 2013-07-24 16:38:07 +01:00
Allanis
d6643b0a51 [Fix] More warnings. 2013-07-24 16:10:13 +01:00
Allanis
1d734e7898 [Fix] More memory related fixes. 2013-07-24 15:10:24 +01:00
Allanis
1f3947bc49 [Fix] A few memleaks. 2013-07-24 14:59:23 +01:00
Allanis
a0f6dec666 [Add] You can jettison cargo now. :) 2013-07-23 21:37:14 +01:00
Allanis
8cac584d45 [Add] Here is something you have been waiting for, for a long time! Cargo window in info panel. :P 2013-07-23 21:17:36 +01:00
Allanis
23733b032f [Add] Oh, and the lack of them. 2013-07-23 21:00:30 +01:00
Allanis
cf5f8c8c48 [Add] Map informs you of available services. 2013-07-23 20:59:02 +01:00
Allanis
cf1bf0d647 [Add] Allow to move or get window positions after creation.
[Change] Simplified window position creation.
[Add] More comments for window creation.
2013-07-23 20:42:17 +01:00
Allanis
b680520738 [Fix] Spelled "Dangerous" wrong. :/ 2013-07-23 14:13:12 +01:00
Allanis
7376a30527 [Add] Display whether or not a system has nebulae. 2013-07-23 14:11:48 +01:00
Allanis
8ef0ada807 [Add] Map now displays faction standing of star system. 2013-07-23 14:00:14 +01:00
Allanis
b65385a1bd [Change] Accidently pushed a small NEBULAE_Z. :/ 2013-07-23 12:56:53 +01:00
Allanis
3fcdc8e288 [Fix] Segfault with calculating new position of nebulae with no player. 2013-07-23 12:54:19 +01:00
Allanis
352083a0ce [Fix] Forgot to change free. 2013-07-23 12:52:15 +01:00
Allanis
11e5607477 [Change] Load gfx_exterior for planets only on demand. 2013-07-23 12:49:50 +01:00
Allanis
11b31c9be7 Merge branch 'testing' 2013-07-23 12:13:45 +01:00
Allanis
dcaa96b5e9 [Fix] Rumble can no longer "leak" over to menu, nebulae etc. 2013-07-23 12:13:06 +01:00
Allanis
20ec0cb848 Merge branch 'testing' 2013-07-23 12:01:30 +01:00
Allanis
7eca1ff5b9 [Change] Toned down the effect of rumble a little. 2013-07-23 12:00:47 +01:00
Allanis
c4705b7142 [Fix] A bug in window_create, it's been there since forever. :P 2013-07-22 18:51:27 +01:00
Allanis
1d5a88ba95 [Add] Nebulae is now ingame! Have a screenshot?
http://saracraft.net/projects/Lephisto/nebu_ingame.png
2013-07-22 18:41:36 +01:00
Allanis
cc37706fb1 [Change] Puffs of nebulae now look more visually pleasing. 2013-07-22 17:58:44 +01:00
Allanis
497081b3ed [Change] Split player rendering properly into GUI and player. 2013-07-22 17:21:28 +01:00
Allanis
092b48651d [Change] Restructured a little to prepare for puffs of nebulae. 2013-07-22 15:53:09 +01:00
Allanis
1e7d19b2a6 [Change] Moved some code from perlin to nebulae. 2013-07-22 12:06:55 +01:00
Allanis
7b7ddae70e [Add] Rolled my own, much better python xml writing scheme. 2013-07-22 10:27:13 +01:00
Allanis
240869046b [Fix] dt weirdness on low fps. 2013-07-21 16:03:32 +01:00
Allanis
e066250c1f [Change] Improved nebulae system. 2013-07-21 15:58:58 +01:00
Allanis
ea3573404f [Fix] Nebulae overlay. 2013-07-21 15:35:30 +01:00
Allanis
7ea6e809e8 [Change] Increased star map size. 2013-07-21 13:37:11 +01:00
Allanis
df8af779ee [Add] Star system can now set nebuale density and volatility. 2013-07-21 13:33:43 +01:00
Allanis
9fb781d27e [Fix] Rumble no longer affects nebulae. 2013-07-21 13:29:05 +01:00
Allanis
2381ca3a36 [Fix] spfx_clear() also clears rumble. 2013-07-21 11:40:32 +01:00
Allanis
e331a8e8b6 [Fix] Map giving stats about unknown systems. 2013-07-21 11:33:44 +01:00
Allanis
6e3417907f [Fix] Segfault with creating new pilot. 2013-07-21 11:25:20 +01:00
Allanis
42a57d09e9 [Add] space_renderOverlay(). 2013-07-21 11:13:53 +01:00
Allanis
862ef7759b [Change] Split the star rendering to be able to switch to nebulae soon. 2013-07-20 19:17:10 +01:00
Allanis
475aa1f1fa [Add] Check for multitexture abilities and texture leaks. 2013-07-20 19:06:36 +01:00
Allanis
5584c3171c [Add] Gave menu screen a nice finished look. 2013-07-19 20:12:24 +01:00
Allanis
17db004ba1 [Fix] Tweaked a little bit, and the transitions is perfectly smooth now. 2013-07-19 19:18:04 +01:00
Allanis
86f7480826 [Add] Animated nebulae ftw!!! 2013-07-19 19:05:01 +01:00
Allanis
06fec494a5 [Fix] Nebulae is now fully working. 2013-07-19 15:01:48 +01:00
Allanis
cd158e5102 [Add] Nebulae almost working, There is a major graphical bug however. 2013-07-19 14:25:15 +01:00
Allanis
86b2ef3fe1 [Add] Initialize nebulae and use it in menu. 2013-07-15 12:24:51 +01:00
Allanis
fefc7e793c [Add] Nebulae render function. 2013-07-14 15:09:39 +01:00
Allanis
02e136520e [Add] -G option to force regeneration of nebulae. 2013-07-13 16:56:08 +01:00
Allanis
897fb9918d [Add] Now we will initialize the nebulae. 2013-07-13 16:38:29 +01:00
Allanis
40df85b5ab [Change] Some needed cleanup in perlin noise stuff. 2013-07-12 22:33:03 +01:00
Allanis
243795e068 [Add] Give errors on unsupported OS code. 2013-07-12 19:11:10 +01:00
Allanis
5ed5cf6b6d [Change] Hardcoded everything to have three dimensions. [perlin noise.] 2013-07-12 19:05:39 +01:00
Allanis
02e8b560fa [Fix] Forgot to give prototype for noise_generateNebulae(). 2013-07-12 17:45:24 +01:00
Allanis
ec6cabf2fe [Add] Some SSE stuff for speedups. 2013-07-11 18:44:37 +01:00
Allanis
1442259c0b [Add] Nebulae generation code. (Not using it at the minute). 2013-07-11 17:43:33 +01:00
Allanis
e4e7bf4b17 [Add] save png method to save a surface to a file as png. 2013-07-11 16:42:18 +01:00
Allanis
4fd8308706 [Change] Moving things around a litting in perling.* I made a little mess. 2013-07-11 16:16:38 +01:00
Allanis
2d1040b703 [Fix] Stupid me, last commit I was checking for a prefix instead of suffix. :/ 2013-07-11 16:01:55 +01:00
Allanis
4c1ee89ffb [Add] Fancy new "cloud" generator. This needs some heavy tweaking/cleanup. 2013-07-10 22:58:31 +01:00
Allanis
b8bafb4700 [Add] More planet functions for ai: ai.getrndplanet() and ai.getlandplanet(). 2013-07-10 19:30:58 +01:00
Allanis
09636a6c90 [Change] Need to run enter and takeoff hooks on load game. 2013-07-10 18:39:16 +01:00
Allanis
abab808387 [Fix] Bug with changing hyperspace path after selecting a route. 2013-07-10 18:32:13 +01:00
Allanis
2ec09b0ee3 [Add] ai.haslockon() to check for locked on missiles. 2013-07-10 18:04:36 +01:00
Allanis
7a6f27da43 [Add] Warn the player when a missile is locked onto her. 2013-07-09 19:03:03 +01:00