Commit graph

18235 commits

Author SHA1 Message Date
Koncord
931ecd5acb [Server] Imrpove debug info in CellController 2017-02-19 19:29:14 +08:00
Koncord
cce49e355a [Server] Some fixes to sendToNearest & doForNearest 2017-02-19 18:44:52 +08:00
Koncord
033472d939 [Server] Add doForNearest function 2017-02-19 17:42:39 +08:00
Koncord
b760015071 [Server] Send some packets only to nearest players 2017-02-19 16:46:42 +08:00
Koncord
846ceacc90 [Server] Add begin & end iterators to Cell class 2017-02-19 16:21:40 +08:00
Koncord
bbc062de62 [Server] Use lowCamelCase in Cell 2017-02-19 16:07:44 +08:00
Koncord
08f78e21c1 [Server] Use CellController in Networking 2017-02-19 13:27:39 +08:00
Koncord
8887a267c7 [Server] Add Cell and CellController 2017-02-19 13:27:10 +08:00
David Cernat
b1009ad33d [Server] Add GetContainerItemActionCount() for getting drag count 2017-02-19 00:11:09 +02:00
David Cernat
4f2b88df8a [General] Remove owner var from ContainerItem because it is always empty 2017-02-18 23:59:02 +02:00
David Cernat
fd4827b3a7 Merge pull request #157 from OpenMW/master
Add OpenMW commits up to 18 Feb 2017, part 2
2017-02-18 12:12:30 +02:00
David Cernat
d9a566f0f6 Merge pull request #156 from OpenMW/master
Add OpenMW commits up to 18 Feb 2017
2017-02-18 11:19:50 +02:00
Marc Zinnschlag
bef0b1f1d6 Merge remote-tracking branch 'matahualpa/openmw-cs_gender' 2017-02-18 09:57:09 +01:00
Koncord
74cfc4a821 [Client] Use enum instead magic values 2017-02-18 15:26:11 +08:00
Koncord
a95cf0e07a [Server] Fix crash when call StopServer() function in OnServerInit() 2017-02-18 13:00:01 +08:00
Koncord
1fb2176cfa [Server] Add forgotten type for callbacks 2017-02-18 12:58:12 +08:00
scrawl
aa8459b5c7 Revert "Remove redundant allocations for NIF meshes"
This reverts commit a7c5beb7c5.

Conflicts:
	components/nif/data.cpp
	components/nifbullet/bulletnifloader.cpp
	components/nifosg/nifloader.cpp
