Commit graph

1691 commits

Author SHA1 Message Date
Areloch e996cf25fb Merge pull request #1843 from rasteron/development
Update version.h
2016-12-04 23:03:03 -06:00
Areloch a3740719b1 Merge pull request #1817 from jamesu/ipv6_pr
Preliminary IPV6 Support
2016-12-04 16:22:42 -06:00
Areloch 4b25b59185 Merge pull request #1835 from Areloch/MoarMath
Adds some helpful utility math functions.
2016-12-04 15:38:20 -06:00
Areloch a98301a315 Merge pull request #1839 from Azaezel/pathPresentation
directional coloration for pathnodes,
2016-12-04 15:38:14 -06:00
Areloch 40ec9ad8be Merge pull request #1840 from Azaezel/FIELD_ComponentInspectors_button
FIELD_ComponentInspectors inspector hook up
2016-12-04 15:38:01 -06:00
Raster Ron a3f9365347 Update version.h 2016-12-03 19:41:38 +08:00
Azaezel 2652f9a609 Fills out the automaticly filled inspector entries for AbstractClassRep::FieldFlags::FIELD_ComponentInspectors with a pressable button. 2016-12-01 01:07:53 -06:00
Azaezel 1f6e66a1d7 directional coloration for pathnodes, as well as enlarges both the look and handle size for ease of use. 2016-12-01 00:55:27 -06:00
RexTimmy d46f82ef1d re-enable face culling for the terrain 2016-12-01 11:03:32 +10:00
Areloch 31ed509c1c Adds some helpful utility math functions. 2016-11-28 22:42:29 -06:00
Areloch 5fbc24d9e2 Also adds a sanity check in the event a splash image isn't found. 2016-11-27 16:21:52 -06:00
James Urquhart fba471d27e Fix console spam when OS socket send buffer is full 2016-11-27 18:02:19 +00:00
James Urquhart 1f69a708fb Fix ret assignment 2016-11-27 17:58:34 +00:00
Areloch 6cad7b6248 Merge pull request #1830 from pacomont/Fix_NavMeshUpdate_not_working
Fix  for NavPath is not updated when navMesh has change.
2016-11-27 10:29:29 -06:00
Areloch cf065ed536 Merge pull request #1585 from Areloch/execToCon
Make exec() and getDSOPath() proper Con namespace functions.
2016-11-26 02:04:38 -06:00
Areloch 248a240c04 Merge pull request #1766 from JeffProgrammer/gladdev
Replace Epoxy with Glad
2016-11-24 13:53:29 -06:00
Francisco Montañés García 87fb2d827b I's not working because onNavMeshUpdate string comparation will never succeed.
DefineEngineMethod(NavPath, onNavMeshUpdate, void, (const char *data),,
   "@brief Callback when this path's NavMesh is loaded or rebuilt.")
{
   if(object->mMesh && !dStrcmp(data, object->mMesh->getIdString()))
      object->plan();
}
2016-11-24 19:09:00 +01:00
Jeff Hutchinson 14cd94ddc9 glx extension fix for GLX windowing api 2016-11-24 12:41:30 -05:00
Jeff Hutchinson 15a10a78cc suppress API_ID_REDUNDANT_FBO on the debug callbacks. This is a temporary fix so that glad can get pushed into devhead. 2016-11-24 12:35:39 -05:00
Areloch 6097c48c5d Merge pull request #1824 from Areloch/hideDynamicRefreshField
Hides the light's dynamic refresh rate field in the editor
2016-11-23 08:44:32 -06:00
Areloch 48610d2eb1 Merge pull request #1773 from Areloch/findByObjectFix
GuiInspector's findByObject method fix.
2016-11-23 00:30:55 -06:00
Areloch 4c457b7f94 Hides the light's dynamic refresh rate field to avoid confusion, leaving only the static refresh rate field to be edited. 2016-11-09 23:46:34 -06:00
Areloch 00a4a21e3f Merge pull request #1790 from blackwc/guihealthbarhud-flip
GuitHealthBarHud flip fill
2016-11-02 22:28:21 -05:00
Jeff Hutchinson 0296e6d3fd Fix merge conflict and add check for unix and not apple for glx
Merge branch 'development-gg' into gladdev

