Allanis
|
0d0c21738b
|
Merge branch 'testing'
Conflicts:
locperday.sh
|
2013-06-23 00:12:23 +01:00 |
|
Allanis
|
a2ee4ea0ee
|
[Change] Optimised image loading, loading graphics once only.
|
2013-06-23 00:10:58 +01:00 |
|
Allanis
|
2e05c5d153
|
[Fix] There.
|
2013-06-22 22:40:33 +01:00 |
|
Allanis
|
aacdea005a
|
[Add] locperday.sh A nice little piece to see how many lines of code you wrote today.
|
2013-06-22 22:39:04 +01:00 |
|
Allanis
|
53f1da128c
|
[Change] Make ships appear to enter from hyperspace, I'm not completely satisfied yet.
|
2013-06-22 22:01:19 +01:00 |
|
Allanis
|
9cfb07eb59
|
[Change] Lowered threshold to skip frames (now under 4FPS skips).
|
2013-06-22 21:50:11 +01:00 |
|
Allanis
|
7fd06bd265
|
[Fix] Doxygen comments.
|
2013-06-22 21:48:25 +01:00 |
|
Allanis
|
fc80c1c69f
|
Merge pull request #6 from Allanis/c89comments
C89comments
|
2013-06-22 13:24:49 -07:00 |
|
Steven Arnow
|
858295b3f4
|
Ahem. Forgot headers. Apparently, all the source/header should be updated. Woops
|
2013-06-22 22:17:28 +02:00 |
|
Steven Arnow
|
a2bb0df939
|
All C++-comments in src/ should now be C89 comments
|
2013-06-22 22:10:25 +02:00 |
|
Allanis
|
d8705a6f7a
|
[Fix] New player cleanup stuff.
|
2013-06-22 20:43:57 +01:00 |
|
Allanis
|
c536ede0fb
|
[Add] A ton more planets and systems with some new planet interior and exterior graphics.
|
2013-06-22 20:13:28 +01:00 |
|
Allanis
|
d62ea5123d
|
[Fix] <resedit> Remove commodities tag if the planet has no commodities.
|
2013-06-22 19:45:02 +01:00 |
|
Allanis
|
0bc8a4a6d9
|
[Fix] <resedit> Can't jump paths to self.
|
2013-06-22 19:39:15 +01:00 |
|
Allanis
|
0d5c77525b
|
[Change] Filled out collective space.
|
2013-06-22 19:34:20 +01:00 |
|
Allanis
|
d195480622
|
[Change] Formalized space station types.
|
2013-06-22 19:21:51 +01:00 |
|
Allanis
|
badce25b9b
|
[Fix] Mission stuff.
|
2013-06-22 19:14:38 +01:00 |
|
Allanis
|
fc41a1789e
|
Merge pull request #5 from Allanis/resources
Resources: Done.
|
2013-06-22 10:14:04 -07:00 |
|
Steven Arnow
|
efa8b80eb9
|
Added NULL-pointer check for testing purposes
|
2013-06-22 18:51:14 +02:00 |
|
Allanis
|
084230caed
|
[Add] Forgot images and stuff...
|
2013-06-22 17:33:02 +01:00 |
|
Allanis
|
03ca0bf5d2
|
[Add] Adding a ton more systems, optimised graphics etc.
|
2013-06-22 17:19:13 +01:00 |
|
Allanis
|
883523e1e5
|
[Fix] Another seg fault with music system when disabled.
|
2013-06-22 15:37:56 +01:00 |
|
Allanis
|
38d1f8e65e
|
[Fix] <resedit> Saving exterior gfx if it is None.
|
2013-06-22 15:17:36 +01:00 |
|
Allanis
|
1396676fcb
|
[Add] <resedit> Edit the bar description text.
|
2013-06-22 15:15:32 +01:00 |
|
Allanis
|
72f0a93c30
|
[Add] <resedit> Changing planet class is supported now.
|
2013-06-22 14:36:03 +01:00 |
|
Allanis
|
dca1a33c36
|
[Fix] Problems with system with one unlandable planet.
|
2013-06-21 23:30:10 +01:00 |
|
Allanis
|
98443fd466
|
[Add] <resedit> You can now edit planet descriptions.
|
2013-06-21 23:16:19 +01:00 |
|
Allanis
|
f205c0f3c3
|
[Add] <resedit> You can now set planet graphics. [Fix] Commodity adding.
|
2013-06-21 22:27:40 +01:00 |
|
Allanis
|
3f269033be
|
[Fix] Segfault when running Lephisto muted.
|
2013-06-21 22:02:21 +01:00 |
|
Allanis
|
87514e63a7
|
[Add] <resedit> You can modify planet commodities now.
|
2013-06-21 21:51:49 +01:00 |
|
Allanis
|
2103fecfc4
|
Merge branch 'testing'
|
2013-06-21 21:00:49 +01:00 |
|
Allanis
|
5715bc91a5
|
[Add] <resedit> Main window to control subwindows.
|
2013-06-21 21:00:14 +01:00 |
|
Allanis
|
f5039ca320
|
[Change] Cosmetic tweakage.
|
2013-06-21 20:34:01 +01:00 |
|
Allanis
|
8f87ad0392
|
[Fix] <resedit> Fixed creating new systems not allowing you to add fleets.
|
2013-06-21 20:18:50 +01:00 |
|
Allanis
|
db5d405f47
|
[Change] Increased universe view for more easy usage.
|
2013-06-21 20:02:29 +01:00 |
|
Allanis
|
a0fe785fe2
|
[Add] <resedit> hacked together chance for multiple fleets with differenct chance of the same type.
|
2013-06-19 21:55:13 +01:00 |
|
Allanis
|
39578da94d
|
Merge branch 'testing'
Conflicts:
utils/resedit/space.py
|
2013-06-18 22:22:54 +01:00 |
|
Allanis
|
9c7f862f2c
|
[Add] <resedit> You may now add fleets to systems.
|
2013-06-18 22:21:05 +01:00 |
|
Allanis
|
741aa3b5d5
|
[Change] Imroved sanity somewhat.
|
2013-06-18 21:37:41 +01:00 |
|
Allanis
|
a9ad3298ac
|
[Add] You may now remove fleets from systems.
|
2013-06-18 21:04:56 +01:00 |
|
Allanis
|
d054492693
|
Eash. Merging branch testing..
Conflicts:
utils/resedit/faction.pyc
utils/resedit/factions.glade
utils/resedit/planets.glade
utils/resedit/space.glade
utils/resedit/space.py
utils/resedit/space.pyc
|
2013-06-16 17:17:54 +01:00 |
|
Allanis
|
c4f0d39319
|
[Add] <resedit> Now see the fleets ance chance each system has to generate fleet.
|
2013-06-16 17:11:55 +01:00 |
|
Allanis
|
2af4c92d88
|
[Add] <resedit> Split glades up.
|
2013-06-16 16:40:41 +01:00 |
|
Allanis
|
47cf24d254
|
[Fix] A* bugs where because of a typo. Changed to Djikstra now though.
|
2013-06-16 16:24:39 +01:00 |
|
Allanis
|
bc0ebf678e
|
[Fix] Pathfinding doesn't seg fault anymore?
|
2013-06-16 16:05:04 +01:00 |
|
Allanis
|
7547bb80c5
|
[Change] Exiting from a game drops you to main menu instead of simply quiting.
|
2013-06-16 12:45:51 +01:00 |
|
Allanis
|
5800461f1d
|
[Add] Possibility to delete save games.
|
2013-06-16 02:25:04 +01:00 |
|
Allanis
|
2120f5da90
|
[Fix] Accidently used assignment operator rather than logical to check if a file exists. :/
|
2013-06-16 02:09:58 +01:00 |
|
Allanis
|
234a73635c
|
[Fix] Forgot to load snd/music.lua into packfile.
|
2013-06-16 01:12:59 +01:00 |
|
Allanis
|
25cd9e3ae5
|
[Fix] type trying to enable a button.
|
2013-06-15 20:29:11 +01:00 |
|