Marc Zinnschlag
fb7273e14a
Merge remote-tracking branch 'sirherrbatka/icons-svg'
...
Conflicts:
.gitignore
2013-08-26 14:52:26 +02:00
Marc Zinnschlag
dcc55b60c3
Merge remote-tracking branch 'kcat/misc-cleanup'
2013-08-26 08:51:19 +02:00
Marc Zinnschlag
5ff6f613bf
Merge remote-tracking branch 'scrawl/master'
2013-08-26 08:47:22 +02:00
Chris Robinson
f2889e4bb5
Remove unused functions and parameters
2013-08-25 16:08:45 -07:00
Chris Robinson
3843357cd2
Fix actor stepping
2013-08-25 16:08:43 -07:00
Chris Robinson
0463dc0653
Use a smaller static geometry size for interior cells
2013-08-25 16:08:43 -07:00
Chris Robinson
bd6dd071aa
Use the non-accumulation root's parent as the accumulation root
...
This relies on the non-accumulation root not being the skeleton root. I haven't
found an instance where this isn't the case.
2013-08-25 16:08:42 -07:00
scrawl
3f8a69b4ad
Don't crash when trying to delete a reference that doesn't exist anymore
2013-08-26 00:14:02 +02:00
scrawl
5af89a9e8f
Fix an AABB assert for loading empty exterior cells
2013-08-26 00:13:42 +02:00
Lars Söderberg
45083fc89e
Chargen updates
2013-08-25 23:15:29 +02:00
Lars Söderberg
e33239eae5
Various fixes
2013-08-25 23:15:20 +02:00
scrawl
c6d2d1999a
Fix an item duplication glitch
2013-08-25 17:40:08 +02:00
sirherrbatka
c57fb4fc4f
Delete .directory
2013-08-24 19:20:12 +02:00
Marek Kochanowicz
abd03245d7
Adding .directory to gitignore.
2013-08-24 19:17:44 +02:00
Marc Zinnschlag
7aee1da5c6
fixed some columns
2013-08-24 16:51:49 +02:00
Marc Zinnschlag
51fbb0f3f4
fixed a segfault when opening views for tables that do not allow the creation of new records
2013-08-24 15:33:46 +02:00
Marc Zinnschlag
948cb0ef34
Merge remote-tracking branch 'marcrbouvier/master'
2013-08-24 15:13:07 +02:00
Marc Zinnschlag
f605dcdd24
Merge branch 'filter'
2013-08-24 14:51:05 +02:00
Marc Zinnschlag
78c7de440d
simplified filter nodes even more
2013-08-24 14:49:05 +02:00
Marc Zinnschlag
cf58670c85
removed global filter scope (would have caused sync problems between projects)
2013-08-24 14:46:42 +02:00
Marc Zinnschlag
3cf60da5a7
added numeric value filter node
2013-08-24 14:43:38 +02:00
Chris Robinson
ca24a809fc
Use the position of the actor to determine if they're swimming
2013-08-23 13:44:16 -07:00
Chris Robinson
3fa65f21dd
Use a proper cone shape with a contact test to check for melee hits
2013-08-23 12:27:40 -07:00
Chris Robinson
f5d03a16c1
Rename getFacedObject and getFacedHandle for melee hits
2013-08-23 12:27:39 -07:00
Marc Zinnschlag
537ab38985
fixed type in error message
2013-08-23 14:49:41 +02:00
Marc Zinnschlag
c56007cceb
fixed a record counting bug (was using the wrong model)
2013-08-23 14:11:33 +02:00
Marek Kochanowicz
717e04cac5
More icons. At last!
2013-08-23 12:48:34 +02:00
Marc Zinnschlag
2823e5693d
Merge remote-tracking branch 'scrawl/hit'
2013-08-22 15:35:17 +02:00
Marc Zinnschlag
63b1df85e7
fixed string parsing
2013-08-22 15:22:39 +02:00
Marc Zinnschlag
f615a9397b
made text node filter case-insensitive
2013-08-22 15:16:22 +02:00
Marc Zinnschlag
de956737fe
added text filter node
2013-08-22 14:50:42 +02:00
Marc Zinnschlag
decd826208
fixed an include guard
2013-08-22 14:00:55 +02:00
Marc Zinnschlag
ba6edc55d4
added not filter node
2013-08-22 13:45:50 +02:00
Marc Zinnschlag
806e9a2888
added and and or filter nodes
2013-08-22 13:14:35 +02:00
scrawl
22d5598082
Fix bad_cast exception when hitting creatures
2013-08-22 12:17:12 +02:00
scrawl
1adce8afb3
Fix ambient light getting set from the cell data for non-interior cells
2013-08-22 10:47:48 +02:00
Marc Zinnschlag
50041fc211
simplified filter system by taking out filter references and user values for now (these are post-1.0 features anyway)
2013-08-22 09:17:57 +02:00
Marc Bouvier
2e8b0cf502
Remove Directory Paths in Qt Classes Includes
...
Qt recommends that the path location not be used when including a class.
Also, this is how other files include Qt classes in the OpenCS app. This
change is for consistency only.
2013-08-21 17:14:29 -05:00
Nikolay Kasyanov
dc6e15f38e
Replaced std::pow with shift since clang doesn't like int as a first argument
...
(reports that call is ambiguous)
2013-08-21 23:59:33 +04:00
Marc Zinnschlag
e03e2f0817
Merge remote-tracking branch 'scrawl/master'
2013-08-21 19:50:08 +02:00
scrawl
d086346b07
Fix loading of some cells in TR
2013-08-21 17:26:11 +02:00
scrawl
758d989a03
If multiple plugins have land data for the same cell, the last plugin should win
2013-08-21 17:26:11 +02:00
scrawl
5f7e6f7b10
Fix a material issue, layers per pass wasn't entirely correct
2013-08-21 17:26:11 +02:00
scrawl
43313437dc
Fix composite map for cells without land data
2013-08-21 17:26:11 +02:00
scrawl
ce5ea6d7d2
Use a proper node hierarchy; disconnect the root when entering interior
2013-08-21 17:26:11 +02:00
Chris Robinson
c855ab65cf
Non-colliding objects are considered flying
2013-08-21 07:24:54 -07:00
Chris Robinson
602be9bbe7
Avoid swimming into the air from underwater
2013-08-21 07:24:54 -07:00
Chris Robinson
9f09bb6f6f
Use separate inputs for swimming and flying
2013-08-21 07:24:54 -07:00
Chris Robinson
a546ace94d
Remove an unused method
2013-08-21 07:24:54 -07:00
vorenon
3bf3bd4b8c
Silenced some warnings
2013-08-21 13:53:49 +02:00