mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 22:23:51 +00:00
Code Issues Releases Wiki Activity
24974 commits 38 branches 54 tags 122 MiB
Commit graph

416 commits

Author SHA1 Message Date
Koncord
056ec2d434 [General] Fix CMake errors 2017-05-25 23:56:22 +08:00
David Cernat
08de349133 [General] Add placeholders for PlayerTopic & ObjectTrap packets 2017-05-24 19:01:28 +03:00
David Cernat
870fd9a78b [General] Remove ObjectUnlock packet, use ObjectLock with 0 lock instead 2017-05-24 13:28:34 +03:00
David Cernat
ad388c7e12 [General] Add placeholders for ActorEquipment & PlayerFaction packets 
Also reorder packets and packet processors.
 2017-05-16 19:25:31 +03:00
David Cernat
7b07d6651f [General] Add and use PlayerBounty packet and matching script functions 2017-04-25 21:24:39 +03:00
Koncord
c35d5a2c6c [Master] Implement Master server 2017-04-23 13:39:43 +08:00
Koncord
4c939f6d0a [General] Split tes3mp components in CMakeLists by group 2017-04-23 13:39:43 +08:00
David Cernat
00aa8839d4 [General] Update CMakeLists in components folder 2017-04-16 09:03:51 +03:00
David Cernat
ca8fd1aa72 [General] Remove ActorHeadRotation packet because it would be too spammy 2017-04-15 15:49:40 +03:00
David Cernat
e7960eee76 [General] Rename DrawState packets into AnimFlags ones for clarity 2017-04-14 16:00:34 +03:00
David Cernat
0d196af685 [General] Add placeholders for 7 new ActorPackets 2017-04-11 11:37:38 +03:00
David Cernat
742d6f653a [General] Add ActorPosition packet 2017-04-10 12:38:30 +03:00
David Cernat
174f316787 [General] Rename PacketActorFrame into PacketActorTest 2017-04-10 08:37:18 +03:00
David Cernat
070c6a3bd4 [General] Add ActorPacketController & make controller var names clearer 2017-04-09 08:51:28 +03:00
David Cernat
8c2469bf6d [General] Add placeholder ActorList, ActorAuthority & ActorFrame packets 2017-04-05 04:06:45 +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
e36bdb490e Add view data structure for efficient collection of LOD nodes to use for a given camera/intersection 2017-03-14 19:27:55 +01:00
scrawl
ce8c4ad4f5 Add quad tree implementation (no rendering yet) 2017-03-14 19:27:55 +01:00
scrawl
b1d4bb5708 Add CompositeMapRenderer 
Temporarily render all terrain using composite maps for testing purposes
 2017-03-14 19:27:55 +01:00
scrawl
35d53acc65 Factor out terrain chunk loading/caching into a new resource manager 2017-03-14 19:27:55 +01:00
scrawl
804f873649 terrain: factor out texture caching into a separate class 2017-03-14 19:27:55 +01:00
scrawl
eef63a880a terrain: use a custom drawable for multi-pass render instead of osgFX::Effect 
osgFX::Effect is awkward to use because of the lazy-definition of passes, no support for compileGLObjects, useless 'Technique' abstraction and having to define silly methods like 'effectAuthor()'

Handling the multi-pass rendering inside the Drawable also avoids redundant culling tests against the same bounding box for each pass.
 2017-03-14 19:27:55 +01:00
Koncord
0c1905e842 [General] Add PreInit packet 2017-03-05 16:46:11 +08:00
Koncord
c353e18645 [General] Move Utils from server to components 
Rewrite CRC32 functions to the Boost equivalent
 2017-03-04 13:08:22 +08:00
David Cernat
0d32bf5943 [General] Add extra death debug, don't request data from player on death 2017-03-04 00:29:01 +02:00
David Cernat
5c269a5f8d [General] Rename ID_GAME_DIE and ID_GAME_RESURRECT 2017-02-28 01:38:25 +02:00
David Cernat
328e3b6618 Merge pull request #167 from OpenMW/master 
Add OpenMW commits up to 24 Feb 2017
 2017-02-24 06:57:39 +02:00