2017-02-18 02:33:41 +01:00
scrawl
6a37909ee7 Revert "Fix race conditions caused by Array <-> GLBufferObject interactions (Bug #3580)"
This reverts commit 115e563a7a.
2017-02-18 02:33:41 +01:00
David Cernat
0d75264221 Merge pull request #155 from OpenMW/master
Add OpenMW commits up to 17 Feb 2017, part 2
2017-02-17 23:19:30 +02:00
David Cernat
c01ab63239 [Server] Add script functions for setting container item info 2017-02-17 23:11:38 +02:00
scrawl
f2174ee9f4 Merge pull request #1217 from Allofich/follow
Fix loading 0-duration Follow and Escort packages
2017-02-17 21:10:15 +01:00
scrawl
cb142f01e4 Merge pull request #1215 from MiroslavR/armor_rating
Fix incorrect calculation of armor rating
2017-02-17 18:52:07 +01:00
Allofich
3897c49e30 Fix loading 0-duration Follow and Escort packages
(Fixes #3755)
2017-02-18 01:55:50 +09:00
MAtahualpa
520e82ed4f Fix for commit "affc0eb..." in PR 1216 (fixes #3756)
Fixed use of tab character.
2017-02-17 17:54:38 +01:00
David Cernat
941d6269c1 [General] Slightly reorder variables in ID_OBJECT_PLACE 2017-02-17 18:34:11 +02:00
David Cernat
aa1549606f [Server] Add script functions for getting container item info 2017-02-17 18:33:20 +02:00
MAtahualpa
affc0eb37f Replace "Female" check box with a combo box, part 1/2 (fixes #3756)
Replaces the "Female" check box in NPC records with a "Gender" combo box. This is the first of two related fixes, the second one covering BodyPart records.

Related issue:
- Fixes #3756: Editor: Replace "Female" check box in NPC records with "Gender" combo box (https://bugs.openmw.org/issues/3756)

Tests:
The changes were successfully tested in OpenMW-CS by manipulating several NPC records.
2017-02-17 17:05:46 +01:00
David Cernat
70470e12b4 [Server] Reorder World script functions 2017-02-17 16:24:40 +02:00
David Cernat
8a5bc77699 [Server] Add GetBaseEventAction script function 2017-02-17 14:51:36 +02:00
David Cernat
e0bc557aa4 Merge pull request #154 from OpenMW/master
Add OpenMW commits up to 17 Feb 2017
2017-02-17 14:45:45 +02:00
Bret Curtis
e0afaf3a7d finish up openmw-cs 2017-02-17 12:23:24 +01:00
Bret Curtis
a4372b6c5f get openmw-cs model covered 2017-02-17 12:23:24 +01:00
Bret Curtis
a39b593b9b add beginning of openmw-cs docs 2017-02-17 12:23:24 +01:00
Marc Zinnschlag
79956e4b49 Merge remote-tracking branch 'origin/master' 2017-02-17 08:54:19 +01:00
Marc Zinnschlag
23818ec409 Merge remote-tracking branch 'matahualpa/openmw-cs_emittertype' 2017-02-17 08:48:32 +01:00
MiroslavR
f883951d75 Fix incorrect calculation of armor rating (Bug #3754) 2017-02-17 03:11:37 +01:00
MAtahualpa
fb2618fe7b Update request for AUTHORS.md
If you don't mind, please update our credits file with the following changes.
(Sorted the name entries in the PR section along the way.)
2017-02-16 22:05:15 +01:00
scrawl
96ca50e108 Merge pull request #1211 from Allofich/warnings
Fix Clang and OS X Travis CI warnings
2017-02-16 19:16:53 +01:00
Allofich
621d3e56cf Fix Clang and OS X Travis CI warnings 2017-02-17 02:08:39 +09:00
David Cernat
27c4015f50 [General] Remove unused packet placeholder ID_OBJECT_HEALTH 2017-02-16 18:46:39 +02:00
David Cernat
1198caddf6 [Server] Add OnContainer script callback 2017-02-16 18:34:11 +02:00
David Cernat
5300bcd711 Merge pull request #153 from OpenMW/master
Add OpenMW commits up to 16 Feb 2017, part 2
2017-02-16 18:25:21 +02:00
Bret Curtis
e8bc57c232 add the rest of the openmw source documentation 2017-02-16 16:03:43 +01:00
Bret Curtis
3b4c4f6f63 Merge pull request #1205 from psi29a/sphinx
make local documentation development easier
2017-02-16 14:48:49 +01:00
David Cernat
eba7d8408f [Server] Use script function to get spellbook action 2017-02-16 14:23:27 +02:00
Bret Curtis
d4ea85a4c6 reorganization and added mwgui 2017-02-16 13:19:22 +01:00
MAtahualpa
dab8b328c4 Replace light emitter check boxes with a combo box (fixes #3752)
Replaces the four emitter check boxes in Light records with an "Emitter Type" combo box.

Related issue:
- Fixes #3752: Editor: Replace emitter check boxes in Light records with "Emitter Type" combo box (https://bugs.openmw.org/issues/3752)

Tests:
The changes were successfully tested in OpenMW-CS by manipulating several Light records. Please note that this fix also prevents users from erroneously assigning two or more emitter types at the same time. (I don't know which one would prevail in that case.)
2017-02-16 12:48:47 +01:00
David Cernat
5b3fabdb9d [Client] Send ID_CONTAINER with all containers in cell when requested 2017-02-16 13:34:32 +02:00
David Cernat
c32c004516 Merge pull request #151 from OpenMW/master
Add OpenMW commits up to 16 Feb 2017
2017-02-16 11:53:02 +02:00
MAtahualpa
7be46eb1f0 Fix for commit "d4972ab..." in PR 1208 (fixes #3751)
Replaces the two "Xyz blood" check boxes in NPC and Creature records with a "Blood Type" combo box.

Fix:
- corrected false logic operation in refidadapterimp.cpp
- corrected names of the used flags
2017-02-16 00:08:38 +01:00