Commit Graph

25 Commits

Author SHA1 Message Date
Amy Ackermann 4df99914d0 Merge pull request #32 from devnexen/wrong_type_checking
Wrong comparison between pointers and integral type.
2018-07-30 09:16:02 -07:00
David Carlier 76d2e2b9a6 Wrong comparison between pointers and integral type. 2018-07-30 16:51:24 +01:00
Amy Ackermann b6d879d510 Merge pull request #29 from devnexen/further_changes
Non-trivial copiable object fixes, limited to the engine's itself
2018-07-29 11:36:43 -07:00
David Carlier 06d2ef6101 Non-trivial copiable object fixes, limited to the engine's itself
not the third parties parts.
2018-07-29 19:31:47 +01:00
Amy Ackermann c143d43fc6 Merge pull request #28 from devnexen/odr_fix
Resolve ODR conflict in mesh loaders via unique namespaces.
2018-07-29 09:17:53 -07:00
David Carlier bc432345a4 namespace for both types 2018-07-29 17:15:29 +01:00
David Carlier 3928570ce4 Further changes 2018-07-28 19:19:42 +01:00
David Carlier 3dacda7522 One unit compil has similar struct but the signess differ. 2018-07-28 18:05:42 +01:00
Amy Ackermann e48196dcbe Merge pull request #25 from powercat/patch-1
Fix typo in readme: /.../ -> /../ in a path
2018-07-27 15:42:46 -07:00
Olivier 7e5a0d17bf Changed ... to .. in the file path
Changed ... to .. in the file path on line 29
2018-07-27 15:36:32 -07:00
Amy Ackermann 0355343d82 Merge pull request #23 from Johnnynator/musl
Resolve name conflict present with Musl libc
2018-07-27 10:07:51 -07:00
Amy Ackermann 67b93df619 Merge pull request #20 from db48x/float-in-shader
Fix implicit conversion from int to float in distant_faded_icon_ps.txt, which isn't accepted by some hardware.
2018-07-26 17:17:11 -07:00
JonMicheelsen 65aab37edf Ups, that lightmap was raw bake resolution :P 2018-07-27 00:23:37 +02:00
JonMicheelsen feaa13de78 Merge branch 'master' of https://github.com/BlindMindStudios/StarRuler2-Source 2018-07-27 00:13:45 +02:00
JonMicheelsen e38eb67b97 To celebrate the Open Sourcing, here's two complete unreleased shipsets, Bromma and Farum!
Note CC-BY-NC still applies!
2018-07-27 00:09:03 +02:00
Daniel Brooks 43e09c80eb fix the float
fixes #16
2018-07-26 13:48:53 -07:00
John Zimmermann 82600b3e2e game/render/font_ft2.cpp: PAGE_SIZE -> FONT_PAGE_SIZE to fix naming conflict with musl libc 2018-07-26 22:05:48 +02:00
Amy Ackermann 55c9f89f14 Merge pull request #6 from DaloLorn/master
The client now tries to fetch Steam Workshop mods if inserted into a Steam copy of the game.
2018-07-26 09:06:34 -07:00
DaloLorn e96836d55b The client now tries to fetch Steam Workshop mods if inserted into a Steam copy of the game. (It does not, technically, know if it's in a Steam build, but it'll fail just as gracefully as it would if the "mods" directory were missing... *quite* gracefully, thank-you-very-much.) 2018-07-23 17:48:48 +02:00
Lucas de Vries dad50e1b02 Fix typo in README. 2018-07-21 23:38:45 +02:00
Lucas de Vries ceb01e6c85 Remove updater option from main menu. 2018-07-17 16:36:17 +02:00
Lucas de Vries 53ddbadefa Remove updater from main menu, unlock woth by default. 2018-07-17 16:27:10 +02:00
Lucas de Vries b19a4c613d Fixes for newer GCC version. 2018-07-17 16:21:11 +02:00
Lucas de Vries badcf74513 Changes for linux compile. 2018-07-17 15:43:13 +02:00
Lucas de Vries cc307720ff Open source Star Ruler 2 source code! 2018-07-17 14:15:37 +02:00