1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 09:23:52 +00:00
Commit graph

592 commits

Author SHA1 Message Date
David Cernat
809b4d78ba [Client] Split off DedicatedPlayer and PlayerList into different files 2017-04-30 14:57:43 +03:00
David Cernat
6a21ec1fdc [General] Rename PlayerPos into PlayerPosition 2017-04-25 22:11:33 +03:00
David Cernat
7b07d6651f [General] Add and use PlayerBounty packet and matching script functions 2017-04-25 21:24:39 +03:00
David Cernat
6658531713 [General] Fix names for two PlayerProcessors 2017-04-25 19:01:56 +03:00
David Cernat
e70faf1016 [Client] Fix crashes in PlayerProcessors from NULL players
Also rename ProcessorPlayerDrawState into ProcessorPlayerAnimFlags
2017-04-24 01:46:27 +03:00
Koncord
0a9768860b [Client] Add Processors to subgroups in cmakelists 2017-04-18 16:50:51 +08:00
Koncord
9cbb8af9d2 [Client] Remove WorldController from cmakelists 2017-04-18 16:04:58 +08:00
Koncord
67aba35d37 [Client] Simplify Processors 2017-04-18 15:05:39 +08:00
Koncord
7ec897a829 [Client] Add ActorProcessor 2017-04-18 14:37:35 +08:00
Koncord
f0805ca6f7 [Client] Fix typo 2017-04-18 11:50:22 +08:00
Koncord
e98fa6ad07 [Client] Add ProcessorInitializer 2017-04-18 11:45:54 +08:00
David Cernat
cf155c9279 [Client] Add MechanicsHelper and move linear interpolation code to it 2017-04-17 14:37:19 +03:00
David Cernat
c52084a028 [General] Use BaseActorLists in ActorPackets 2017-04-09 16:32:44 +03:00
David Cernat
0d766a7a04 [Client] Add and use mwmp::Cell class 2017-04-06 04:00:50 +03:00
David Cernat
8df9d55331 [Client] Create placeholder DedicatedActor class 2017-04-06 00:48:20 +03:00
David Cernat
d24cde16dd [General] Add simple BaseActor and LocalActor classes 2017-04-05 12:52:27 +03:00
David Cernat
60037e4081 Merge pull request #185 from OpenMW/master
Add OpenMW commits up to 14 Mar 2017
2017-03-15 11:20:06 +02:00
scrawl
9a3a64f0c4 Add resource manager for ESM::Land to allow data to be unloaded when no longer required 2017-03-14 19:27:55 +01:00
David Cernat
e703dd42aa [Client] Rename LocalEvent into WorldEvent 2017-02-06 17:40:32 +02:00
David Cernat
d503a65849 [Client] Replace tab characters with spaces 2017-01-30 06:47:22 +02:00
David Cernat
624b85347a [Client] Create LocalEvent class and use it instead of WorldEvent 2017-01-27 20:57:47 +02:00
David Cernat
5bdfb72752 Merge pull request #116 from OpenMW/master
Add OpenMW changes up to 26 Dec
2016-12-26 01:09:20 +02:00
scrawl
dc1f788cff Use osg::PI over M_PI 2016-12-21 16:49:37 +01:00
David Cernat
7bbeed629d Merge pull request #109 from OpenMW/master
Add OpenMW changes up to 25 Nov
2016-11-26 01:58:43 +02:00
scrawl
5297d7b5be Merge pull request #1137 from nikolaykasyanov/osx-structure
[macOS] Move all resources files inside application bundles (fixes #3566)
2016-11-25 02:51:32 +01:00
Nikolay Kasyanov
db69342b5d [macOS] Move all configs & resources into app bundles
Fixes #3566 (https://bugs.openmw.org/issues/3566).
2016-11-23 22:32:54 +01:00
David Cernat
c2abcd3869 Fix installation target for tes3mp 2016-11-17 21:43:05 +02:00
David Cernat
b028f0b51f Merge pull request #104 from OpenMW/master
Add OpenMW commits up to 17 Nov
2016-11-17 21:13:58 +02:00
David Cernat
3dcb8738c1 Create placeholder WorldController class 2016-11-15 18:42:52 +02:00
Phillip Andrews
c18fc113e5 Changed missing library dependencies to simple fix 2016-11-14 00:01:22 -06:00
Phillip Andrews
aeaedbc57a Moved install commands to target-specific cmakelists so that all configurations work. 2016-11-13 22:49:01 -06:00
Phillip Andrews
59eba1dede Changed tabs to spaces, oops 2016-11-13 16:59:36 -06:00
Phillip Andrews
1861302dbd Include various libraries for Visual Studio environment 2016-11-13 14:27:59 -06:00
David Cernat
48ca4d29bc Merge pull request #99 from OpenMW/master
Add OpenMW commits up to 7 Nov
2016-11-08 00:24:39 +02:00
David Cernat
8aaf44e5a8 Fix accidental line duplication 2016-11-06 19:07:03 +02:00
David Cernat
ec211e58d0 Merge pull request #98 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/CMakeLists.txt
2016-11-06 19:03:35 +02:00
MiroslavR
e80636f0ca Improve performance of repairing/recharging (Fixes #2493) 2016-11-06 11:01:46 +01:00
Nikolay Kasyanov
3adf4cb97f Link OpenMW with libz on macOS 2016-11-05 12:18:22 +01:00
Nikolay Kasyanov
0115a3a874 Revert "Link OpenMW with libz on macOS"
This reverts commit 0c4dd05118.
2016-11-05 12:11:04 +01:00
Nikolay Kasyanov
0c4dd05118 Link OpenMW with libz on macOS 2016-11-05 12:09:47 +01:00
Koncord
adb49b7c7d Add New GUI dialog: ListBox
Example:

local GUI_LISTBOX = 42

function OnPlayerSendMessage(pid, message)
    if message == "/lb" then
        local items = "consectetur adipiscing elit\nsed do eiusmod tempor incididunt ut labore\net dolore magna aliqua." -- items can be separated through newline
        local label = "Lorem ipsum dolor sit amet"
        tes3mp.ListBox(pid, GUI_LISTBOX, label, items)
    end
end

function OnGUIAction(pid, idGui, data)
    if idGui == GUI_LISTBOX then
        print("ID: " .. idGui .. " data: " .. tostring(data)) -- if value higher than last item id
    end
end
2016-11-04 00:24:16 +08:00
Stanislav Zhukov
81dfd21d9a Merge pull request #76 from TES3MP/tes3mp-minimap
Show dedicated players on minimap
2016-10-22 17:21:02 +08:00
David Cernat
3136a12051 Resolve conflicts in pull request #75
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/CMakeLists.txt
2016-10-14 18:34:17 +03:00
MiroslavR
11565b5966 Make actors with non-portable lights in inventory glow (Closes #2042, #3338) 2016-10-08 23:17:12 +02:00
scrawl
50bcb65ee0 Move USED_OSG_PLUGINS to the top of the CMakeLists to be used by all platforms 2016-10-08 19:20:24 +02:00
Koncord
2e81034e53 Started work on the map markers 2016-10-07 13:17:44 +08:00
David Cernat
f93e382b8b Use tes3mp icon for executable, part 2 2016-08-24 04:01:05 +03:00
Koncord
b67789aa6a Rename openmw to tes3mp 2016-08-19 09:38:06 +08:00
David Cernat
d9cfd5bac2 Resolve conflicts with OpenMW 2016-08-15 19:14:13 +03:00
scrawl
a44ba0e461 Merge pull request #966 from kpp/find_mygui
Find mygui
2016-08-15 16:36:48 +02:00
Roman Proskuryakov
4cffdb67d8 Uses case-sensitive MyGUI_* variables 2016-08-15 15:59:02 +03:00
Koncord
9ab77cb123 New API functions: MessageBox, CustomMessageBox, InputDialog
New Callback: OnGUIAction
2016-07-23 22:02:06 +08:00
Aesylwinn
b4a000913c Merge remote-tracking branch 'yar/master' into Even
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwdialogue/filter.cpp
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwworld/localscripts.cpp
#	components/CMakeLists.txt
#	components/compiler/exprparser.cpp
#	components/sceneutil/workqueue.cpp
2016-07-17 23:50:52 -04:00
MiroslavR
dc0bc5b68c Implement Face instruction (Feature #1424) 2016-07-09 02:16:47 +02:00
Koncord
1b259e2d33 Syncing inventory, animations, position, 8 key attributes
Created Package system
2016-07-07 23:50:48 +08:00
scrawl
0720a19fc0 Add support for placing BodyParts in a cell (Bug #3118) 2016-07-07 23:50:48 +08:00
Koncord
1e29409dd5 Add OpenMW-mp target 2016-07-07 23:50:38 +08:00
Roman Proskuryakov
28c63aea72 Uses FindTinyXML to find package 2016-06-12 21:40:02 +03:00
scrawl
2ee414abe4 Merge pull request #943 from kpp/find_bullet
Find bullet
2016-06-05 16:02:34 +02:00
Ben Shealy
5085afa3d7 Moved mechanics code from MWGui::TradeWindow to MWMechanics::Trading 2016-06-04 12:28:47 -04:00
Roman Proskuryakov
3bcd23022a Rewrites FindBullet using LibFindMacros handling version properly 2016-05-31 07:18:37 +03:00
Roman Proskuryakov
da59ef0f67 Rewrites FindFFmpeg using LibFindMacros handling components properly 2016-05-10 12:43:54 +03:00
scrawl
6f9ca0f68f Add basic cell preloader class
Not properly in use yet, but seems to be working.
2016-02-07 00:14:13 +01:00
scrawl
1905f0bf2d Add support for placing BodyParts in a cell (Bug #3118) 2016-01-02 01:30:06 +01:00
scrawl
5e99a3eda6 Rename CellStore Functor to Visitor 2015-12-06 18:13:04 +01:00
sandstranger
238a5824be add custom new variable fot Qt 2015-12-03 08:54:14 +03:00
sandstranger
b0b3192520 delete bad symbol 2015-12-02 22:50:54 +03:00
sandstranger
bd5057aa3c enable opengl es1 2015-12-02 22:40:04 +03:00
scrawl
f962ce0bbe Don't link against unnecessary OSG libraries 2015-11-29 19:56:43 +01:00
Chris Robinson
e2beefd8b5 Store info calculated from the ESM::Sound record 2015-11-25 04:24:22 -08:00
scrawl
0220e82259 Remove unused SOUND_INPUT_INCLUDES cmake variable. 2015-11-14 17:17:22 +01:00
Alexander "Ace" Olofsson
d2a4175804 Add FFMPEG to include path for OpenMW
I'm a bit confused; `mwsound/ffmpeg_decoder.hpp/cpp` requires FFMPEG headers to compile, how did this work in the first place?
2015-11-14 16:02:42 +01:00
Bret Curtis
3ea3d07d44 really purge libav 2015-11-12 16:39:29 +01:00
Alexander "Ace" Olofsson
7d4125d97f Fixes for building with unity build 2015-09-24 15:21:42 +02:00
scrawl
89d9323c2b Document RenderBin numbers in a common header to keep them organised 2015-09-21 17:20:08 +02:00
dteviot
541d7fb4fb Fixed assorted issues
* destructor is virtual
* renamed class to Actor
* corrected indentation of case statement
2015-08-25 18:19:16 +12:00
dteviot
bb54bbd273 Pulled duplicated functions into common base class 2015-08-24 19:54:02 +12:00
dteviot
77a1d947cc extracted MWMechanics::getPlayer() 2015-08-21 21:12:39 +12:00
dteviot
942a987d52 centralize the world/cell coordinate conversion logic. 2015-08-16 18:55:02 +12:00
scrawl
3da8f6e62e Water ripples 2015-06-16 20:36:48 +02:00
scrawl
f70250a296 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/launcher/CMakeLists.txt
	apps/opencs/CMakeLists.txt
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/CMakeLists.txt
	components/CMakeLists.txt
	extern/osg-ffmpeg-videoplayer/CMakeLists.txt
2015-06-13 21:11:24 +02:00
scrawl
cf95d3fc35 Refactor cmake scripts, reducing the amount of find_package(Boost) 2015-06-12 01:45:19 +02:00
scrawl
93656aa6cf Add a header missing from CMakeLists 2015-06-04 20:10:07 +02:00
scrawl
4bb3cbf0fb Remove last remains of Ogre 2015-06-03 23:04:35 +02:00
scrawl
41cce5240f Delete remaining files that won't be of any use 2015-06-03 03:29:21 +02:00
scrawl
cdd0623009 Terrain rendering 2015-06-03 01:35:41 +02:00
scrawl
5a7f2a4f1f Restore light attenuation settings 2015-06-02 17:02:56 +02:00
scrawl
01944c33f5 Basic water rendering 2015-06-02 16:35:35 +02:00
scrawl
de8e5f0db1 Restore projectiles 2015-06-01 21:41:13 +02:00
scrawl
ed4863ad7d Restore ranged weapon aiming 2015-05-31 18:53:16 +02:00
scrawl
a066b24303 Restore WeaponAnimation 2015-05-31 01:07:43 +02:00
scrawl
1f00174c02 Use a btCollisionWorld instead of btDiscreteDynamicsWorld
Slightly improves performance, since we no longer need to stepSimulation(). We don't use any Dynamics (yet).
2015-05-27 23:09:38 +02:00
scrawl
152d690a7a Minor cleanup 2015-05-23 23:10:53 +02:00
scrawl
9b8e2e9db3 Port MWRender::Camera 2015-05-22 00:29:27 +02:00
scrawl
72c1f37527 Port CharacterPreview 2015-05-20 02:18:20 +02:00
scrawl
75ace9f8b5 Global map base layer 2015-05-16 14:48:20 +02:00
scrawl
47758c11cd Readded collision objects and movement physics 2015-05-12 03:02:15 +02:00
scrawl
c31b416ba1 Move physicssystem to a new mwphysics module 2015-05-10 01:09:00 +02:00
scrawl
e191f0e044 Rename MWRender::Debugging to MWRender::Pathgrid 2015-05-04 17:41:30 +02:00
scrawl
c1edc30ad7 Dead code removal 2015-05-04 03:29:12 +02:00