Rtch/Lephisto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
748 Commits 1 Branch 0 Tags 110 MiB
c4f0d39319
Commit Graph

603 Commits

Author SHA1 Message Date
Allanis
9ea3f985d2 [Add] Prevention in case of pilot_stack reallocation. 2013-03-20 21:27:57 +00:00
Allanis
d649330e5b [Change] Extended amount of time cinamatic cam is shown. 2013-03-20 20:26:29 +00:00
Allanis
ccffdae9fd [Add] Player death with short cinematic. 2013-03-20 20:23:39 +00:00
Allanis
53d5eb6172 [Add] Militia kinda scans now. 2013-03-20 19:21:46 +00:00
Allanis
dfd60775e2 [Change] Accuracy value for laser improved as everyone hated it. 2013-03-20 00:27:42 +00:00
Allanis
0d6ac1e5b1 [Add] Afterburners are in! After buying the outfit, double tap 'w'. 2013-03-19 22:34:20 +00:00
Allanis
4abe914310 [Add] Outfit graphics for store. 2013-03-19 00:13:03 +00:00
Allanis
ee8512c5ef [Change] Renamed planets etc with star trek naming scheme. 2013-03-18 23:55:31 +00:00
Allanis
87b10759b4 [Add] Content heaven. New planets/systems 5 new outfits with diff stats. 2013-03-17 22:59:38 +00:00
Allanis
c2d44ebb74 [Fix] FFS. Wasn't incrementing number of outfits while trying to add it. 2013-03-17 20:13:43 +00:00
Allanis
a037112f72 [Fix] Eheh. Typo affecting merchant ships going to hyperspace.. 2013-03-17 19:55:40 +00:00
Allanis
b66c6f7ecf [Add] Attempted to get modifications actually working. Everything is 
brokened. Don't even attempt to play..
 2013-03-17 19:28:45 +00:00
