Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
220 Commits 151 Branches 18 Tags
Commit Graph

120 Commits

Author SHA1 Message Date
timokoesters
a389b86f13 Rename animationHistory to animation_history 
Former-commit-id: bb2c882332fa9c3fd7f2c7fbd6143cd5f85153d8
 2019-04-17 22:32:36 +02:00
timokoesters
abe207cbba Fix #21 by checking animation history 
Former-commit-id: 5272d1d7aee73fc07edeb31d9f29238d19b7d229
 2019-04-17 19:39:12 +02:00
Joshua Barretto
8bd043117e Merge branch 'singleplayer' into 'master' 
Start Singleplayer server when singleplayer is selected

See merge request veloren/veloren!39

Former-commit-id: ac8c9f3f52871d89847fdecc74ac58bb593e762b
 2019-04-17 15:31:02 +00:00
Louis Pearson
7963fab232 Stop singleplayer thread whenever a session is left 
Former-commit-id: 16fcf35cbc856bebc12944781c2ac1a4daab5550
 2019-04-17 09:22:26 -06:00
Joshua Barretto
d4f247d77d Changed default server address to 'server.veloren.net' 
Former-commit-id: 660083d3d7ca341428b8c3cd8d54dd3ac1f453ab
 2019-04-17 16:08:25 +01:00
Louis Pearson
2fcc07365d Add method to drop singleplayer thread 
Former-commit-id: b62a90728d4e83a005687538e134cee427491052
 2019-04-17 08:57:23 -06:00
Louis Pearson
f4e0cf4ac3 Add basic singleplayer support 
Former-commit-id: 929b05faca5d2b95a96349dfc17a62b3165289a1
 2019-04-17 07:41:34 -06:00
Imbris
bf221522bb Fix most spacing issues in chat 
Former-commit-id: 90a4080123b77630888967423b030153b9f81709
 2019-04-16 20:17:15 -04:00
Joshua Barretto
52272499b1 Improved camera attributes and focus 
Former-commit-id: 223f85c884c063c5cbb7d6c9f9f5c4a8c62a7ffd
 2019-04-16 20:22:04 +01:00
timokoesters
4b4fe5aa79 Handle bone orientation and scale as well 
Former-commit-id: 80c80342ae3458b98c2520359bc0a0705b22dbc1
 2019-04-16 20:55:04 +02:00
timokoesters
b364a4963d Implement animation smoothing 
Former-commit-id: e89caca7d273934533c57c4324365a126d02e5df
 2019-04-16 20:26:24 +02:00
Louis Pearson
5d9d994e21 Add better defaults support 
Former-commit-id: fa77acae3ee2b99cbf37a8fec71ee1913e889d82
 2019-04-16 11:41:39 -06:00
Louis Pearson
2af6443393 Add auto generation of settings.toml if it does not already exist 
Former-commit-id: 941b81a8faeff89096256666c56ae472d9b569d5
 2019-04-16 10:06:23 -06:00
Louis Pearson
5acd975f69 Add default keybindings 
Former-commit-id: c8886a2eb3326ba62e31ef84b93a29ee59f378b3
 2019-04-16 08:57:31 -06:00
Louis Pearson
d6420dfa35 Add support for keybinding 
Former-commit-id: 1edbf3bebb8d1651a1b912cedcd3513dfb287fa1
 2019-04-16 08:57:31 -06:00
Piotr
c30af3f4f8 Animation States 
Former-commit-id: 769f09dc44143b5e54623ea819db2d6149429184
 2019-04-16 14:29:44 +00:00
Joshua Barretto
ea6cf2780b Merge branch 'master' into 'master' 
Solve physics fighting problem

See merge request veloren/veloren!27

Former-commit-id: 010af4fb0f31b854dd1f8c42f6a65711cc9d84cd
 2019-04-15 16:43:41 +00:00
Imbris
eceef5714b make zooming always work if cursor is grabbed 
Former-commit-id: e07bb0746fa117f045d62919a4ca55a8eb0c6cf7
 2019-04-14 20:53:42 -04:00
Imbris
3365cf08c8 simplify chat keybaord capture 
Former-commit-id: 3c5c5c241fe0c0d97059c7b87c0c08104eb5c5fe
 2019-04-14 20:45:54 -04:00
Imbris
b6598c84c0 ignore tx.send() result 
Former-commit-id: 2d4b2d258f8fd3b030bb7f1e9596ccb6750d50ff
 2019-04-14 20:23:26 -04:00
Imbris
8677b84084 stop zooming when scrolling chat 
Former-commit-id: a94f26e30029ef4cff1807c2347cbd2490c4afd7
 2019-04-14 20:15:12 -04:00
Joshua Barretto
1d0072e195 Fixed physics sync 
Former-commit-id: 86d3af46c69f6566f4cab8d93ecf27636a9563cf
 2019-04-15 00:29:28 +01:00
Imbris
5134b190a3 Add asynchronus client creation to Voxygen 
Former-commit-id: 0c11cc8a7ddc7b425e036c2357c233e376002c6e
 2019-04-14 23:28:29 +00:00
Joshua Barretto
b25ec7696a Fixed aspect on scene start, added more information to post errors 
Former-commit-id: 0daff37cbcad6f906962216ce923a005da6861c1
 2019-04-14 16:05:51 +01:00