scrawl
e33829d493 Add fork of osgUtil::Optimizer with backported fixes that have not been released yet 
Remove optimizers that won't be used.
 2017-02-23 23:28:50 +01:00
David Cernat
38ccc2671c Merge pull request #164 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwmechanics/spellcasting.cpp
 2017-02-23 00:52:53 +02:00
scrawl
8f79fa3d72 Add resource statistics panel opened with F4 2017-02-22 14:28:45 +01:00
David Cernat
27c4015f50 [General] Remove unused packet placeholder ID_OBJECT_HEALTH 2017-02-16 18:46:39 +02:00
David Cernat
04d45b9dbb [General] Rename packets to show they are for players only, not NPCs 2017-02-05 09:01:33 +02:00
David Cernat
6328ffb9aa [General] In ID_GAME_ATTRIBUTE & ID_GAME_SKILL, rename GAME into PLAYER 2017-02-04 14:25:43 +02:00
David Cernat
9130c1f302 [General] Rename ID_CONTAINER_ADD into ID_CONTAINER 2017-02-04 13:14:37 +02:00
David Cernat
d2cf96af99 [General] Repurpose the unused ID_CONTAINER_REMOVE into ID_OBJECT_HEALTH 2017-02-04 13:05:15 +02:00
David Cernat
958ff06ca8 [General] Rename ID_DOOR_ACTIVATE into ID_DOOR_STATE 2017-02-01 11:54:40 +02: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
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
David Cernat
244da19a51 [General] Turn ID_PLAYER_CELL_LOAD into ID_PLAYER_CELL_STATE for clarity 2017-01-26 13:49:20 +02:00
David Cernat
1d9c6ddd81 [General] Add placeholders for the new packet ID_PLAYER_CELL_LOAD 2017-01-25 14:51:43 +02:00
David Cernat
e9b22814b9 Create placeholder for ID_GAME_JOURNAL 2017-01-20 11:15:10 +02:00
David Cernat
a69f294ef0 Rename ID_GAME_CELL into ID_PLAYER_CELL_CHANGE 2017-01-20 10:30:50 +02:00
Koncord
27afb91936 RPI v3 patch #1 2017-01-03 19:03:51 +08:00
Koncord
b1bb552b65 Add packet ActiveSkills 2016-12-03 23:38:40 +08:00
David Cernat
6ea5f08e9c Create placeholder for ID_GAME_SPELLBOOK 2016-11-21 02:28:05 +02:00
David Cernat
ae39daf76a Add and implement ID_MUSIC_PLAY 2016-11-20 22:54:49 +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
Phillip Andrews
c18fc113e5 Changed missing library dependencies to simple fix 2016-11-14 00:01:22 -06:00
David Cernat
46397a7dac Add and implement ID_OBJECT_ANIM_PLAY 2016-10-27 16:09:02 +03:00
David Cernat
c205e793cb Add and implement ID_SCRIPT_MEMBER_SHORT 2016-10-27 00:41:14 +03:00
David Cernat
97468980af Add and implement 3 new WorldPackets for ingame script variable values 2016-10-26 12:25:50 +03:00
David Cernat
385b5f39e3 Add and implement ID_OBJECT_ROTATE 2016-10-25 14:28:39 +03:00
David Cernat
0fb9b6eefb On second thought, rename ID_OBJECT_MOVE_WORLD into ID_OBJECT_MOVE 2016-10-25 12:53:18 +03:00
David Cernat
947a677801 Replace ID_ACTIVATOR_ACTIVATE with ID_OBJECT_MOVE_WORLD 2016-10-25 12:42:29 +03:00
David Cernat
4f0a3e8aa1 Add placeholders for 5 new WorldPackets 2016-10-24 23:44:05 +03:00
David Cernat
b6111d16cc Add and implement ID_WORLD_VIDEO_PLAY 2016-10-24 17:52:19 +03:00
David Cernat
3fd93896f2 Add and implement ID_WORLD_OBJECT_LOCK 2016-10-24 13:20:04 +03:00
David Cernat
08ea5163c4 Add and implement ID_WORLD_OBJECT_UNLOCK 2016-10-24 11:26:31 +03:00
David Cernat
47ebd24b4a Merge pull request #79 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	apps/openmw/mwinput/inputmanagerimp.cpp
 2016-10-24 09:18:21 +03:00