Allanis
ee3c81b7ff [Add] Modification/Upgrades to ships. 2013-03-17 16:57:17 +00:00
Allanis
2f59ae1b84 [Add] Energy is actively in use now. ^.^ 2013-03-17 16:36:59 +00:00
Allanis
299841d012 [Change] Some cosmetic changes to landing windows. 2013-03-17 15:44:50 +00:00
Allanis
36812733fd [Change] Sanitized message order. 2013-03-17 14:37:25 +00:00
Allanis
c1db3ff7ab [Fix] "none" not showing up when ship had no cargo. 2013-03-17 14:29:47 +00:00
Allanis
e3a0ec37cf [Change] Tweakes board success chance. 2013-03-17 14:26:28 +00:00
Allanis
b9fce0adbf [Add] Merchants now have cargo that you can steal upon boarding. 2013-03-17 14:22:10 +00:00
Allanis
5d2f604703 [Add] ai.cargofree() to lua API. 2013-03-17 13:49:25 +00:00
Allanis
ca84fe6a3a [Add] Buy/Sell commodities. They are all the same price at the minute. 2013-03-17 13:40:52 +00:00
Allanis
91e68ee828 [Add] Buy/Sell cargo. 2013-03-17 01:01:47 +00:00
Allanis
d9c8dbc449 [Add] 'face' will face targetted planet if no pilot target is selected. 2013-03-16 23:02:30 +00:00
Allanis
910eb656a5 [Add] More verbose ai logging and more monies. 2013-03-16 22:41:24 +00:00
Allanis
62232d0596 [Add] Finally! Some better freaking lua error checking. 2013-03-16 22:32:22 +00:00
Allanis
88fed6f40c [Add] ai now controls ship's credits/loot. Some more API calls and cargo stuff. 2013-03-16 22:14:53 +00:00
Allanis
aa4112f2df [Add] Planets now have commodities. Nothing can be done with them yet ;) 2013-03-16 21:13:21 +00:00
Allanis
4f0420d82f [Add] Basic commodity support. (Not in use yet). 2013-03-16 20:29:18 +00:00
Allanis
49ab58fdda [Change] Cleared silly commodity exchange message. 2013-03-16 19:26:15 +00:00
Allanis
4bff93e148 [Add] More ship types. 2013-03-16 19:24:06 +00:00
Allanis
8f9c2ff9b7 [Change] Shipyard and outfits look ugly. Made the same size as land window. 2013-03-16 19:06:07 +00:00
Allanis
6c50e56894 [Add] "special" techs. Basically finished tech stuff. 2013-03-16 19:04:19 +00:00
Allanis
6802c39eec [Add] Preliminary tech support. (only raw, no special tech yet). 2013-03-16 18:44:06 +00:00
Allanis
7db2ae019d [Fix] Don't think anyone noticed this one.. Some funny little bugs when paused while hyperspacing. 2013-03-16 17:20:18 +00:00
Allanis
6f12836395 [Fix] Someone has to put a stop to VLack finding my bugs. 2013-03-16 17:11:08 +00:00
Allanis
fdaabd259e [Add] Possibility to deny landing. 2013-03-16 17:02:09 +00:00
Allanis
eb98a0deaf [Change] Some cosmetic changes to Hyperspace. 2013-03-16 16:47:49 +00:00
Allanis
dd79adb0af [Change] Minor change in gui. 2013-03-16 13:41:05 +00:00
Allanis
ef36411f81 [Change] Planet colours are based on standing. 2013-03-16 13:38:49 +00:00
Allanis
2d49ee188e [Change] Improved the chase ai_face with customizable velocity weight. 2013-03-14 21:58:38 +00:00
Allanis
309ac8a648 [Add] New factions, ship, station, system. Empire and Collective wage war against each other. 2013-03-14 21:43:48 +00:00
Allanis
d246c2cbe2 [Add] More thingies.. Factions!! 2013-03-13 22:39:52 +00:00
Allanis
bc12bbaba2 [Fix] Past three revisions wouldn't stop shooting primary/secondary weapons. I have no idea how this solves it, but it does.. 2013-03-13 21:36:50 +00:00
Allanis
4b07e86acd [Add] Militia faction. Changed Test pilot to Militia and added ai_create 2013-03-12 23:45:29 +00:00
Allanis
a4bca2004b [Add] You will need permission to land on a planet. 2013-03-10 20:13:07 +00:00
Allanis
f02a406ffc [Change] Tweaked the star deformation while hyperspacing. 2013-03-10 19:22:37 +00:00
Allanis
938b76b8be [Add] Boundary checking for starmap names. 2013-03-10 19:19:14 +00:00
Allanis
2e6bfd6a4d [Change] Resizing starmap works at different speeds. 2013-03-10 19:13:17 +00:00
Allanis
a3f5e18306 [Change] Best not render the names when we are zoomed out, as they overlap each other etc. 2013-03-10 19:01:40 +00:00
Allanis
5221a51241 [Add] System names are now viewable in starmap. 2013-03-10 18:59:54 +00:00
Allanis
4e2f8aa56d [Add] Blue and DarkBlue. 2013-03-10 18:55:43 +00:00
Allanis
dac9bc367e [Add] Allow for star map zooming. 2013-03-10 18:53:15 +00:00
Allanis
669e14ee13 [Change] Randomized planet landing a little. 2013-03-10 18:19:16 +00:00
Allanis
5b4adca3bb [Change] No point in drawing if we are offscreen. (gl_drawCircleInRect). 2013-03-10 17:19:13 +00:00
Allanis
11f4eed18c [Fix] Hyperspace paths no longer appear if you drag them out of the map. 2013-03-10 17:16:39 +00:00
Allanis
6365ad186a [Change] Improved StarMap by displaying color based on the path you can travel. 2013-03-10 17:06:23 +00:00
Allanis
a153cb9a37 [Fix] Can't change targets while toolkit is open. 2013-03-10 16:47:46 +00:00
Allanis
dfb57c1775 [Add] Map will draw hyperspace paths. :D 2013-03-10 16:40:48 +00:00
Allanis
46109626a4 [Fix] Typo causing hyperspace selection seg fault. 2013-03-10 16:12:44 +00:00
Allanis
ccf15467f7 [Add] cTrans colour. 2013-03-10 16:10:26 +00:00
Allanis
2a572b713a [Fix] Enforce outfit selling/buying with limits. 2013-03-10 16:07:38 +00:00
Allanis
23a982fbb5 [Fix] Missing return statement prevented 'm' from also closing the map. 2013-03-10 15:15:39 +00:00
Allanis
0421e2a43b [Fix] Secondary weapons no longer seg fault upon cycling through. 2013-03-10 15:14:00 +00:00
Allanis
f5d5441fd2 [Add] More control with mouse events on custom widgets, you can drag map and also select planets. 2013-03-10 15:07:30 +00:00
Allanis
43a1bb019f [Fix] Mouse events not taking into account custom window offset. 2013-03-10 14:25:00 +00:00
Allanis
1d6b0268b5 [Change] Cleaned up codebase to not exceed 80 characters. 2013-03-10 14:18:07 +00:00
Allanis
7fb9bbedce [Add] Custom mouse events for custome widgets 2013-03-10 13:41:36 +00:00
Allanis
c687e7a173 [Add] Display some information about the star system. 2013-03-09 23:28:42 +00:00
Allanis
0784ab1624 [Fix] Negative xpos value for text widgets was off a little. 2013-03-09 22:23:40 +00:00
Allanis
fe170aede4 [Add] Early map is actually drawing planets quite nicely. 2013-03-09 22:21:37 +00:00
Allanis
3eadb955ff [Fix] Broken gl_drawCircleInRect 2013-03-09 22:15:59 +00:00
Allanis
44c6addeb8 [Fix] Border issue in custom widgets. 2013-03-09 22:10:15 +00:00
Allanis
c6ffaaed20 [Add] Basic map support, Added gl_drawCircle and gl_drawCircleInRect 2013-03-09 22:07:28 +00:00
Allanis
51d2abe73e [Add] New drone, new outfit. Also changed wpn to blt, as we will have multiple forms of weaponry. 2013-03-09 20:46:24 +00:00
Allanis
4d0e838d84 [Change] Cleaned up that last commit. 2013-03-08 14:42:14 +00:00
Allanis
89f690eda0 [Fix] Display '0' properly if you sell al your ammo. 2013-03-08 14:34:47 +00:00
Allanis
fc5535f0f8 [Fix] No longet get negative outfit quantity. 2013-03-08 14:26:56 +00:00
Allanis
37862dbf3c [Add] Use shift/control modifiers to purchase more outfits at a time. 2013-03-08 14:21:03 +00:00
Allanis
eeb09fdf05 [Add] Make $$ from selling outfits. 2013-03-08 13:54:30 +00:00
Allanis
ef2bfd2052 [Add] Possibility for custom widgets. 2013-03-08 13:39:30 +00:00
Allanis
1d4286d2ad [Add] More weapon space for ships. Space limit on outfits. 2013-03-08 02:26:06 +00:00
Allanis
94623aa081 [Add] Allert windows as a way to warn the user of something. 2013-03-08 02:18:49 +00:00
Allanis
d1d08da22c [Fix] Cosmetic changed to fix formatting in Outfit store and shipyard. 2013-03-08 00:19:34 +00:00
Allanis
a33bb0624a [Add] Selling of outfits, also improved purchasing of outfits. 2013-03-08 00:10:45 +00:00
Allanis
36a8847248 [Add] You may buy new outfits now. :D 2013-03-07 18:44:01 +00:00
Allanis
b3c9fe74ca [Fix] Forgot to free ship description. 2013-03-07 15:44:31 +00:00
Allanis
3fc4cb88df [Add] You can buy ships. :) Free of charge until offer lasts. 2013-03-07 15:28:35 +00:00
Allanis
88c7ad1156 [Fix] Better support for 640x480 2013-03-07 14:45:13 +00:00
Allanis
b8f4ee9443 [Fix] Small fix for list selection, Don't allow focus when mouse clicked out of boundaries. 2013-03-07 14:42:28 +00:00
Allanis
e6b28a1634 [Add] Shipyard information on manufacturer and purchase price etc. 2013-03-07 14:36:17 +00:00
Allanis
1b4bea7b1f [Add] Visualization and description of ships in the shipyard. 2013-03-07 14:11:02 +00:00
Allanis
9d08ff3ae0 [Add] New rectangle widget. More widget creation checking. 2013-03-06 22:28:46 +00:00
Allanis
c5280cb4b3 [Add] More list support. More shipyard features. Allow for NULL text in widget. 2013-03-06 21:52:33 +00:00
Allanis
8b76e4613c [Add] Rough outlines for shipyards and outfits. 2013-03-06 21:34:22 +00:00
Allanis
01a0324e79 [Add] You can no longer focus unfocusable widgets. 2013-03-06 20:49:18 +00:00
Allanis
f7bff6f341 [Remove] debug print statements.. 2013-03-06 20:38:40 +00:00
Allanis
820c477d7b [Add] Clicky focus for lists as well as keyboard input. 2013-03-06 20:37:58 +00:00
Allanis
8881dc5265 [Add] Keybord events work with lists. I think I optimized pilots to use temp sprite values here too. Forgot to diff. 2013-03-06 20:17:14 +00:00
Allanis
9ac872aac4 [Add] Selected list thingy actually renders. You can focus it too. 2013-03-06 14:54:11 +00:00
Allanis
f0fa480fb4 [Add] List widget renders. Time to make it actually work properly? 2013-03-06 13:02:42 +00:00
Allanis
961875a799 [Change] Refactoring some more opengl mess in toolkit.c. Rectangles this time.. 2013-03-06 12:46:17 +00:00
Allanis
dec372e06c [Add] toolkit_drawOutline to cleanup some horrible code I hate so much. 2013-03-01 00:21:19 +00:00
Allanis
da6b8fa786 [Fix] Typo in constructor. 2013-02-28 23:59:52 +00:00
Allanis
26507a8ebe [Add] window_modifyImage call. 2013-02-28 22:49:53 +00:00
Allanis
9d966458d7 [Add] Mule ship, and applied turrets to them. 2013-02-28 21:22:06 +00:00
Allanis
452c77f30c [Add] Outfit information window. 2013-02-28 19:29:47 +00:00
Allanis
6c6fc70916 [Fix] Forgot a separator. 2013-02-28 18:09:14 +00:00
Allanis
6492d9b9e6 [Change] Secondary weapon change now keybinds to 'e' 2013-02-28 18:08:10 +00:00
Allanis
8f6b02cfc1 [Add] Turrets!! 2013-02-28 17:38:44 +00:00
Allanis
ef437c9b98 [Fix] I'm a retard!! I wasn't initialising ticks.. Spawning now works. Ima go sleep now. 2013-02-28 03:41:03 +00:00
Allanis
6b1228a4af [Add] Adding spawns. It's uh.. Not working? I'll work on it some more later.. 2013-02-28 02:36:45 +00:00
Allanis
1b77a4276b [Add] Smart seeker missiles. Not aquirable yet :P. 
[Fix] Potential fix of a floating point exceoption.
 2013-02-28 01:23:52 +00:00