Joshua Barretto
cb45a079cd Ensured that Client is Send 
Former-commit-id: abadfc7d1d86110ed442cdb5a2e639c163c96e04
 2019-04-14 14:23:43 +01:00
Joshua Barretto
a9c2b24ed9 Fixed 1-frame animation bug 
Former-commit-id: fc591de5026e35cab1ef72ce250b19cbe2fcec0e
 2019-04-14 14:23:43 +01:00
Joshua Barretto
49732f5361 Named Voxygen correctly 
Former-commit-id: a4f4e5703103e3f93da87bd515e80eb430eef52e
 2019-04-14 14:23:43 +01:00
Joshua Barretto
d45e518413 Updated package versions 
Former-commit-id: bb0d1efd718ddef598fbb894498a43ad014a11c0
 2019-04-14 14:23:43 +01:00
Joshua Barretto
7f6599e955 Started work on server-side chunks 
Former-commit-id: 84a6bd7358f67a77043c4b11c787538f073c8d28
 2019-04-14 14:23:43 +01:00
Joshua Barretto
bd51eddd62 Moved figure rendering to a better place 
Former-commit-id: 51ca948e131c20151c97f9f8454c80c47a9154b0
 2019-04-14 14:23:43 +01:00
Joshua Barretto
34d211d117 Integrated Sphynx 
Former-commit-id: 5d96983a385bb77a2876aa7439158252b7e2f0fc
 2019-04-14 14:23:43 +01:00
Pfauenauge90
e32ecf33bd Charselection Help Text 
Former-commit-id: 463a3aad1c8d0b8e98f0b5464103016c401d1d32
 2019-04-14 15:19:12 +02:00
Pfauenauge90
08682a2ea8 Updated race descriptions 
Former-commit-id: 2384a6f01a27000d39ba9e399468e1d7897b6b1f
 2019-04-14 15:19:12 +02:00
Pfauenauge90
ed38ad83ca chat changes 
Former-commit-id: c2a5ae0d34e1e93d8f6feb4a9e5cf69045db7275
 2019-04-14 15:19:12 +02:00
Pfauenauge90
16e8fda764 help window, chat padding, font colours 
Former-commit-id: 8d42f8e05cd11f669e4e56873e31a8530272b3b2
 2019-04-14 15:19:11 +02:00
Pfauenauge90
4b7f425e4d Help window, chat padding, font colours 
Former-commit-id: 18643504fd8e94ed991c137e9ea91dfa094686c7
 2019-04-14 15:17:38 +02:00
Pfauenauge90
f211642876 Chat padding, Font Colours to white, Help Window 
Former-commit-id: d36a878971f92fbf16eb44d3102b4328832e6563
 2019-04-14 15:15:42 +02:00
Imbris
ca6b5aa074 update colors to match gamma scaling 
Former-commit-id: 461b5cf751d329a219250bc8090b016f54f3ec96
 2019-04-14 15:12:29 +02:00
Imbris
0bcbbfd64b new bones, update asset repo 
Former-commit-id: 4dbed55af4a9532051025a797349e77bd937dff2
 2019-04-14 15:05:43 +02:00
Imbris
54b2030e86 make to_server() blocking, post fixes & cleanup, use server address 
Former-commit-id: 7debc790e158a996ed58271d3307214e42b850bd
 2019-04-14 15:04:44 +02:00
Imbris
9a9edb986a use modified version of conrod 
Former-commit-id: 6a4697d02e18732dbf9ad679bac761c5a73457fa
 2019-04-13 10:52:48 -04:00
Imbris
6a1d1bb535 remove hidden chat scrollbar 
Former-commit-id: fc534a2d71bbdbf2989b9772c7d5a64aa44f1ed9
 2019-04-13 10:52:48 -04:00
Marcel Märtens
c1c3506fc2 add simple interface to get assets from various locations 
Former-commit-id: 2ee6c4ef811e935eb8684a2cd827a97b8ad0be7a
 2019-04-13 03:40:59 +02:00
Yeedo
4df159fbee Updated mouse wheel zooming to use WindowEvent 
Former-commit-id: 700fa66382f3a8e0fd738a8ce14fb44bc211b5fe
 2019-04-11 23:12:42 +01:00
Pfauenauge90
9cf8697ba7 Key Command Changes, Char Window 
Former-commit-id: 16c94f35da889ea418e7dc32043e6ebd25f2664b
 2019-04-09 18:30:13 +02:00
Pfauenauge
baa4d0c74a Minor changes to font sizes 
Former-commit-id: d998532c9b858cea5704b307b8bc6ef0ef3c75d7
 2019-04-07 00:05:56 +02:00
Pfauenauge
c10dc723c0 Char Window, Mana, Health, Exp-Bar 
Former-commit-id: 546d29aae7441232892c7b7438708e93fb440128
 2019-04-06 00:36:04 +02:00
Pfauenauge90
d9f5c26198 char window additions 
Former-commit-id: 63dfbd68594fc7ecb6e9caf610c9c5165c9e88d4
 2019-04-04 19:35:33 +02:00
Pfauenauge90
c68832fbc4 Merged with UI-Input 
Former-commit-id: f18e92dcac87c3b2806065078c70527ffd805876
 2019-04-04 16:45:57 +02:00
Pfauenauge90
f1e32750b6 char window 
Former-commit-id: e3a6e5aadf20f60e6db237d63382cd55cd8211b9
 2019-04-04 15:51:36 +02:00