Commit graph

18419 commits

Author SHA1 Message Date
scrawl
53e4db8a8f Add dummy serializer for CameraRelativeTransform to allow serializing content of Sky Root 2017-02-02 21:57:18 +01:00
scrawl
c5f8ff6e0e Add names to several nodes for debugging purposes 2017-02-02 21:49:52 +01:00
Koncord
aed0651dc2 [Server] Some fixes for MasterClient 2017-02-03 00:55:59 +08:00
David Cernat
d9f5dfe65c Merge pull request #138 from OpenMW/master
Add OpenMW commits up to 2 Feb 2017
2017-02-02 13:07:11 +02:00
scrawl
851f61ac82 Always assign osg::Material when a material controller is used 2017-02-01 21:10:43 +01:00
scrawl
625c5040ce Fix build 2017-02-01 15:49:20 +01:00
David Cernat
7ebad596d6 [Server] Use double instead of int for scale in WorldFunctions 2017-02-01 12:53:51 +02:00
David Cernat
018b0e6699 [Server] Add script functions & callbacks for locking, unlocking & doors 2017-02-01 12:43:19 +02:00
Koncord
1808cf815f [Browser] Some minor fixes 2017-02-01 18:00:03 +08:00
David Cernat
958ff06ca8 [General] Rename ID_DOOR_ACTIVATE into ID_DOOR_STATE 2017-02-01 11:54:40 +02:00
David Cernat
8e438a1b82 [Server] Add OnObjectScale callback, part 2 2017-02-01 10:00:54 +02:00
Koncord
f78c749981 [Client] Use "NULL" instead "nullptr"
nullptr keyword introduced in C++11
2017-02-01 15:58:29 +08:00
David Cernat
9f8f62b765 Merge pull request #137 from OpenMW/master
Add OpenMW commits up to 1 Feb
2017-02-01 09:28:23 +02:00
David Cernat
5bd2fdcf66 [Server] Add OnObjectScale callback, and set scale for WorldObject 2017-02-01 09:25:47 +02:00
Koncord
0b8d0224d1 [Server] Change type in second argument in SetConsoleAllow to "bool" 2017-02-01 13:44:50 +08:00
Koncord
75afa58981 [Server] Add bool type for scripts 2017-02-01 13:43:17 +08:00
scrawl
1808b8567e Add 'small feature culling pixel size' setting specifically for water RTTs, by default set higher than the one in [Camera] 2017-02-01 06:00:14 +01:00
scrawl
fcb4129aee Add 'small feature culling pixel size' setting 2017-02-01 06:00:14 +01:00
scrawl
9180089a3b Add sharing for more State Attributes, most notably BlendFunc and AlphaFunc, to improve the state tracking in osg::State and reduce the number of GL calls 2017-02-01 06:00:14 +01:00
scrawl
960d4a96c3 Reduce the number of osg::Material state by setting the default state on the graph root 2017-02-01 06:00:14 +01:00
scrawl
e399e10607 Add missing lock in shareMaterial 2017-02-01 06:00:14 +01:00
scrawl
34deb6e7b1 Add 'showSceneGraph' command to export the scene or a particular object to .osgt for debugging purposes 2017-02-01 06:00:14 +01:00
scrawl
e90941a8b3 Wrap the scene template reference in another object for const correctness and to avoid it from being serialized with the osgDB serializer 2017-02-01 06:00:14 +01:00
David Cernat
8c019f2c61 [Server] Update OnObjectPlace and OnObjectDelete callbacks 2017-01-31 23:26:49 +02:00
David Cernat
87dce73b90 [Server] Add script function for sending world object scale 2017-01-31 23:07:02 +02:00
David Cernat
705589e3e3 [Server] Add script functions for getting/setting world object scale 2017-01-31 22:54:36 +02:00
David Cernat
8e4a51dc17 Merge pull request #136 from OpenMW/master
Add OpenMW commits up to 31 Jan
2017-01-31 09:50:52 +02:00
David Cernat
703f253712 [Client] Delete new LocalEvents after sending them 2017-01-31 09:48:37 +02:00
scrawl
29abb62dee Merge pull request #1197 from nikolaykasyanov/gamecontrollerdb-update
Update gamecontrollerdb.txt from upstream
2017-01-31 04:03:57 +01:00
Koncord
239c1aaebf [Browser] Kill RakNet thread before return 2017-01-31 00:25:34 +08:00
David Cernat
1fc9dd4f93 [Server] Remove WorldFunctions index parameters that are no longer used 2017-01-30 17:42:29 +02:00
David Cernat
9f998c9901 [Server] Improve getter methods in WorldFunctions 2017-01-30 17:09:14 +02:00
Koncord
42b6a456f0 [Client] Fix code style 2017-01-30 22:53:22 +08:00
Koncord
c5035cd174 [Client] Fix crash and memory leak when erasing spellbook 2017-01-30 22:37:09 +08:00
David Cernat
88e648aaa9 [Server] Fix crash caused by setting too many WorldObject refIds, try 2 2017-01-30 12:26:45 +02:00
David Cernat
fe9e30a4d8 [Server] Fix crash caused by setting too many WorldObject refIds 2017-01-30 09:10:33 +02:00
David Cernat
da2f66d6ba Merge pull request #135 from OpenMW/master
Add OpenMW commits up to 29 Jan
2017-01-30 07:32:44 +02:00
David Cernat
8e1dff8e02 [Browser] Change "Not fully" into "Not full" 2017-01-30 07:30:58 +02:00
David Cernat
bcee35ca1d Merge branch 'master' of https://github.com/TES3MP/openmw-tes3mp 2017-01-30 06:48:40 +02:00
David Cernat
d503a65849 [Client] Replace tab characters with spaces 2017-01-30 06:47:22 +02:00
Koncord
c147d13a73 [Browser] Move hardcoded title to UI 2017-01-30 07:22:32 +08:00
Koncord
cb0f5524be [Browser] Implement filters 2017-01-30 07:17:21 +08:00
Koncord
e3a304dd03 [Browser] Add filters to UI 2017-01-30 07:16:22 +08:00
Koncord
f86d17d8a6 [Browser] Add custom proxy model 2017-01-30 07:14:11 +08:00
Koncord
dba98f9261 [Browser] Not trying to download extended data if server is unreachable 2017-01-30 04:17:18 +08:00
Koncord
6b42f870a7 [Browser] Use constant instead magic value 2017-01-30 04:15:42 +08:00
Koncord
3070ecdea7 [Browser] Allow connecting by double click 2017-01-30 04:14:09 +08:00
David Cernat
5eff2ece21 [Server] Fix memory leaks related to WorldEvents as suggested by Koncord 2017-01-29 20:18:19 +02:00
David Cernat
6b9fba7885 [Server] Add script functions for getting/setting world object rotation 2017-01-29 17:38:29 +02:00
David Cernat
920c1113a3 [Server] Add script functions for setting world object placement info 2017-01-29 16:16:01 +02:00