Commit graph

702 commits

Author SHA1 Message Date
Jeremy Bullock
93c27a36d0 removed debug code 2016-07-02 23:40:23 -06:00
Jeremy Bullock
3c545e0522 removed duplicate code 2016-07-02 23:35:53 -06:00
Jeremy Bullock
733ddbef67 hid gui elements if pixels selected 2016-07-02 23:30:00 -06:00
Campbell Barton
f2d492861f CMake: use multi-line defines
Easier to read and avoids merge conflicts
2016-07-02 22:23:18 +10:00
Campbell Barton
c39a8a4b75 Correct incorrect delete 2016-07-02 22:22:01 +10:00
Campbell Barton
4b2c78d518 Linux Docs: add libpng16 to deps 2016-07-02 15:04:40 +10:00
Campbell Barton
04a69ac821 Linux Docs: add git to build deps 2016-07-02 14:27:14 +10:00
Campbell Barton
268e1b4036 CMake: quiet warnings
- OBJCSOURCES was being used but undefined (set to empty)
- RC_FILE was being used on Linux/OSX, this is only for WIN32.
2016-07-02 09:21:15 +10:00
Shinya Kitaoka
fb022e94eb Merge pull request #555 from janisozaur/filebrowser
Fix wrong field access in filebrowser.cpp
2016-07-01 23:56:56 +09:00
Shinya Kitaoka
c89cd4d785 Merge pull request #559 from ideasman42/tcenter-line-pr
Fix checking the left-node before operating on the right
2016-07-01 23:56:34 +09:00
Michał Janiszewski
e4fe1a0954 Use OS X & Linux jobs on travis 2016-07-01 15:16:24 +02:00
Shinya Kitaoka
b9016690ed Merge pull request #553 from janisozaur/isnan
isnan fixes
2016-07-01 20:53:04 +09:00
Shinya Kitaoka
3a82d02659 Merge pull request #556 from janisozaur/virtual
Mark TTileSet destructor as virtual
2016-07-01 20:44:23 +09:00
Michał Janiszewski
839913e1f5 travis scripts 2016-07-01 12:11:51 +02:00
Michał Janiszewski
6dc4b98871 Transparently use lzma, if available in system
It will get picked up by libtiff, so make sure we provide it when
linking libimage
2016-07-01 12:11:51 +02:00
Michał Janiszewski
de3c4ac6e4 Travis for Linux 2016-07-01 12:11:51 +02:00
Michał Janiszewski
9258754773 Merge remote-tracking branch 'my_github/isnan' into travis-base 2016-07-01 12:11:21 +02:00
Jeremy Bullock
0049ac939d removed image dpi modification 2016-06-30 23:49:53 -06:00
Jeremy Bullock
20a966a908 set stage::inch to 120 2016-06-30 23:46:29 -06:00
Jeremy Bullock
b99ed3bab6 added shun-iwasawa's suggestions 2016-06-30 21:41:31 -06:00
Jeremy Bullock
5e3b5e8cc3 Merge branch 'master' into pixels 2016-06-30 20:57:15 -06:00
Campbell Barton
d89022ce19 Fix checking the left-node before operating on the right 2016-07-01 09:38:27 +10:00
Michał Janiszewski
1d0596c8d8 Prevent containerH being used after it was freed 2016-06-30 17:25:47 +02:00
Michał Janiszewski
38816b00c9 Fix argument assignment in TaskId 2016-06-30 17:20:50 +02:00
Michał Janiszewski
dfbb44814b Mark TTileSet destructor as virtual
This class gets inherited, yet the destructor is not marked as virtual.
2016-06-30 17:17:40 +02:00
Michał Janiszewski
d73986b938 Fix wrong field access in filebrowser.cpp 2016-06-30 17:13:26 +02:00
Michał Janiszewski
01e73f88e4 Add support for libpng<1.5 2016-06-30 15:21:57 +02:00
Michał Janiszewski
b86749e216 isnan fixes
isnan was used without specifying namespace
2016-06-30 13:42:20 +02:00
Campbell Barton
78b2e3a02b CMake: search for the .so file first
The pre-compiled .a file for OSX caused linking error on Linux.
2016-06-30 19:24:04 +10:00
Campbell Barton
bbd0f1b769 Search for dynamically linked superlu 2016-06-30 18:03:11 +10:00
Campbell Barton
0499d0d542 Merge pull request #550 from janisozaur/sdl2-includes
Fix SDL includes in tnzbase
2016-06-30 17:46:09 +10:00
Michał Janiszewski
c8607f3d7a Fix SDL includes in tnzbase
SDL headers are installed to /usr/include/SDL2 which was in conflict
with explicit way they were included previously.
2016-06-30 10:55:55 +02:00
Jeremy Bullock
e442b14c1f Updated windows build instructions 2016-06-30 00:08:25 -06:00
Campbell Barton
2e1cb68b4e CMake: wrap lines for easier reading 2016-06-30 14:37:43 +10:00
Campbell Barton
620578b1a0 Fix missing array specifier from delete 2016-06-30 14:37:43 +10:00
turtletooth
3db6439c7a Merge pull request #510 from shun-iwasawa/add_search_to_shortcutpopup
Configure Shortcuts popup optimized
2016-06-29 21:56:39 -06:00
Campbell Barton
6aa05c353f Minor edits to Linux how-to-build doc 2016-06-30 13:54:19 +10:00
Campbell Barton
3cb5de860c Linux support working on a basic level (builds and runs)
Add docs on building with Linux.
2016-06-30 13:51:59 +10:00
Campbell Barton
bb2501c991 CMake: Include liblzo2.so in FindLZO 2016-06-30 13:15:56 +10:00
Campbell Barton
d869b5f8e6 Quiet -Wundef warning
Exposes accidental typos when checking exact values of a define.
2016-06-30 12:28:26 +10:00
Campbell Barton
7aaaec233a CMake: find module formatting
Split find_path, find_library across multiple lines
makes it easier to read and diff against.
2016-06-30 11:09:11 +10:00
Campbell Barton
b130eca2da Workaround using C's abs on Linux
math.h is indirectly included, making abs return double on Linux.
2016-06-30 10:41:38 +10:00
Campbell Barton
b45a54792d CMake: write Linux output into bin/
Resolves naming collisions between directories and binaries.
2016-06-30 10:13:38 +10:00
Campbell Barton
1c6681c983 Merge pull request #525 from ideasman42/linux-opengl-pr
Changes needed to build OpenGL files with Linux
2016-06-30 08:25:57 +10:00
Campbell Barton
f493896cc0 Cleanup: typo (sensibility) 2016-06-29 20:49:17 +10:00
shun-iwasawa
55327d15ae Merge pull request #467 from ideasman42/linux-tsound-pr
Linux support for tsound (SDL2), from pr #51
2016-06-29 18:55:41 +09:00
Shinya Kitaoka
00c547d5c1 Merge pull request #521 from janisozaur/aligner-type
Rename aligner_type redefinitions
2016-06-29 18:55:30 +09:00
Shinya Kitaoka
d1f6c4e95b REFACTORING: Add final specifiers (#537)
* add final specifiers

* apply clang-format

* fix for macOS
2016-06-29 15:17:12 +09:00
Shinya Kitaoka
91695244e8 Merge pull request #532 from shun-iwasawa/fix_infoviewer_text_color
Fix File Info text color
2016-06-29 12:56:16 +09:00
Michał Janiszewski
5387bee4bd Rename aligner_type redefinitions 2016-06-27 08:33:20 +02:00