David Cernat
d85a1ee1a9 Fix errors remaining from merge with tes3mp-packetexpansion 2016-10-23 18:32:03 +03:00
David Cernat
c639337842 Merge with tes3mp-packetexpansion by fixing conflicts 
# Conflicts:
#	apps/openmw-mp/Networking.cpp
#	apps/openmw/mwmp/Networking.cpp
#	components/CMakeLists.txt
#	components/openmw-mp/NetworkMessages.hpp
#	components/openmw-mp/PacketsController.cpp
 2016-10-23 17:57:38 +03:00
Koncord
c27351c19e Implement inventory functions 
AddItem, RemoveItem, GetItemName, GetItemCount, GetItemHealth, GetInventorySize SendInventory
Example:
```lua
tes3mp.AddItem(pid, "glass dagger", 1, 50)
tes3mp.AddItem(pid, "glass dagger", 1, -1)
tes3mp.SendInventory(pid)
tes3mp.RemoveItem(pid, "glass dagger", 1)
tes3mp.SendInventory(pid)
local invSize = tes3mp.GetInventorySize(pid) - 1
for i = 0, invSize do
    print(("%s %d %d"):format(tes3mp.GetItemName(pid, i), tes3mp.GetItemCount(pid, i), tes3mp.GetItemHealth(pid, i)))
end
```
 2016-10-23 02:57:49 +08:00
