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

454 Commits

Author SHA1 Message Date
Allanis
927280f778 [Fix] Death explosions. 2013-03-20 21:36:32 +00:00
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