Allanis
27f4ddcd86 [Add] VLack wished to know what resolution we was at with radar. Well. Here it is. 2013-02-27 23:55:08 +00:00
Allanis
b1d1142739 [Add] Basic toolkit focus. We can now completely navigate the menus etc with the keyboard. 2013-02-27 23:45:41 +00:00
Allanis
521f3baa9f [Add] Allow toolkit to block input if needed. 2013-02-27 23:19:40 +00:00
Allanis
8fcbca89cb [Fix] I'd like to see VLack crash it now!! Allow for null pointer functions for buttons. 2013-02-27 23:12:07 +00:00
Allanis
f181a7bec6 [Change] Just some standardization 2013-02-27 23:03:48 +00:00
Allanis
d77fc45e7f [Fix] Missiles don't go crazy when enemy has been killed. 2013-02-27 22:58:23 +00:00
Allanis
35f35463ae [Fix] Tehee. silly type. 2013-02-27 22:38:40 +00:00
Allanis
495a9ccb74 [Add] Enemy pilots die with a big ass explosion. :D 2013-02-27 22:16:09 +00:00
Allanis
ba89db90a4 [Add] Chance to board/loot ships is now based on a crew comparison. 2013-02-27 19:49:35 +00:00
Allanis
e206af22a6 [Fix] Stealing SCreds works perfectly fine now. 2013-02-27 18:45:51 +00:00
Allanis
ddc831b353 [Add] You can somewhat steal credits now. 
[Fix] Only board the ship once.
 2013-02-27 18:16:22 +00:00
