Commit graph

2625 commits

Author SHA1 Message Date
Areloch 97ac826e44 Corrects the specular handling as per Richard's suggestion in #1783 2016-11-09 00:12:35 -06:00
Areloch 36f679f539 Sanity check for if the GuiPlatformGenericMenuBar class is valid before trying to load a menubar that uses it, in the event that SDL isn't enabled, or other similar circumstances. 2016-11-08 23:39:07 -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
Areloch 6e735ade67 Merge pull request #1818 from Areloch/SimGroupPrefabFixup
Fixes up some erroneous behavior with Simgroup parentage.
2016-11-01 12:02:03 -05: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 15db25c0b8 Fixes minor issue where if a prefab was in one of the root directories rather than further in the heirarchy, it would incorrectly add a folder of the prefab's name that contains the prefab in the creator menu's prefabs tab. 2016-10-26 00:51:05 -05: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
Areloch 598d551435 Merge pull request #1816 from rextimmy/openal-soft
OpenAL-soft for windows
2016-10-21 23:21:05 -05:00
RexTimmy 3a0a720115 OpenAL-soft for windows 2016-10-22 09:22:33 +10:00
Anis e2f2c4932b Merge pull request #1811 from Azaezel/ClangCmakeClean
filters false flags from clang compilation
2016-10-21 20:05:54 +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
Azaezel 09cbb0df1a -Wno-unused-local-typedef surpresses unused typedef spam (in fastDelegate in particular) 2016-10-19 18:50:13 -05:00
Areloch 6cc7bcd2e0 Merge pull request #1805 from Azaezel/startRightEndRight
clang: constructor initialization order
2016-10-19 08:39:12 -05:00
Azaezel 132aed4c71 -Wno-return-type-c-linkage surpreses "extern C warning" spam reguarding nonstandard classes used in conjunction with the script trampoline macros. 2016-10-19 08:01:48 -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 a46b4fb5e8 clang: The unit test suite doesn't play nice with -wundef
(test for #if +uninitialized #defines)
leaving that as an option, but off by default to allow filtering through engine specific #defines for issues, rather than wading through the spam kicked up by the plugin.
2016-10-18 11:20:28 -05:00
Azaezel 5e1b6cbc48 clang: trailing else 2016-10-18 08:58:15 -05:00
Azaezel 16167b3250 filters false flags from clang compilation 2016-10-18 08:39:39 -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 a858fa775f Merge pull request #1810 from Areloch/AHardTypingEnum
Force enums using unsigned values to actually hard type to U32
2016-10-17 23:38:59 -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
Anis be6a5d408d Merge pull request #1802 from Azaezel/byeByeVarVar
unused variable cleanup
2016-10-16 03:24:06 +02:00
Azaezel fbfd3ed8ed clang: constructor initialization order
while not a major issue per-se, the sheer number of times the engine has to jump back in memory and backfill data in a given class can add up. First run of... many.,
2016-10-14 18:16:55 -05:00
Azaezel 0e896a9a02 clang: unsigned>0 checks 2016-10-14 18:09:22 -05:00
Azaezel aa614f60f8 clang: unsigned>0 checks 2016-10-14 18:04:11 -05:00
Azaezel d30dedd7c5 clang: trailing else 2016-10-14 17:57:20 -05:00
Azaezel cc9955e102 unused variable cleanup 2016-10-14 17:49:56 -05:00
Azaezel dd0b7914e6 clang: register type modifier deprecated 2016-10-14 17:37:00 -05:00
Azaezel a8f9249f77 clang catch: pragma note. (no longer needed) 2016-10-14 17:04:17 -05:00
Azaezel ae5f61e60d clang: format_token string format correction 2016-10-14 16:28:06 -05:00
Azaezel 2f5321ddfb tabs/space + transcription typofix 2016-10-14 13:40:53 -05:00