Commit Graph

9535 Commits

Author SHA1 Message Date
Sam Edwards 64c55cf92c CMake: Library link changes for Windows. 2015-11-15 22:52:28 -08:00
Sam Edwards f9099cf832 Merge branch 'master' into cmake 2015-11-14 15:09:11 -08:00
Sam Edwards 90d3347fd1 text: Fix missing includes. 2015-11-14 15:08:42 -08:00
rdb 1d2ba26e26 Merge branch 'release/1.9.x' 2015-11-13 19:26:57 +01:00
rdb 815cbc1acb Remove accidentally checked in debug message 2015-11-13 15:05:06 +01:00
rdb a453ec1925 Overhaul text generation; now 75x as fast as before. 2015-11-13 01:44:03 +01:00
rdb 0fffcdfc6b Big perf improvement flattening and munging vertex colors 2015-11-12 23:28:58 +01:00
rdb c9921271d6 Fix recursion in inline function in LFrustum 2015-11-12 02:59:15 +01:00
Sam Edwards cdf3e21025 CMake: Test that the compiler has SSE2 support. 2015-11-11 14:35:24 -08:00
Sam Edwards 28a60ff52e general: Remove a few hacked-in includes once needed for CMake to build properly. 2015-11-11 12:53:35 -08:00
Sam Edwards b1a294631a Merge branch 'master' into cmake 2015-11-11 12:35:13 -08:00
Sam Edwards 5ebb6c511f general: Fix missing includes. 2015-11-11 12:35:04 -08:00
rdb eecb1fb3f2 Cache text states 2015-11-11 17:43:30 +01:00
rdb a573a11d90 Improve debug information when compiling GLSL shaders 2015-11-11 17:08:27 +01:00
rdb 8822ac0b05 Support DSA version of mipmap generation 2015-11-11 17:08:09 +01:00
rdb f9add18798 Fix another GL crash at shutdown 2015-11-11 17:06:32 +01:00
rdb 90f05d7284 Add snorm texture formats 2015-11-10 18:00:18 +01:00
rdb 5b291a9b10 Merge branch 'master' into cmake 2015-11-09 19:21:12 +01:00
rdb db3ab953e4 Remove ppremake, genPyCode, and all hacks created to support them 2015-11-09 19:06:49 +01:00
rdb 6ccd64d99e Fix ordering of methods relative to MAKE_SEQ 2015-11-09 18:13:29 +01:00
rdb ac1c036cac interrogatedb 3.0 to restructure make_seq, improve make_seq handling and performance 2015-11-09 18:03:30 +01:00
rdb 4a5d64909a Merge branch 'release/1.9.x'
Conflicts:
	direct/src/showbase/ShowBase.py
2015-11-09 02:29:41 +01:00
rdb 11437c5afd Fix bug when the same Cg shader is compiled for two different GSGs 2015-11-09 00:54:09 +01:00
rdb 5734f61f7e Fix Eigen compile issue in CMake 2015-11-08 22:50:53 +01:00
tobspr 027a561843 Fix color write mask in OpenGL 2015-11-08 11:58:06 +01:00
Sam Edwards 8427f95c18 cmake: Update for upstream changes. 2015-11-07 20:07:24 -08:00
Sam Edwards c902774cfd Merge branch 'master' into cmake 2015-11-07 20:06:59 -08:00
rdb 0f2f27689a Convert from DOS back to Unix newlines 2015-11-08 02:12:43 +01:00
rdb 68f762aa20 Fix leak of prepared contexts, prevent deleting GL resources in wrong context in multi-GSG applications 2015-11-08 00:01:45 +01:00
rdb 026ec613f5 Merge remote-tracking branch 'origin/release/1.9.x' 2015-11-07 23:57:11 +01:00
rdb 6a263746cd Fix Cg crash at shutdown when multithreaded pipeline is active 2015-11-07 21:55:51 +01:00
rdb 47fdb9b748 Correct position of viewing axis for off-axis lens frustum (with thanks to tobspr) 2015-11-07 16:42:06 +01:00
rdb e6391c0b87 Merge branch 'release/1.9.x'
Conflicts:
	makepanda/installpanda.py
	makepanda/makepandacore.py
2015-11-05 20:55:01 +01:00
rdb 042dc82416 Handle DPI change on Windows 8.1+, add dpi-window-resize config option 2015-11-05 20:43:33 +01:00
rdb 1adb0e48f4 Merge branch 'release/1.9.x' 2015-11-03 20:30:33 +01:00
rdb bd354a9cde Fix crash on shutdown of buffer in threaded pipeline 2015-11-02 16:41:17 +01:00
rdb 8c259d4a20 Merge branch 'release/1.9.x' 2015-11-01 20:12:32 +01:00
rdb d8fedc1bc0 Call SetProcessDPIAware() to fix issues caused by DPI virtualization in Windows 8.1 2015-11-01 20:01:39 +01:00
rdb 368390536b Fix bug preventing switching from Z_top to Z_normal on Windows
(Reported by Epihaius)
2015-11-01 19:07:33 +01:00
rdb da17cce447 Fix error and warnings in 32-bit Windows build 2015-11-01 16:57:52 +01:00
rdb b0d8b9109e Check in change that might help fix a WeakKeyHashMap assert 2015-11-01 15:59:38 +01:00
rdb 0ae2df7e02 Merge branch 'release/1.9.x' 2015-11-01 15:54:58 +01:00
rdb 63a9b5dfec Re-expose MouseWatcherGroup; clearer error message for make_seq when getter is not exposed 2015-11-01 15:45:52 +01:00
rdb d3494edf2c Address some rare crashes at shutdown 2015-10-31 04:11:12 +01:00
rdb bfe42fa8e9 Fix updating of light position uniform in GLSL (thanks to deflected for tracking this down) 2015-10-28 20:24:42 +01:00
rdb 06475c70b9 Merge branch 'release/1.9.x' 2015-10-28 16:56:44 +01:00
rdb fe633b51a1 Remove unnecessary cg.h include 2015-10-28 15:55:59 +01:00
rdb bac5401a9d Add GL function pointers for indirect draw 2015-10-28 13:18:12 +01:00
rdb be652bb112 Merge branch 'release/1.9.x', change default value of geomipterrain-incorrect-normals to false 2015-10-23 16:20:17 +02:00
rdb da1d5755f9 Add config var to toggle between incorrect/correct normal generation for GeoMipTerrain 2015-10-23 16:18:59 +02:00