Allanis
9aa025e812 [Fix] Aligned ship information properly in panel. 2013-02-27 17:39:20 +00:00
Allanis
39c99a064f [Change] Moved credit funcions to economy.* and applied some moniez to NPC for you to loot. 2013-02-27 17:32:25 +00:00
Allanis
2d664e3393 [Change] Forgot to commit player.h 2013-02-27 17:15:07 +00:00
Allanis
3fd621a5ef [Fix] Small bug on closing landing window. 2013-02-27 15:55:28 +00:00
Allanis
cc4dc358c1 [Fix] Bug that was introduced when allowing toolkit some control. 2013-02-27 15:48:12 +00:00
Allanis
8cb99e490c [Fix] Bug iwth addtext and negative positions. 2013-02-27 15:43:37 +00:00
Allanis
5694a0b598 [Change] Seperated boarding from player.c to board.c. Fixed ship information panel. 2013-02-27 15:38:15 +00:00
Allanis
ae84dcf911 [Add] outfits and ships now have a price tag. 2013-02-27 15:12:59 +00:00
Allanis
fb57dde3ed [Fix] No-one knew it, but input for toolkit was buggy. Seperated toolkit input from game input to fix this. 2013-02-27 14:50:16 +00:00
Allanis
ddadb068fe [Change] Compressed the debug messages. 2013-02-27 14:36:56 +00:00
Allanis
e87f160e23 [Add] Hopefully this will prevent dt intervels being too big. 2013-02-27 04:43:16 +00:00
Allanis
78d0346515 [Change] Use atan2 for ANGLE 2013-02-27 04:31:04 +00:00
Allanis
eee3ef3065 [Change] Minor change to physics. 2013-02-27 04:18:37 +00:00
Allanis
a6c758aa66 [Fix?] Hyperspace bug. Messed up velocity issues. 
Ok. What we are doing here is messy.

What we are doing is modulating the velocity. There is also a dt
in there to try to make it not frame dependant..

The way things are done right now, we  are cascading the limit_speed with the physics model,
We can simplify it to a euler integration (It's actuallyu runge-kutta)..

What we are doung is:

v1 = v0 + adt

Basically this means that the current velocity is the last vel plus the acceleration, times the
time passed from the last instance. This is then chained to the limit speed which does:

v = (v1 - vmax)(1-3dt)

So we can right the composite form as:

v = (v0 + adt - vmax) 1-3dt) = v0 + adt - vmax - 3dtv0 - 3adt2 + 3dtvmax

-- Yes. This is hacky. I will try to play with some equasions later.
 2013-02-27 03:45:25 +00:00
