DarthArgus
ba9f47f9db
ok, that revert may have been a bit premature as this seems to work
2016-01-21 21:34:47 -06:00
DarthArgus
5d536244ae
Revert "screw this, seems default weapons just are busted for some "creatures" even if said creature is a shuttle"
...
This reverts commit 0a27156c59
2016-01-21 21:03:15 -06:00
DarthArgus
ee2b95795f
comment this out instead
2016-01-21 21:02:24 -06:00
DarthArgus
b809ab5d31
whoops
2016-01-21 18:16:59 -06:00
DarthArgus
0a27156c59
screw this, seems default weapons just are busted for some "creatures" even if said creature is a shuttle
2016-01-21 18:13:49 -06:00
DarthArgus
7ae75ed475
fix a var, may still need to call c_str on it to prevent gibberish output
2016-01-21 18:04:23 -06:00
DarthArgus
c7a7a25d75
Bypass the HACK creatures which are actually starships for attaching weapons. I assume there is maybe a better way of checking if we are looking at an object in this location or not, but i'll have to do some digging. This works for now.
2016-01-21 16:52:51 -06:00
DarthArgus
54006c97b4
more cmakelist cflag cleanup
2016-01-21 16:39:49 -06:00
DarthArgus
d3c38dac99
fix another warning
2016-01-21 16:06:01 -06:00
DarthArgus
ac16c075e1
all but 3 object templates in theme_park all have HACK in the header, so we don't need warns on them as i think this is expected behavior
2016-01-21 16:05:58 -06:00
DarthArgus
779a39abf7
cleanup the warnings that gcc doesn't like
2016-01-21 15:43:34 -06:00
DarthArgus
5629e5add9
ShipObject and ShipObject_Components: silence annoying (probably innocuous, useless) warnings in release mode
2016-01-21 12:02:08 -06:00
DarthArgus
284ac30676
only show the space nebula warn on debug builds
2016-01-21 11:40:27 -06:00
DarthArgus
a8f4475000
use -g3 instead of -g3, both on release and debug builds, like SOE did
2016-01-20 22:39:25 -06:00
DarthArgus
7d8e35abc1
reenable some error handling code; if this causes problems we should prboably find the root of the problem...
2016-01-16 16:00:05 -06:00
DarthArgus
a26bfaadcd
revert another mistake
2016-01-16 03:09:19 -06:00
DarthArgus
a161c994f3
another whoops
2016-01-15 23:26:41 -06:00
DarthArgus
26d3801f75
whoops
2016-01-15 23:24:19 -06:00
DarthArgus
267a3996f0
redo a bit that i didn't need to remove
2016-01-15 23:16:10 -06:00
DarthArgus
c9801cebad
more partial reverts of inadvisable changes from i++ to ++i, per pvs-studio...i'll ignore that type of advice from now on as i wasn't considering the consequences
2016-01-15 23:11:19 -06:00
DarthArgus
1ce2c52f5b
undo some more ill advised changes i made based on static analyzer output - they can cause buffer issues
2016-01-15 23:01:17 -06:00
DarthArgus
a155f583d0
partial reinstatement of the revert; the changing of the increment of the loop vars was a dumb idea
2016-01-15 22:55:41 -06:00
DarthArgus
a46ab49bda
revert stupid changes to a file i made
2016-01-15 22:54:38 -06:00
DarthArgus
66925d9b54
correction
2016-01-12 21:57:16 -06:00
DarthArgus
f952820391
more granular debug messages for appearances so we can know for sure which caller it is missing them
2016-01-10 20:39:30 -06:00
DarthArgus
45c48efbfc
trying to confine the debug output to debug builds...i think @cekis has the armor ones hard coded...wonder if we can make dynamic or toggle off somehow
2016-01-10 16:40:49 -06:00
DarthArgus
79a000a151
remove windows crap
2016-01-09 21:37:46 -06:00
DarthArgus
1d67bdd186
more null checks in places where we're calling createAppearance; some cleanup
2016-01-07 22:05:32 -06:00
DarthArgus
1ad5f8d882
more uncommenting
2015-12-27 17:54:04 -06:00
DarthArgus
cd3039b9dd
not sure why this was commented out
2015-12-27 17:43:49 -06:00
Cekis
d29aa4c809
Fixed issue with appearance templates (again)
2015-12-07 23:02:05 +01:00
Cekis
0dcb874822
Fixed issue with appearance templates
2015-12-07 22:58:43 +01:00
Cekis
5f9f3f674a
Killed off Godzilla-ness
2015-12-07 04:57:02 +01:00
DarthArgus
3157f4076e
Merge branch 'master' into 'master'
...
rip off light's missing SSA fix
See merge request !24
2015-11-24 15:33:05 -05:00
DarthArgus
1de74c341c
rip off light's missing SSA fix
2015-11-24 14:29:24 -06:00
DarthArgus
0a402806a0
Merge branch 'master' into 'master'
...
Update FindJNI to be able to locate Oracle java
See merge request !23
2015-11-24 01:37:51 -05:00
DarthArgus
9cf4eff1f4
add other paths for oracle java
2015-11-24 00:30:20 -06:00
DarthArgus
6be3472385
findjni: detect oracle java 6 ...later/todo, recode the java library cpp to properly use java 7/8/9+
2015-11-23 22:58:34 -06:00
DarthArgus
b7a1668696
Merge branch 'master' into 'master'
...
TEMP FIX? This may leave things hanging in memory but does make housing packup n…
…ot crash the server - it may be something to do with the empty destructors in the backtrace (see comment).
See merge request !22
2015-11-20 22:12:25 -05:00
DarthArgus
d9249aa9f5
TEMP FIX? This may leave things hanging in memory but does make housing packup not crash the server - it may be something to do with the empty destructors in the backtrace (see comment).
2015-11-20 21:06:37 -06:00
DarthArgus
56cf409d6b
this is mostly permissions fixes, and a few path fixes on some headers ...also removed unneeded crap for windows
2015-11-14 21:48:24 -06:00
DarthArgus
390394a9f3
remove the fortify source flag, things feel more stable without
2015-11-05 22:56:06 -06:00
DarthArgus
b8a34bc8cc
fixes - have to include cstdint first
2015-11-04 17:16:56 -06:00
DarthArgus
ed312c0357
this should hopefully make it work
2014-11-04 14:58:54 -08:00
DarthArgus
2efcd0229b
Revert "maybe breaking things here"
...
This reverts commit 11b37fe1de
2014-11-04 14:55:53 -08:00
DarthArgus
11b37fe1de
maybe breaking things here
2014-11-04 14:54:03 -08:00
DarthArgus
7a43224239
forgot an include
2015-11-04 16:33:53 -06:00
DarthArgus
737ca0ccb5
attempt converting these to uintptr_t
2014-11-04 14:28:16 -08:00
DarthArgus
22c6d8816f
missed one
2014-10-04 07:18:39 -07:00
DarthArgus
9d5e636eda
another useless warn
2015-11-03 23:16:40 -06:00
DarthArgus