# Conflicts:
#	Tools/CMake/libraries/glad.cmake
2016-11-02 21:55:24 -04:00
James Urquhart 2ed4978cb9 Fix connecting on OSX 2016-10-28 19:34:01 +01:00
James Urquhart 5b1bb6547a Fix lookup issue on TCPObject. Also sync with working code. 2016-10-28 18:31:47 +01:00
James Urquhart 458bc27ea4 Add missing include 2016-10-28 11:33:43 +01:00
Areloch 3ab2f98ec3 Fixes up some erroneous behavior with Simgroup parentage.
Fixes Prefab creation handling of SceneObjects and SimGroups.
Fixes SceneObjects where the default icon incorrectly defaulted to the simgroup folder rather than the generic class object when the class has no specific class icon.
2016-10-26 00:49:05 -05:00
James Urquhart 704577e051 Preliminary IPV6 Support 2016-10-25 19:09:02 +01:00
Areloch 1a851f167d Merge pull request #1807 from Azaezel/boxBaseBorked
clang catch: boxBase's getPlanePointIndex method wasn't returning values in all cases.
2016-10-24 01:28:25 -05:00
Areloch fd99f976a6 Merge pull request #1798 from Azaezel/UUID_unmangle
clang: format_token string format correction
2016-10-24 01:27:38 -05:00
Areloch 269b195355 Merge pull request #1804 from Azaezel/greatestZero
clang: unsigned>0 checks
2016-10-24 01:27:14 -05:00
Areloch e8aff85322 Merge pull request #1808 from Azaezel/consistentCallbacks1
clang: consistent callbacks
2016-10-24 01:25:09 -05:00
Anis 60e258e5a9 Merge pull request #1806 from Azaezel/byeByeVarVar2
more unused variable cleanups
2016-10-23 21:04:36 +02:00
Anis bd4f2b002d Merge pull request #1801 from Azaezel/registerRemoval
clang: register type modifier deprecated
2016-10-21 20:04:42 +02:00
Areloch 33f4ead242 Merge pull request #1803 from Azaezel/chasingElsey
clang: trailing else
2016-10-21 01:42:14 -05:00
Areloch 6cc7bcd2e0 Merge pull request #1805 from Azaezel/startRightEndRight
clang: constructor initialization order
2016-10-19 08:39:12 -05:00
Areloch d8644e0426 Merge pull request #1813 from Azaezel/loopyLines
clang catch: garbage in line directives
2016-10-19 00:10:09 -05:00
Areloch 74c67e8409 Merge pull request #1814 from Azaezel/unstrungHeros
garbage char in string
2016-10-18 22:46:29 -05:00
Areloch 65f25cb0e6 Merge pull request #1796 from Azaezel/notSoEasy
retooled circular ease methods
2016-10-18 22:41:31 -05:00
Azaezel c5fa0557b5 garbage char in string 2016-10-18 11:44:25 -05:00
Azaezel 4bc1491714 clang catch: garbage in line directives 2016-10-18 11:37:18 -05:00
Azaezel 5e1b6cbc48 clang: trailing else 2016-10-18 08:58:15 -05:00
Areloch 5349bad5ca Merge pull request #1809 from dud3/patch-1
refactor: spacing on function call parameters
2016-10-17 23:52:08 -05:00
Areloch 121d65215e Tweaks any enums that use uint_max values so that they have hard types to avoid any compiler kerfluffles with C++11 value narrowing, specifically pertaining to clang. 2016-10-17 01:00:12 -05:00
Dren Kajmakci e267cd7c80 refactor: spacing on function call parameters 2016-10-17 02:24:34 +02:00
Azaezel 5f5466d90d clang: consistent callbacks 2016-10-16 16:54:11 -05:00
Azaezel 8d4dd14144 clang catch: boxBase's getPlanePointIndex method wasn't returning values in all cases.
assertfatal doesn't do anything in release builds, so also added a failure enum.
2016-10-16 15:31:56 -05:00
Azaezel 1ee127b753 more unused variable cleanups 2016-10-16 14:41:34 -05:00
Anis 3038e53856 Merge pull request #1799 from Azaezel/pragmaProblem
clang catch: pragma note. (no longer needed)
2016-10-16 03:25:02 +02:00