Allanis
f6de9e8186 [Add] limit_speed in physics 2013-02-27 03:26:58 +00:00
Allanis
0de847b5a4 [Fix] Quick indent fix to stop us from being confused as hell while bug hunting. 2013-02-27 02:46:25 +00:00
Allanis
fce918506d [Fix?] Attempt to fix hyperspace on certain arcitecures. ABS was a bit off. 2013-02-27 02:23:33 +00:00
Allanis
1d89d4e7c6 [Fix] Huge fix of outfits, missiles now work, compiles in C99, no seg fault on exit. 2013-02-27 01:17:46 +00:00
Allanis
1578278f00 [Change] Cleaned up collision a little. 2013-02-27 00:05:52 +00:00
Allanis
68b51e61bc [Fix] Some compiler warnings on 32 bit systems. 2013-02-26 23:54:35 +00:00
Allanis
18bb84eafb [Change] Nerfed the knockback effect. 2013-02-26 23:52:41 +00:00
Allanis
be7a2b7791 [Change] Simplifies spfx_destroy, performs a little better.. 2013-02-26 23:50:00 +00:00
Allanis
9175091456 [Fix] Forgot to remove special effects when in hyperspace.` 2013-02-26 23:46:55 +00:00
Allanis
cc1d09c4b5 [Fix] Small issue with spritesheets that don't have sx == sy 2013-02-26 23:44:54 +00:00
Allanis
f603df48cc [Change] Define special effects per outfit. 2013-02-26 23:43:07 +00:00
Allanis
80d78756ad [Add] Primitive special effect system with explosions!! 2013-02-26 23:18:40 +00:00
Allanis
21deb8709d [Change] Optimized getSpriteFromDir somewhat. 2013-02-26 18:47:14 +00:00
Allanis
ffd806bea6 [Change] Spoke too soon. Star deformation length is now defined. 2013-02-26 18:27:06 +00:00
Allanis
45d75779dd [Add] Perfected hyperspace visuals. ^.^ 2013-02-26 18:21:51 +00:00
Allanis
409dbff310 [Change] Improved hyperspace transition. 2013-02-26 17:54:51 +00:00
Allanis
a10931b7b6 [Fix] Clearing out some warning that I allowed to slip in. 2013-02-26 17:48:47 +00:00
Allanis
4db96b636a [Add] Just a bit more sanity checking for music. 2013-02-26 16:54:25 +00:00
Allanis
804a6d73a0 [Add] seek/tell functions to packfile. Still using "streaming mode" though as it works better with vorbis. 2013-02-26 16:24:29 +00:00
Allanis
301ea07a69 [Change] ai/toolkit compilable under C99. I'll get to the rest of it at some point. 2013-02-26 16:10:35 +00:00
Allanis
d2e952fb88 [Change] Just some C correctiveness. 2013-02-26 15:47:56 +00:00
Allanis
f9c778358c [Fix] Allow for gameplay even if sound isn't working. 2013-02-26 13:54:41 +00:00
Allanis
6a02e903a5 [Add] More complete error checking for audio framework [sound]. 2013-02-24 19:00:15 +00:00
Allanis
439fce48c8 [Add] Combat rating based on mass of pilots killed. -- [Add] Player name. 2013-02-24 18:18:52 +00:00
Allanis
84558ae2c9 [Fix] Small correction in a memset from packfile 2013-02-24 18:01:15 +00:00
Allanis
5c02e0ecfd [Fix] You didn't know it. But you could target while on the pilot information menu. Not now.. 2013-02-24 18:00:11 +00:00
Allanis
ff217f68d6 [Fix] Ensure the game will pause when opening the pilot information window. 2013-02-24 17:58:48 +00:00
Allanis
efe9970854 [Add] Information and ship spec widows with keybins 'i' 
[Change] Cleaned up some MELEMENT sanity checks.
 2013-02-24 17:55:59 +00:00
Allanis
7d04d86146 [Change] Target hostile no longet picks up disabled ships when targetting nearest hostile. 2013-02-24 16:09:06 +00:00
Allanis
b55259321e [Add] Pushback effect for weapons. 2013-02-24 16:06:19 +00:00
Allanis
34a6be43df [Add] Merchant vessels are now able to go to hyperspace. 
[Change] Overpowered merchant ship a little for testing purposes.
 2013-02-24 15:40:34 +00:00
Allanis
14735a362d [Fix] Hm. Fixing locally the testing on a remote server means push and pull spam. :) 2013-02-23 21:43:26 +00:00
Allanis
c5c0f16915 [Fix] Another one. Sorry. 2013-02-23 21:41:51 +00:00
Allanis
54758a5de9 [Fix] Typo in non POSIX build of packfile. 2013-02-23 21:40:38 +00:00
Tamir Atias
166dcc95f7 [Change] Renamed main.* to lephisto.*. 2013-02-23 22:38:03 +02:00
Allanis
82ed9ac551 [Change] Just some cosmetic changes, and removed of bzero and strdup. 2013-02-23 20:30:49 +00:00
Allanis
13228c39d8 [Fix?] Eh, some more error checking to prevent seg faults. 2013-02-23 20:14:58 +00:00
Allanis
15599909a0 [Fix] Flakyness removed. :D 2013-02-23 20:12:06 +00:00
Allanis
b165e7b263 [Add] Set volume with command line, volume is a little flaky at the min. :s. 2013-02-23 19:55:30 +00:00
Allanis
a296bd7aa0 [Add] Support for non POSIX systems with open/read/write in packfile system 2013-02-23 19:21:13 +00:00
Allanis
5841d23f54 [Change] Sanitized lua ai api a little. 2013-02-23 17:53:31 +00:00
Allanis
565ebcc20c [Fix] Revisited the libvorbis fix. We wish to return 0 on close. 2013-02-23 00:53:40 +00:00
Allanis
351ff76858 [Fix] Potential bug with a libvorbis segfault. 2013-02-23 00:43:32 +00:00
Allanis
fca4c4e33f [Change] Removed some debugging I didn't mean to commit in. 2013-02-23 00:22:07 +00:00
Allanis
04014d4e9a [Fix] Woops. .wav sounds not loading into memory propperly. 2013-02-23 00:19:51 +00:00
Allanis
999bdc7c8a [Change] Just some small tweaks to sound. I am hunting a bug... 2013-02-22 23:22:59 +00:00
Allanis
fccd9dcc22 [Fix] Mkay. Sound seems to be working without any problems now. 2013-02-22 22:07:42 +00:00
Tamir Atias
b074bce927 Merge branch 'master' of https://github.com/Allanis/Lephisto 2013-03-04 21:19:51 +02:00
Tamir Atias
95421ee5de [Add] Initial mingw support for Windows. 2013-03-04 19:16:29 +00:00
Allanis
dcc0fc247b [Add] Sound base support. 2013-02-22 05:34:24 +00:00
Allanis
529ca21644 [Add] Audio engine is now working, it It's fully tuned enough yet however. 
[Change] Refactored ship.c to comply with xml.* standards.
 2013-02-22 04:06:47 +00:00
Allanis
afd612ef17 [Add] Basic audio framework and some sounds. Give me another 30 mins and it will work. :) 2013-02-22 01:59:19 +00:00
Allanis
ab4d06a707 [Add] OpenAL to makefile. Preparing for Audio enginey thing. 2013-02-21 23:42:47 +00:00
Allanis
b4565b9063 [Fix] Radar zoom in/out has been bugged for some time. No-one noticed apart from Laci, so I decided to give it a fix. 2013-02-20 21:43:15 +00:00
Allanis
9ad2837a39 [Fix] Screenshots will allow up to 128 shots now without overwriting. These will go to a nice screenshots directory for you. 2013-02-20 21:37:02 +00:00
Allanis
a0f90f9877 [Add] Just playing around, as I can't be bothered to do anything big. 2013-02-20 21:26:17 +00:00
Allanis
943886f53e [Change] Brightened up the green a little for the GUI console fonts 2013-02-20 21:19:14 +00:00
Allanis
376a3af395 [Add] Fade to white when hyperspacing. Might want to add sound to that later. 2013-02-20 21:10:39 +00:00
Allanis
c5fa395f17 [Fix] Few warnings from conf file and VERSION not loading into packed data file. 2013-02-20 20:59:35 +00:00
Allanis
5381ceed02 [Add] Restore health/armour when taking off from a planet. 2013-02-20 20:37:42 +00:00
Allanis
7e3bca1e51 [Change] Remove hard forcing of player speed and instead use incremental slowdown. 
[Fix] Pause would give instant travel. Not now!!
 2013-02-20 20:20:48 +00:00
Allanis
b2a887ba45 [Change] Improved transition into hyperspace a little. 2013-02-20 20:10:36 +00:00
Allanis
44c6ea6ed6 [Add] Rudementory Hyperspace travel. Still a work in progress. ;) 2013-02-20 19:34:30 +00:00
Allanis
19570b0f6a [Fix] Pause is handled on opening a window, but for safety it is best to handle pause on menu open. 
-- Forgot the menu files too..
 2013-02-19 23:25:15 +00:00
Allanis
100c605d6b [Add] Preleminary pause menu. 2013-02-19 23:23:15 +00:00
Allanis
1ecf7c1e54 [Fix] Primary weapons where borked on checking for ammunition. 2013-02-19 23:02:42 +00:00
Allanis
a99544804e [Add] Small boarding menu, along with a function to get windows based on name rather than id. 2013-02-19 22:58:10 +00:00
Allanis
7889035b29 [Add] Taking off after landing on a planet now has a direct affect on the system. 2013-02-19 22:22:48 +00:00
Allanis
bfc3582d1e [Change] pilot and star stack won't lower memory allocation now. 2013-02-19 22:17:31 +00:00
Allanis
f5834d33f9 [Add] Commodity exchange. The market is closed the minute. :P 2013-02-19 21:46:11 +00:00
Allanis
8f7df9fc2f [Add] Embed name on window creation rather than having the overhead of writing and positioning a block of text. 2013-02-19 21:38:57 +00:00
Allanis
4384adec98 [Add] Spaceport bar. (no missions or hirelings or alchol available yet). 2013-02-19 20:04:04 +00:00
Allanis
2c388ea1b0 [Add] News window and the concept of fuel. 2013-02-19 19:13:24 +00:00
Allanis
1307661363 [Add] We now have some unimplmented planet services. 2013-02-19 18:50:17 +00:00
Allanis
7b72a35b9e [Fix] Why are we reversing while we are already stopped dead? 2013-02-19 18:11:43 +00:00
Allanis
69476744b8 [Change] Forgot to remove debug statement. 2013-02-19 17:50:51 +00:00
Allanis
474d1df755 [Add] A reverse command for @KonoM as he does not know how physics works. 2013-02-19 17:44:20 +00:00
Allanis
59fc153454 [Change] Pulled default colours out of player.* and throw them in their rightful unit. 2013-02-19 15:43:34 +00:00
Allanis
9a9ace4a42 [Add] Text word wrapping/block text. Allowing for lovely descriptons of planets. 2013-02-19 14:18:55 +00:00
Allanis
d66e1a52f9 [Change] Font work was becoming a little too large to sit in opengl specific code. Moved to font.* 2013-02-19 12:24:55 +00:00
Allanis
74211a0825 [Add] Pause game when window is not focused. Introduced a small 10ms delay when paused to lower CPU usage. 2013-02-19 11:37:38 +00:00
Tamir Atias
f66f644411 Merge branch 'master' of https://github.com/Allanis/Lephisto 2013-02-19 02:43:02 +02:00
Tamir Atias
7034b2369c [Fix] Screenshots were saved as RGBA. Bad idea. 2013-02-19 02:42:37 +02:00
Allanis
13473611ae [Add] Actual landing image. 2013-02-19 00:41:47 +00:00
Allanis
9773d9b19a [Change] Planet target is rendered behind ships and weapons. 2013-02-19 00:15:32 +00:00
Allanis
bf9d422150 [Add] Support for images of planets within toolkit. 
[Change] blit functions use doubles instead of vectors.
[Change] Took some time out to clean up space.c bringing it up to xml.h standards.
 2013-02-19 00:10:57 +00:00
Allanis
d19f8c4ae8 [Add] More sane toolkit API. -- Improved landing graphics. 
[Change] Moved colours out of opengl specific stuff.
 2013-02-18 18:37:19 +00:00
Allanis
074e60afa5 [Add] Finished the basic toolkit by rounding off corners, adding gl_printMax and gl_printMid. 
[Add] Use flag system with gl_screen.
  -- Optional AA for primitives.
 2013-02-18 17:12:35 +00:00
Allanis
268b5dcaa0 [Fix]? Attempted to fix seg fault on AI trying to switch to secondary weapons when there is none available. 2013-02-17 23:30:40 +00:00
Allanis
8eb62f218f [Fix] Woops. Maybe it was me.. 2013-02-17 22:47:40 +00:00
Allanis
ba4b7239d4 [Change] Some tweaks to GL rendering. - I should point out, It wasn't me whom broke the textures. :P 2013-02-17 22:45:19 +00:00
Allanis
811fc0b92a [Change] What in the world was I thinking with the gui crap?? Large refactoring.. 2013-02-17 21:56:57 +00:00
Allanis
2a713437a2 [Fix] Pause on landing on a planet. 2013-02-17 20:18:16 +00:00
Allanis
f941608fd8 [Fix] Oops. Landing was based upon velocity alone, instead of distance and velocity. 2013-02-17 19:53:06 +00:00
Allanis
14e525078e [Add] Basic toolkit for window/widget rendering etc. 
[Add] Landing.
 2013-02-17 19:51:31 +00:00
Allanis
9899458f91 [Change] moved FreeSans.ttf to font.ttf simply to make things more comfortable later. 2013-02-17 17:37:16 +00:00
Tamir Atias
326b475923 [Fix] Renamed time to gtime and made it global as it is used in pause.c 2013-02-17 02:52:52 +02:00
Tamir Atias
61f1069542 [Fix] time(NULL) segfaulting stuff. 2013-02-17 02:50:37 +02:00
Allanis
c0cc0a9346 [Add] Start of toolkit framework, we will manage windows etc here. 
[Add] Pause/Resume
 2013-02-16 20:01:00 +00:00
Allanis
67480a47e3 [Change] Finished cleaning input. Making way for toolkit. 2013-02-16 12:56:29 +00:00
Allanis
e6057d04af [Change] Still cleaning. Adding all the input crap to it's rightful place. 2013-02-16 12:09:21 +00:00
Allanis
95ac1a61d7 [Change] Still cleaning up the place. 
-- Basically just moving things into conf.c to make things cleaner.
  -- Got to get the input out player.c That file is wayyyy too big.
 2013-02-15 23:51:20 +00:00
Allanis
2d797b9d52 [Add] Split configuration processing into seperate files, namely conf.* 
-- Managed to clean up main.c a little.
 2013-02-15 22:43:49 +00:00
Allanis
d57bcd0484 [Fix] Slight change to pack file to append '\0' to string. 2013-02-15 20:48:55 +00:00
Allanis
7e013e5b91 [Add] AI Lua API calls for secondary weapons. 2013-02-15 20:26:41 +00:00
Allanis
a6c9a00cf5 [Add] Updated documentation crap. 
[Fix] Warning on 64bit machines.
 2013-02-15 19:08:38 +00:00
Allanis
e3c2ca72ac [Add] Planet targeting/landing framework. 
[Change] Seperated update/render as it should be.
 2013-02-15 18:15:06 +00:00
Allanis
ef108e9f2e [Change] Small change to secondary weapon display. 2013-02-15 09:24:53 +00:00
Allanis
36f1936667 [Add] Secondary weapons. 
[Add] Preliminary seeker missile.
 2013-02-15 07:31:59 +00:00
Allanis
627240c5a4 [Change] Now we can get confused as to when to use Color and Colour. Won't that be fun? 2013-02-15 02:57:51 +00:00
Allanis
dc9f089abe [Fix] *Now* it's fixed.. Forgot to correct lua and xml files. 2013-02-15 02:34:40 +00:00
Allanis
ad006788c5 [Fix] Oops. Forgot to run that hack on header and text files.. 2013-02-15 02:22:35 +00:00
Allanis
2b3852c25b [Fix] Guess who found out the correct spelling of armour! 
-- find . -iname \*.c -exec sed -i -e "s/armor/armour/g" {} \;
 2013-02-15 02:18:09 +00:00
Allanis
263256974d [Add] 'f' key to face target. 2013-02-14 20:52:24 +00:00
Allanis
70c9585302 [Add] Rudimentary screenshots. 2013-02-14 19:29:26 +00:00
Allanis
7dbe3d2598 [Add] It is now possible to disable ships - No death yet. 
[Add] Player start location. ship etc can now be defined in data file.
 2013-02-14 17:55:31 +00:00
Allanis
e269911055 [Fix] S credits was giving bogus output values. 2013-02-14 16:15:37 +00:00
Allanis
23cb72bffd [Add] Utilising all GUI elements. 
-- Minimal right now.
 2013-02-14 16:07:19 +00:00
Allanis
9fae81c389 [Fix] AI's landing, it's still not as good as I wish however. 
[Add] A few more xml macros and cleaned up a little code to use them.
 2013-02-14 14:25:32 +00:00
Allanis
184d527abf [Add Gui's NAV and WEAPON monitors are now utilised. 2013-02-13 18:57:44 +00:00
Allanis
6ace8da900 [Add] New ship: Leapard! 2013-02-13 16:42:42 +00:00
Allanis
c4e7a8a9ee [Change] Thrown XML crap into a single header. 
-- player.c currently uses this.
 2013-02-13 15:48:36 +00:00
Allanis
b75f0f1d6b [Fix] Squished an offset bug in splite britting. 2013-02-13 14:38:01 +00:00
Allanis
053d7b75b6 [Change] Target color changes based on target. 2013-02-13 14:30:17 +00:00
Allanis
74ed3e094b [Add] New GUI. 
[Fix] Circular radar.
 2013-02-13 13:59:38 +00:00
Allanis
d288a2db9f [Fix] Silly collision bug. Pixel-Perfect collision should now be *perfect*(tm). 2013-02-12 20:22:35 +00:00
Allanis
e1b23f928b [Change] GUI's are now saved in XML and thrown into data pack file. 
-- This allows for multiple gui's.
  -- Each ship can also have it's own gui if it so chooses.
 2013-02-12 19:34:47 +00:00
Allanis
e0f78e40a3 [Add] Absolutely nothing. Just need my commit for the day. Too lazy to code. 2013-02-11 19:42:33 +00:00
Allanis
34b01c7545 [Add] More input error checking and safety crap. 
-- This also fixes a segmentation fault on application close.
 2013-02-10 21:45:06 +00:00
Allanis
3db7241663 [Fix] Configuration file issues. 2013-02-10 21:06:08 +00:00
Allanis
29b8b5ba18 [Add] A few more AI calls. 
[Add] Ai protection and some tweaks.
  -- eg. Once armor/shield is regenerated, enemy will come back for another round.
 2013-02-10 18:32:02 +00:00
Allanis
74161ff223 [Change] Adding a little more distance on ship start locations. 2013-02-10 05:35:41 +00:00
Allanis
a89395a54f [Add] We can now have multiple enemies. 
[Add] You are able to get other ship's health from AI now.
 2013-02-10 05:21:09 +00:00
Allanis
f107574b38 [Fix] Silly hostility bug. 2013-02-10 04:20:27 +00:00
Allanis
f6f1677614 [Add] keybinding 'r' to grab nearest enemy target -- Tamir's request. 2013-02-10 04:12:05 +00:00
Allanis
d1c02773bf [Add] Enemies are now propperly parsed. 
[Add] Chance for pirate to come and rampage.
[Fix] Actually got that buffer overflow in ai.
 2013-02-09 22:06:02 +00:00
Allanis
9d57f0ddfc [Add] About time I added timer support for AI. 
[Fix] Buffer overflow in AI.
 2013-02-09 18:58:50 +00:00
Allanis
eac16dacdd [Fix] control_rate is now applied properly. 
[Fix] Targetted now renders over the pilot's below.
 2013-02-09 16:11:53 +00:00
Allanis
58e7c9b3d7 [Add] Ai profile support. 2013-02-09 00:53:37 +00:00
Allanis
08f9cb3781 [Add] Ai now responds on being attacked. 2013-02-08 20:26:39 +00:00
Allanis
acf4150079 [Add] Per pixel collision. 
[Fix] Fleets now start at random location.
    -- Still needs improvement.
 2013-02-08 18:29:07 +00:00
Allanis
28c5b6ea73 [Fix] Last commit was crappy. 2013-02-08 16:43:53 +00:00
Allanis
91f29c9511 [Add] AI API functions, faction checks 2013-02-08 16:38:44 +00:00
Allanis
fd3f3a78b6 [Fix] Small graphics bug. 2013-02-08 16:10:31 +00:00
Allanis
d46f509ee5 [Add] Faction system almost done. 
[Add] Fleets almost complete, just need to randomize start location.
 2013-02-08 16:04:24 +00:00
Allanis
6dad718ef2 [Add] Random number generator to lua/ai. 2013-02-08 14:34:09 +00:00
Allanis
943cbecf70 [Add] Fleets. Not actually making use of them yet though. 
[Add] More error checking for XML files
 2013-02-08 14:26:53 +00:00
Allanis
2be93f741c [Fix] Freeing of video modes. 2013-02-08 00:19:02 +00:00
Allanis
a392c2c67b [Add] Faction support. 2013-02-07 23:59:17 +00:00
Allanis
2e78211acd [Fix] Pack file was using logical operator instead of asignment. :/ 2013-02-07 22:48:31 +00:00
Allanis
c15699606b [Fix] Major bug in weapon.c. 
-- I believe it is a fix, but as only VLack can create the crash I am just guessing.
 2013-02-07 22:25:30 +00:00
Allanis
5386ad0f82 [Fix] I don't quite understand this. Lua error on intel with ';' at end statements. 2013-02-07 21:44:45 +00:00
Allanis
d112edc90b [Change] Reducing text timeout. 2013-02-07 21:33:43 +00:00
Allanis
d2c548218d [Add] Message system. 
[Fix] Spinning lazer thingy.
 2013-02-07 20:54:34 +00:00
Allanis
27fa5d774f [Add] Planets in minimap - Never lose the planet again!! 
[Add] NPC's in minimap have different colors based on faction.
 2013-02-06 23:49:22 +00:00
Allanis
09f6aea97e [Add] Targetting!!! 2013-02-06 22:21:00 +00:00
Allanis
c2ec11a7c3 [Add] Zoom in/out, for minimap. 
[Add] Weapons are now displayed on minimap.
 2013-02-06 20:24:45 +00:00
Allanis
7d4f94acc7 [Fix] Fixed armor/shield regeneration. 2013-02-06 19:41:10 +00:00
Allanis
8943c9322b [Fix] Shield/Armor bars work correctly now. 2013-02-05 23:44:08 +00:00
Allanis
1024eb02e2 [Fix] Vectors for enemy location on minimap. 2013-02-05 23:33:20 +00:00
Allanis
4d7c01f078 [Add] Basic Gui. 
-- Minimap.
  -- Health bars.
 2013-02-05 23:10:46 +00:00
Allanis
1fa45f1ff2 [Add] Pack features woo!! (list files). 2013-02-05 20:42:06 +00:00
Allanis
f220145d7d [Add] Radial collision detection. 
[Add] Pilots now take damage.
 2013-02-05 20:12:09 +00:00