eb16ec68a9
Merge pull request #73 from kb-1000/xwayland-fix
...
Fix crash on Xwayland
2020-02-10 09:10:49 -08:00
35a493cfa3
Fix crash on Xwayland
2020-02-10 17:37:08 +01:00
a8def84fc9
Merge pull request #51 from Michael-Phoenix/master
...
Fix for "front() called on empty vector" Errors on debug builds.
2018-09-26 20:18:14 +02:00
9481d94c98
Fix for "front() called on empty vector" Errors on debug builds.
...
Now using the C++11 vector.data() to fetch the proper pointer instead of $vector.front()
- Which fails on empty vectors because of the standard compiler setting _ITERATOR_DEBUG_LEVEL=2 when debugging
2018-09-26 19:23:46 +02:00
6e97ea92a7
Merge pull request #46 from l29ah/master
...
do not disable cpu-specific optimizations
2018-09-26 12:19:09 +02:00
565d3f9aa5
Merge pull request #47 from l29ah/ancient-ruins
...
Clarify the Ancient Ruins building (un)usefulness
2018-09-26 12:18:59 +02:00
9e7dae60be
Merge pull request #49 from l29ah/int-overflow-warning
...
source/game/obj/object.h: don't complain about int overflow
2018-09-26 12:18:40 +02:00
75eac05e2e
source/game/obj/object.h: don't complain about int overflow
...
./source/game/obj/object.h:19:49: warning: result of ‘(255 << 26)’ requires 35 bits to represent, but ‘int’ only has 32 bits [-Wshift-overflow=]
const unsigned ObjectTypeMask = (unsigned)(0xFF << ObjectTypeBitOffset);
~~~~~^~~~~~~~~~~~~~~~~~~~~~
2018-09-26 11:41:34 +03:00
6ebe079d62
Clarify the Ancient Ruins building (un)usefulness
2018-09-25 14:09:39 +03:00
c295e25d26
do not disable cpu-specific optimizations
2018-09-24 14:39:30 +03:00
ba99a9a308
Merge pull request #33 from devnexen/clang_build
...
Make the build more clang friendly
2018-07-30 09:16:33 -07:00
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
76d2e2b9a6
Wrong comparison between pointers and integral type.
2018-07-30 16:51:24 +01:00
166ca857fd
Make the build more clang friendly
2018-07-30 16:50:07 +01:00
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
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
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
bc432345a4
namespace for both types
2018-07-29 17:15:29 +01:00
3928570ce4
Further changes
2018-07-28 19:19:42 +01:00
3dacda7522
One unit compil has similar struct but the signess differ.
2018-07-28 18:05:42 +01:00
e48196dcbe
Merge pull request #25 from powercat/patch-1
...
Fix typo in readme: /.../ -> /../ in a path
2018-07-27 15:42:46 -07:00
7e5a0d17bf
Changed ... to .. in the file path
...
Changed ... to .. in the file path on line 29
2018-07-27 15:36:32 -07:00
0355343d82
Merge pull request #23 from Johnnynator/musl
...
Resolve name conflict present with Musl libc
2018-07-27 10:07:51 -07:00
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
65aab37edf
Ups, that lightmap was raw bake resolution :P
2018-07-27 00:23:37 +02:00
feaa13de78
Merge branch 'master' of https://github.com/BlindMindStudios/StarRuler2-Source
2018-07-27 00:13:45 +02:00
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
43e09c80eb
fix the float
...
fixes #16
2018-07-26 13:48:53 -07:00
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
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
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
dad50e1b02
Fix typo in README.
2018-07-21 23:38:45 +02:00
ceb01e6c85
Remove updater option from main menu.
2018-07-17 16:36:17 +02:00
53ddbadefa
Remove updater from main menu, unlock woth by default.
2018-07-17 16:27:10 +02:00
b19a4c613d
Fixes for newer GCC version.
2018-07-17 16:21:11 +02:00
badcf74513
Changes for linux compile.
2018-07-17 15:43:13 +02:00
cc307720ff
Open source Star Ruler 2 source code!
2018-07-17 14:15:37 +02:00
Amy Ackermann