David Cernat
3c49157ed7 Rename WorldPackets to ID_WORLD_OBJECT_DELETE and ID_WORLD_OBJECT_PLACE 2016-10-22 18:05:32 +03:00
David Cernat
565e7e4b9f Create and implement placeholder for ID_WORLD_OBJECT_CREATION 2016-10-21 21:57:05 +03:00
MiroslavR
301dd77efb Save controls state (Fixes #3598) 2016-10-20 02:12:01 +02:00
David Cernat
285f89573d Create placeholders for WorldPacket classes 2016-10-19 20:36:11 +03:00
David Cernat
790d41e278 Move PlayerPackets into their own subfolder 2016-10-19 19:37:10 +03:00
David Cernat
d2212ef80b Rename PacketsController into PlayerPacketController 2016-10-19 16:31:07 +03:00
David Cernat
fcc793a0af Create a new BasePacket that PlayerPacket inherits from 2016-10-17 18:47:16 +03:00
David Cernat
b8f4cb94fb Rename BasePacket into PlayerPacket 2016-10-17 15:54:36 +03:00
David Cernat
b6086ab015 Rename ID_GAME_DYNAMICSTATS_CURRENT into ID_GAME_DYNAMICSTATS 2016-09-28 14:13:24 +03:00
David Cernat
26487598a6 Rename ID_GAME_UPDATE_EQUIPED into ID_GAME_EQUIPMENT 2016-09-28 11:36:29 +03:00
David Cernat
ce4b326b02 Rename ID_GAME_UPDATE_BASESTATS into ID_GAME_DYNAMICSTATS_CURRENT 2016-09-28 07:50:16 +03:00
David Cernat
046a1ea899 Add packet for player levels 2016-09-25 14:28:25 +03:00
David Cernat
81999a8179 Remove outdated ID_GAME_UPDATE_SKILLS packet, part 2 2016-09-02 07:58:20 +03:00
Koncord
cf1a0113a1 Time API 2016-08-30 13:24:42 +08:00
Koncord
a661de2a84 PacketClass 2016-08-29 21:01:23 +08:00
David Cernat
e39b66af4f Move logger to components 2016-08-17 06:15:44 +03: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
David Cernat
babba95413 Merge pull request #34 from OpenMW/master 
Add OpenMW commits from 1st week of August
 2016-08-08 15:53:56 +03:00
Marc Zinnschlag
aa1ed9b172 Merge remote-tracking branch 'aesylwinn/RenderWater' 2016-08-07 17:03:58 +02:00
Aesylwinn
5753f52b47 Move water mesh + simple state generation to components library. 2016-08-05 13:25:05 -04:00
David Cernat
8686b9cc12 Merge pull request #29 from OpenMW/master 
Add OpenMW commits from end of July
 2016-08-04 00:56:36 +03:00
MiroslavR
b65f379b7f Save scripted animation state (Fixes #1931, #2150, #3393) 2016-08-03 03:52:35 +02:00
Koncord
ed3dc8ca7b Reduced server dependings 2016-08-02 18:52:58 +08:00
AnyOldName3
20f73f4a32 Relocate escape-related code to new files escape.hpp and escape.cpp. 2016-07-27 00:58:31 +01: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
f6f3f71db5 Improve format specifiers for message boxes 2016-07-09 03:18:45 +02:00
Koncord
1b259e2d33 Syncing inventory, animations, position, 8 key attributes 
Created Package system
 2016-07-07 23:50:48 +08:00
Roman Proskuryakov
3bcd23022a Rewrites FindBullet using LibFindMacros handling version properly 2016-05-31 07:18:37 +03:00
Aesylwinn
d141672b53 Pathgrid geometry creator 2016-05-02 22:09:48 -04:00
scrawl
a9ad1b09e2 Introduce ShaderManager & ShaderVisitor 
Actual shaders still to be written.
 2016-02-18 19:37:56 +01:00
scrawl
e28dc3e72f Preload instances in SceneManager 2016-02-09 18:35:26 +01:00
scrawl
d11c2864df Introduce UnrefQueue to handle the deleting of no longer needed objects in the background thread 2016-02-09 15:45:35 +01: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
df57d4bfba Use a common base class for resource managers 
Implement updateCache to delete unreferenced cached objects when they have not been referenced for a while.
 2016-02-06 17:22:17 +01:00
scrawl
f99f403dda Rename TextureManager to ImageManager 2016-02-05 23:03:53 +01:00
scrawl
438b30d6f0 Move configureLight to a separate file 2016-01-11 23:10:16 +01:00
scrawl
6546c05428 Move Fallback map to components/ 2016-01-11 23:10:16 +01:00
scrawl
64424e7262 Move keyframe loading out of SceneManager to new KeyframeManager 2015-12-13 15:31:07 +01:00
sandstranger
7d374b36fd change cmake variables 2015-12-03 21:29:50 +03:00
sandstranger
238a5824be add custom new variable fot Qt 2015-12-03 08:54:14 +03:00
sandstranger
bd5057aa3c enable opengl es1 2015-12-02 22:40:04 +03:00
scrawl
d3fa8a8602 Add osgDB::ObjectCache to the repository to work around it not being available in OSG 3.2 2015-12-02 15:14:39 +01:00
scrawl
3d12b2ca9d Add NifFileManager to avoid duplicate parsing of the NIFFile in SceneManager and BulletShapeManager. 2015-12-02 14:59:32 +01:00
scrawl
f962ce0bbe Don't link against unnecessary OSG libraries 2015-11-29 19:56:43 +01:00
scrawl
62169a7039 Use a single-precision PositionAttitudeTransform in speed critical places 2015-11-22 19:54:26 +01:00
scrawl
8cf57ef6ac Move BulletShapeManager and BulletShape to resource/ 2015-11-17 00:20:15 +01:00
scrawl
59aee04ddb Implement ScalingLayer, for layouting of widgets in screen-relative coordinates 2015-11-08 18:30:21 +01:00
scrawl
51f3a8fec6 osgMyGUI: move Platform methods to the .cpp file 2015-11-07 17:39:31 +01:00
Alexander "Ace" Olofsson
7d4125d97f Fixes for building with unity build 2015-09-24 15:21:42 +02:00
scrawl
3a7d0d8dc8 Remove a file that isn't in use yet from build 2015-07-28 23:34:55 +02:00
Koncord
7924ecef3e Fix definition conflict 2015-07-19 23:37:20 +09:00
scrawl
f09e4620b6 Move OpenMW version information to a textfile instead of compiling it in 
Now we don't need to recompile 3 .cpp files and re-link whenever the current git HEAD changes.
 2015-07-18 03:09:04 +02:00
Koncord
73731d27e9 Add ${MYGUI_LIBRARIES} to components/CMakeLists.txt 2015-07-14 23:54:47 +09: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
89c2a7e26b Fix for possibly missing library on windows 2015-06-12 15:22:19 +02:00
scrawl
e13a938896 Add support to build with Qt5 (Task #2665) 
Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.
 2015-06-12 15:13:42 +02:00
scrawl
cf95d3fc35 Refactor cmake scripts, reducing the amount of find_package(Boost) 2015-06-12 01:45:19 +02:00
scrawl
fc5176dc38 Refactor cmake scripts, reducing the amount of find_package(Qt4) 2015-06-11 23:38:08 +02:00
scrawl
cc71e894e1 Add WorkQueue class 2015-06-10 18:15:31 +02:00
scrawl
4bb3cbf0fb Remove last remains of Ogre 2015-06-03 23:04:35 +02:00
scrawl
974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
 2015-06-03 03:18:29 +02:00
scrawl
cdd0623009 Terrain rendering 2015-06-03 01:35:41 +02:00
scrawl
025a1a7866 Restore savegame screenshot display 2015-05-28 02:34:38 +02:00
scrawl
5442bf23a6 Apply video mode & gamma setting changes 2015-05-14 20:31:16 +02:00
scrawl
9ea416b852 Readded HW cursor manager (no image rotation yet) 2015-05-13 18:56:14 +02:00
scrawl
39fb46601a Readded input & event handling 2015-05-13 16:50:47 +02:00
scrawl
0498e6e5f0 Readded window icon 2015-05-13 15:03:21 +02:00
scrawl
375b736e74 Use SDL to create the window 
No input nor event loop handling yet, so the window will "stop responding" after a few seconds.

Thanks to KittyCat for the GraphicsWindowSDL2 code.
 2015-05-13 02:53:09 +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
c843cfc8e2 Physics stub in preparation for rewrite 2015-05-10 00:28:51 +02:00
scrawl
cac288d5be Remove OgreInit 2015-05-01 21:49:36 +02:00
scrawl
d9d84bd7b2 Remove bullet raycasting shapes, to be replaced with OSG ray casts 2015-05-01 21:43:21 +02:00
scrawl
9f74be8fcb Add back the custom MyGUI log facility for utf8 paths on windows 2015-05-01 02:04:24 +02:00
scrawl
a59940a2c7 Move MyGUI platform to components 2015-05-01 01:44:21 +02:00
k1ll
8e094d6fa5 Add static bullet to components 2015-04-29 18:31:29 +02:00
k1ll
b194af4ab2 Add static qt to components 2015-04-29 18:31:29 +02:00
k1ll
00b7712a59 Fix shlwapi include case and add the lib for linking when building for windows 2015-04-29 18:31:28 +02:00
scrawl
372a54bbc7 Dead code removal 2015-04-25 01:28:01 +02:00
scrawl
8c810e3620 Move rng to components 2015-04-22 17:58:55 +02:00
scrawl
04accb7652 Add LightController 2015-04-22 17:37:39 +02:00
scrawl
eaa4316ff8 Move skinning code to SceneUtil 2015-04-21 20:30:48 +02:00
scrawl
4ea6d4aa01 Rewrite of skinning code 
Goals:
- get rid of the mesh pre-transform (this requires supporting different bind matrices for each mesh)
- bounding box should be relative to the bone the mesh is attached to, ideally we can then get rid of the expensive skeleton-based bounding boxes
- update bone matrices in CullCallback instead of UpdateCallback

Works OK, though the bounding boxes are not correct yet.
 2015-04-21 16:02:40 +02:00
scrawl
c516e897ee Move Controller base classes to SceneUtil, add visitor to assign ControllerSources 2015-04-14 17:51:46 +02:00
scrawl
5dd1ab24fe More efficient StateSetController, beginnings of sky rendering 2015-04-14 15:58:16 +02:00