Commit Graph

1557 Commits

Author SHA1 Message Date
Sam Edwards 6efb07de93 Merge branch 'master' into cmake 2018-05-14 19:09:14 -06:00
Sam Edwards c81229c1a8 pfmprogs: Rename config_pfm to config_pfmprogs 2018-05-14 02:36:42 -06:00
Sam Edwards 52e7c952b3 putil: Rename config_util to config_putil 2018-05-14 02:36:42 -06:00
Sam Edwards 87c11d8018 pstatclient: Rename config_pstats to config_pstatclient 2018-05-14 02:36:42 -06:00
Sam Edwards 95785407a3 CMake: General whitespace fixes
- Remove trailing whitespace from ends of lines
- Convert tabs to (two) spaces
2018-04-20 02:30:04 -06:00
Sam Edwards 1fcb8a2748 CMake: Skip optional subdirectories in a cleaner way
Instead of wrapping the whole subdirectory's CMakeLists in
a gigantic if block, we use if(NOT HAVE_FOO) + return()

This is tidier since it keeps the indentation generally consistent
across all CMakeLists files.
2018-04-20 02:26:47 -06:00
Sam Edwards 56a6e6a80a Merge remote-tracking branch 'origin/master' into cmake 2018-04-20 01:57:46 -06:00
Sam Edwards d642ca4fa0 CMake: Change linkages to go through metalibs
This changes the target_link_libraries() declarations so they only
go directly to a component library if it's in the same metalib.

If it's outside of the metalib, the correct thing to do is link against
the metalib. CMake takes care of the transitive linking for us, so
there isn't actually any big change here.
2018-04-15 01:10:21 -06:00
rdb 607af9ff49 flt: fix compile error on macOS 10.6 (which has no strnlen) 2018-04-10 15:29:43 +02:00
rdb e9ae7dcc40 Use vector_uchar instead of string for binary network/file data
This distinction allows us to better support Python 3, since it will raise exceptions when trying to put arbitrary binary data in a str object.

This also adds some convenience functions for efficiently initializing a Datagram or PTA_uchar from a vector_uchar.
2018-04-02 23:17:14 +02:00
Sam Edwards 84e7539f99 Merge branch 'master' into cmake 2018-02-17 23:35:19 -07:00
Sam Edwards e15cea4331 general: Remove more unnecessary +x UNIX modes 2018-02-07 11:29:48 -07:00
Sam Edwards eda119dac4 Merge branch 'master' into cmake
# Conflicts:
#	.travis.yml
2018-02-04 17:12:51 -07:00
rdb 4b4e11c085 egg-palettize: implement mirror and border-color wrap modes
Closes: #192
2017-11-11 23:59:47 +01:00
rdb a7d68a8412 egg2bam: fix external refs not being resolved relative to egg file 2017-10-26 17:36:43 +02:00
Sam Edwards 4fdcaef59f CMake: Build DXF programs 2017-08-07 18:36:21 -06:00
Sam Edwards cbbfbfd0bb CMake: Build FLT programs 2017-08-05 23:09:45 -06:00
rdb f7af155e93 Compile with VS 2015 Express, build assimp on Windows 2017-04-03 13:57:40 +02:00
sean5470 019700cb1a Maya 2017 support
Added entries to compile Maya 2017 plugins.
2017-04-03 02:27:40 +02:00
Sam Edwards 02c8d26150 CMake: Don't depend on metalibs
The metalibs may be phased out and should really be thought of as
a user convenience for the time being.
2017-03-08 01:35:25 -07:00
Sam Edwards f1da5ce92f Merge branch 'master' into cmake 2017-01-09 17:59:22 -07:00
rdb 4ed199cece Fix various compile warnings and a few code consistency issues 2017-01-09 20:36:53 +01:00
Sam Edwards ae10462b58 cmake: Clean up some pandatool link hacks. 2016-12-03 15:59:59 -08:00
Sam Edwards e3fcacb1f7 Merge branch 'master' into cmake 2016-11-30 19:21:50 -08:00
rdb 29411f5e14 Merge remote-tracking branch 'origin/release/1.9.x' 2016-10-31 22:32:39 +01:00
rdb c822fb57af Changes suggested by liuzhengcai to fix 3dsmax 2014 build 2016-10-31 20:47:50 +01:00
Mitchell Stokes 59b0913b0b Cleanup .gitignore files
Remove all .gitignore files in subdirectories and add a few new ignores
to the top-level directory .gitignore file.
2016-10-30 20:06:12 -07:00
rdb 758cd523e2 Don't use assimp/ prefix when including assimp files 2016-10-27 12:37:00 +02:00
rdb 1bd96685bc Allow passing - as filename to egg tools to read from stdin 2016-10-24 17:19:07 +02:00
rdb 62c008602e Merge branch 'release/1.9.x' 2016-10-20 11:14:37 +02:00
rdb 34b8e0844e Fix compile errors in unicode conversion in max exporter 2016-10-20 11:13:44 +02:00
rdb a56520d055 Drop support for pre-5.0 Maya versions 2016-10-12 23:50:28 +02:00
rdb 4381412d23 Merge branch 'release/1.9.x' 2016-09-28 00:14:21 +02:00
rdb aa74caacbe Fix inoperative -tbn/-tbnall/-tbnauto options in egg-optchar 2016-09-27 21:35:38 +02:00
rdb 47388b0dbc Separate out CPython calls from core libs; eliminate need for pystub 2016-07-20 14:30:41 +02:00
rdb 8381118a97 Assorted tweaks and compile warning fixes 2016-07-14 12:54:39 +02:00
rdb 365e1d53ef Merge branch 'release/1.9.x'
Conflicts:
	makepanda/makepandacore.py
	panda/src/cocoadisplay/cocoaGraphicsStateGuardian.mm
2016-06-27 01:18:02 +02:00
rdb 46147e9a09 Maya 2016.5 on 1.9 branch; fix Maya 2016.5 build on Mac OS X 2016-06-27 01:12:51 +02:00
Sam Edwards fffd105f96 Merge branch 'master' into cmake 2016-06-25 19:12:14 -07:00
rdb 9963fe2c3c Fix a couple of compile warnings, reduce unnecessary includes 2016-06-23 22:59:50 +02:00
Chris Brunner 78ab82b88e support for maya 2016.5 2016-06-22 16:08:05 -07:00
rdb 18874fa151 Replace PN_int/uint types with stdint.h types, since all compilers we support have them.
Plus, we already had code that relied on them being available anyway.
2016-05-11 00:27:58 +02:00
rdb dc09e28ed9 Also accept a .gz wherever a .pz file is accepted 2016-04-29 16:54:25 +02:00
Sam Edwards 441371e8d9 Merge branch 'master' into cmake 2016-03-15 18:30:55 -07:00
tobspr 0fcfb8e372 New file headers, new comment style 2016-02-17 17:47:48 +01:00
rdb 5cd4342ed5 Merge branch 'master' into cmake 2016-02-05 17:16:15 +01:00
rdb 090e912ce6 Cleanup of comments and whitespace 2016-02-01 22:30:43 +01:00
Mitchell Stokes 1df9be6fc0 Assimp: Support skeletons with unconnected bones
We needed to detect islands of bones and create anims and parts for them.
2016-01-01 19:36:03 -08:00
rdb ad238ad995 Replace crash in assimp with assertion 2016-01-02 01:00:03 +01:00
Mitchell Stokes e2c5214f39 Assimp: Add initial support for skeletal mesh animations 2016-01-01 15:21:35 -08:00